From 44fb5c76f6e8a4d4669de3bbbf48850a3d724049 Mon Sep 17 00:00:00 2001 From: Reino Ruusu Date: Mon, 7 Sep 2020 14:15:14 +0300 Subject: [PATCH] Move tech type table-related request from UI plug-in gitlab #93 Change-Id: I8550ac1edb7d650211c51ce6379487788001569c --- .../district/network/ui/techtype/table/TechTypeTable.java | 2 +- .../district/network/ui/techtype/table/TechTypeTableView.java | 2 +- org.simantics.district.network/META-INF/MANIFEST.MF | 1 + .../network}/techtype/requests/PossibleTechTypeTable.java | 2 +- .../network}/techtype/requests/PossibleTechTypeTableData.java | 2 +- .../network}/techtype/requests/WriteTechTypeTableRequest.java | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) rename {org.simantics.district.network.ui/src/org/simantics/district/network/ui => org.simantics.district.network/src/org/simantics/district/network}/techtype/requests/PossibleTechTypeTable.java (94%) rename {org.simantics.district.network.ui/src/org/simantics/district/network/ui => org.simantics.district.network/src/org/simantics/district/network}/techtype/requests/PossibleTechTypeTableData.java (93%) rename {org.simantics.district.network.ui/src/org/simantics/district/network/ui => org.simantics.district.network/src/org/simantics/district/network}/techtype/requests/WriteTechTypeTableRequest.java (96%) 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 296d9af3..f3ba54d9 100644 --- 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 50368d2c..15b31784 100644 --- 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 08788fdf..90cf060c 100644 --- 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 c722dfc0..68fc12f1 100644 --- 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 b47bbc70..8dd88666 100644 --- 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 118c8a74..5e6922b8 100644 --- 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; -- 2.45.2