Move tech type table-related request from UI plug-in

gitlab #93

Change-Id: I8550ac1edb7d650211c51ce6379487788001569c

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/techtype/table/TechTypeTable.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/techtype/table/TechTypeTable.java
index 296d9af38058e288aec15a5ec853619dacbba72d..f3ba54d9f790491dbe866705e4ff4a9dfe18c4aa 100644 (file)
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/techtype/table/TechTypeTable.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/techtype/table/TechTypeTable.java
@@ -44,7 +44,7 @@ import org.eclipse.swt.widgets.Text;
 import org.simantics.Simantics;
 import org.simantics.db.Resource;
 import org.simantics.db.exception.DatabaseException;
-import org.simantics.district.network.ui.techtype.requests.WriteTechTypeTableRequest;
+import org.simantics.district.network.techtype.requests.WriteTechTypeTableRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/techtype/table/TechTypeTableView.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/techtype/table/TechTypeTableView.java
index 50368d2c2ed2a8d992cb3db1d68cc6636b24a531..15b31784fae96db7579e4f99a65521a68f2e301a 100644 (file)
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/techtype/table/TechTypeTableView.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/techtype/table/TechTypeTableView.java
@@ -23,7 +23,7 @@ import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.request.PossibleActiveModel;
 import org.simantics.db.layer0.request.PossibleResource;
 import org.simantics.district.network.DistrictNetworkUtil;
-import org.simantics.district.network.ui.techtype.requests.PossibleTechTypeTableData;
+import org.simantics.district.network.techtype.requests.PossibleTechTypeTableData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/org.simantics.district.network/META-INF/MANIFEST.MF b/org.simantics.district.network/META-INF/MANIFEST.MF
index 345276f73830ab471bc44fcef1635f1f136c8d17..b2442a8991ffeb87e776d190156eff15de2d6a14 100644 (file)
--- a/org.simantics.district.network/META-INF/MANIFEST.MF
+++ b/org.simantics.district.network/META-INF/MANIFEST.MF
@@ -25,6 +25,7 @@ Require-Bundle: org.simantics.db,
 Export-Package: org.simantics.district.network,
  org.simantics.district.network.changeset,
  org.simantics.district.network.profile,
+ org.simantics.district.network.techtype.requests,
  org.simantics.district.network.visualisations,
  org.simantics.district.network.visualisations.model,
  org.simantics.district.network.visualisations.triggers

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/techtype/requests/PossibleTechTypeTable.java b/org.simantics.district.network/src/org/simantics/district/network/techtype/requests/PossibleTechTypeTable.java
similarity index 94%
rename from org.simantics.district.network.ui/src/org/simantics/district/network/ui/techtype/requests/PossibleTechTypeTable.java
rename to org.simantics.district.network/src/org/simantics/district/network/techtype/requests/PossibleTechTypeTable.java
index c722dfc09414fdcc4d89d4d30b45bee2363fea1a..68fc12f19f187e5bce051090b9d25511dfc62dec 100644 (file)
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/techtype/requests/PossibleTechTypeTable.java
+++ b/org.simantics.district.network/src/org/simantics/district/network/techtype/requests/PossibleTechTypeTable.java
@@ -1,4 +1,4 @@
-package org.simantics.district.network.ui.techtype.requests;
+package org.simantics.district.network.techtype.requests;
 
 import java.util.Collection;
 

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/techtype/requests/PossibleTechTypeTableData.java b/org.simantics.district.network/src/org/simantics/district/network/techtype/requests/PossibleTechTypeTableData.java
similarity index 93%
rename from org.simantics.district.network.ui/src/org/simantics/district/network/ui/techtype/requests/PossibleTechTypeTableData.java
rename to org.simantics.district.network/src/org/simantics/district/network/techtype/requests/PossibleTechTypeTableData.java
index b47bbc70c65f1a731ba1efb88b8c568b99e9c90a..8dd886665c64194f8995b9d7ec58c0d0e04d6a51 100644 (file)
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/techtype/requests/PossibleTechTypeTableData.java
+++ b/org.simantics.district.network/src/org/simantics/district/network/techtype/requests/PossibleTechTypeTableData.java
@@ -1,4 +1,4 @@
-package org.simantics.district.network.ui.techtype.requests;
+package org.simantics.district.network.techtype.requests;
 
 import org.simantics.databoard.Bindings;
 import org.simantics.db.ReadGraph;

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/techtype/requests/WriteTechTypeTableRequest.java b/org.simantics.district.network/src/org/simantics/district/network/techtype/requests/WriteTechTypeTableRequest.java
similarity index 96%
rename from org.simantics.district.network.ui/src/org/simantics/district/network/ui/techtype/requests/WriteTechTypeTableRequest.java
rename to org.simantics.district.network/src/org/simantics/district/network/techtype/requests/WriteTechTypeTableRequest.java
index 118c8a74745c32934432cd4cb990c7d52042e120..5e6922b8965fdafe09b2d517696904e578ca69b6 100644 (file)
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/techtype/requests/WriteTechTypeTableRequest.java
+++ b/org.simantics.district.network/src/org/simantics/district/network/techtype/requests/WriteTechTypeTableRequest.java
@@ -1,4 +1,4 @@
-package org.simantics.district.network.ui.techtype.requests;
+package org.simantics.district.network.techtype.requests;
 
 import java.util.UUID;