Fix cyclic reference project (eclipse-set#1299)

SuB-PlanPro · Jan 29, 2025 · f688aa4 · f688aa4
1 parent 86bf3d6
commit f688aa4
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 32 deletions.
diff --git a/java/bundles/org.eclipse.set.feature.export/META-INF/MANIFEST.MF b/java/bundles/org.eclipse.set.feature.export/META-INF/MANIFEST.MF
@@ -79,8 +79,6 @@ Import-Package: jakarta.inject;version="1.0.0",
  org.eclipse.set.feature.overviewplan.transformator,
  org.eclipse.set.feature.siteplan.json,
  org.eclipse.set.feature.siteplan.transform,
- org.eclipse.set.feature.table,
- org.eclipse.set.feature.table.messages,
  org.eclipse.set.model.siteplan,
  org.eclipse.set.model.tablemodel.extensions,
  org.eclipse.set.model.titlebox,
@@ -102,8 +100,7 @@ Import-Package: jakarta.inject;version="1.0.0",
  org.osgi.service.component.annotations;version="1.2.0",
  org.slf4j;version="1.7.2"
 Bundle-ActivationPolicy: lazy
-Service-Component: OSGI-INF/org.eclipse.set.feature.export.compileservice.TableCompileServiceContextFunction.xml,
- OSGI-INF/org.eclipse.set.feature.export.descriptions.ExportInventoryDescriptionService.xml,
+Service-Component: OSGI-INF/org.eclipse.set.feature.export.descriptions.ExportInventoryDescriptionService.xml,
  OSGI-INF/org.eclipse.set.feature.export.descriptions.ExportPlanningRecordsDescriptionService.xml,
  OSGI-INF/org.eclipse.set.feature.export.descriptions.SiteplanModelExportDescriptionService.xml,
  OSGI-INF/org.eclipse.set.feature.export.descriptions.TitleBoxPdfDescriptionService.xml,

diff --git a/...lipse.set.feature.export/src/org/eclipse/set/feature/export/parts/DocumentExportPart.java b/...lipse.set.feature.export/src/org/eclipse/set/feature/export/parts/DocumentExportPart.java
@@ -29,10 +29,9 @@
 import org.eclipse.set.feature.export.Messages;
 import org.eclipse.set.feature.export.checkboxmodel.CheckboxModel;
 import org.eclipse.set.feature.export.checkboxmodel.CheckboxModelContentProvider;
-import org.eclipse.set.feature.table.TableService;
-import org.eclipse.set.feature.table.messages.MessagesWrapper;
 import org.eclipse.set.services.export.ExportService;
 import org.eclipse.set.services.export.TableCompileService;
+import org.eclipse.set.services.table.TableService;
 import org.eclipse.set.utils.BasePart;
 import org.eclipse.set.utils.SaveAndRefreshAction;
 import org.eclipse.set.utils.SelectableAction;
@@ -97,9 +96,6 @@ public abstract class DocumentExportPart extends BasePart {
 
 	CheckboxTableViewer viewer;
 
-	@Inject
-	MessagesWrapper wrapper;
-
 	/**
 	 * Constructor
 	 */

diff --git a/...clipse.set.feature.export/src/org/eclipse/set/feature/export/parts/PlanProExportPart.java b/...clipse.set.feature.export/src/org/eclipse/set/feature/export/parts/PlanProExportPart.java
@@ -28,12 +28,12 @@
 import org.eclipse.set.core.services.export.AdditionalExportService;
 import org.eclipse.set.core.services.export.CheckboxModelElement;
 import org.eclipse.set.core.services.part.ToolboxPartService;
-import org.eclipse.set.feature.table.TableService.TableInfo;
 import org.eclipse.set.model.planpro.PlanPro.Container_AttributeGroup;
 import org.eclipse.set.model.tablemodel.Table;
 import org.eclipse.set.model.titlebox.Titlebox;
 import org.eclipse.set.ppmodel.extensions.utils.PlanProToFreeFieldTransformation;
 import org.eclipse.set.ppmodel.extensions.utils.PlanProToTitleboxTransformation;
+import org.eclipse.set.services.table.TableService.TableInfo;
 import org.eclipse.set.utils.SaveAndRefreshAction;
 import org.eclipse.set.utils.SelectableAction;
 import org.eclipse.set.utils.events.ContainerDataChanged;

diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/META-INF/MANIFEST.MF b/java/bundles/org.eclipse.set.feature.table.pt1/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.set.core.services;bundle-version="0.0.0",
  org.eclipse.jface,
  org.eclipse.set.model.planpro,
  org.eclipse.set.feature.table,
- org.apache.xmlgraphics;bundle-version="2.9.0"
+ org.apache.xmlgraphics
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Import-Package: com.google.common.base,
  com.google.common.collect,

diff --git a/java/bundles/org.eclipse.set.feature.table/META-INF/MANIFEST.MF b/java/bundles/org.eclipse.set.feature.table/META-INF/MANIFEST.MF
@@ -90,6 +90,7 @@ Import-Package: com.google.common.base,
  org.slf4j;version="1.7.2"
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/org.eclipse.set.feature.table.internal.TableServiceContextFunction.xml,
+ OSGI-INF/org.eclipse.set.feature.table.compile.TableCompileServiceContextFunction.xml,
  OSGI-INF/org.eclipse.set.feature.table.messages.internal.MessagesContextFunction.xml,
  OSGI-INF/org.eclipse.set.feature.table.overview.ESTWSupplementTableOverviewDescriptionService.xml,
  OSGI-INF/org.eclipse.set.feature.table.overview.ESTWTableOverviewDescriptionService.xml,

diff --git a/...les/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/ToolboxTableView.java b/...les/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/ToolboxTableView.java
@@ -85,6 +85,7 @@
 import org.eclipse.set.ppmodel.extensions.utils.PlanProToTitleboxTransformation;
 import org.eclipse.set.services.export.ExportService;
 import org.eclipse.set.services.export.TableCompileService;
+import org.eclipse.set.services.table.TableService;
 import org.eclipse.set.utils.BasePart;
 import org.eclipse.set.utils.RefreshAction;
 import org.eclipse.set.utils.SelectableAction;

diff --git a/...e/TableCompileServiceContextFunction.java → ...e/TableCompileServiceContextFunction.java b/...e/TableCompileServiceContextFunction.java → ...e/TableCompileServiceContextFunction.java
@@ -6,16 +6,15 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  */
-package org.eclipse.set.feature.export.compileservice;
+package org.eclipse.set.feature.table.compile;
 
 import org.eclipse.e4.core.contexts.ContextFunction;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IContextFunction;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.ui.model.application.MApplication;
-import org.osgi.service.component.annotations.Component;
-
 import org.eclipse.set.services.export.TableCompileService;
+import org.osgi.service.component.annotations.Component;
 
 /**
  * Create and publish the {@link TableCompileService}.

diff --git a/...mpileservice/TableCompileServiceImpl.java → ...able/compile/TableCompileServiceImpl.java b/...mpileservice/TableCompileServiceImpl.java → ...able/compile/TableCompileServiceImpl.java
@@ -6,19 +6,19 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  */
-package org.eclipse.set.feature.export.compileservice;
+package org.eclipse.set.feature.table.compile;
 
 import java.util.EnumMap;
 import java.util.Map;
 import java.util.Set;
 
 import org.eclipse.set.basis.IModelSession;
 import org.eclipse.set.basis.constants.TableType;
-import org.eclipse.set.feature.table.TableService;
 import org.eclipse.set.model.tablemodel.Table;
 import org.eclipse.set.ppmodel.extensions.PlanProSchnittstelleExtensions;
 import org.eclipse.set.services.export.TableCompileService;
 import org.eclipse.set.services.table.TableDiffService;
+import org.eclipse.set.services.table.TableService;
 
 import jakarta.inject.Inject;
 

diff --git a/...feature.table/src/org/eclipse/set/feature/table/internal/TableServiceContextFunction.java b/...feature.table/src/org/eclipse/set/feature/table/internal/TableServiceContextFunction.java
@@ -17,8 +17,8 @@
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.set.feature.table.PlanPro2TableTransformationService;
-import org.eclipse.set.feature.table.TableService;
-import org.eclipse.set.feature.table.TableService.TableInfo;
+import org.eclipse.set.services.table.TableService;
+import org.eclipse.set.services.table.TableService.TableInfo;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
@@ -31,7 +31,7 @@
  * 
  * @usage production
  */
-@Component(service = IContextFunction.class, property = "service.context.key:String=org.eclipse.set.feature.table.TableService")
+@Component(service = IContextFunction.class, property = "service.context.key:String=org.eclipse.set.services.table.TableService")
 public class TableServiceContextFunction extends ContextFunction {
 
 	/**

diff --git a/...clipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java b/...clipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java
@@ -50,7 +50,6 @@
 import org.eclipse.set.core.services.cache.CacheService;
 import org.eclipse.set.core.services.part.ToolboxPartService;
 import org.eclipse.set.feature.table.PlanPro2TableTransformationService;
-import org.eclipse.set.feature.table.TableService;
 import org.eclipse.set.feature.table.messages.Messages;
 import org.eclipse.set.model.planpro.Ansteuerung_Element.Stell_Bereich;
 import org.eclipse.set.model.tablemodel.ColumnDescriptor;
@@ -65,6 +64,7 @@
 import org.eclipse.set.ppmodel.extensions.container.MultiContainer_AttributeGroup;
 import org.eclipse.set.ppmodel.extensions.utils.TableNameInfo;
 import org.eclipse.set.services.table.TableDiffService;
+import org.eclipse.set.services.table.TableService;
 import org.eclipse.set.utils.BasePart;
 import org.eclipse.set.utils.ToolboxConfiguration;
 import org.eclipse.set.utils.table.TableError;

diff --git a/...eclipse.set.feature.table/src/org/eclipse/set/feature/table/messages/MessagesWrapper.java b/...eclipse.set.feature.table/src/org/eclipse/set/feature/table/messages/MessagesWrapper.java
@@ -13,7 +13,6 @@
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.services.nls.Translation;
 import org.eclipse.e4.ui.model.application.MApplication;
-
 import org.eclipse.set.feature.table.messages.internal.MessagesContextFunction;
 
 /**

diff --git a/...lipse.set.feature.table/src/org/eclipse/set/feature/table/overview/TableOverviewPart.java b/...lipse.set.feature.table/src/org/eclipse/set/feature/table/overview/TableOverviewPart.java
@@ -30,12 +30,11 @@
 import org.eclipse.set.basis.constants.TableType;
 import org.eclipse.set.core.services.enumtranslation.EnumTranslationService;
 import org.eclipse.set.core.services.part.ToolboxPartService;
-import org.eclipse.set.feature.table.TableService;
-import org.eclipse.set.feature.table.TableService.TableInfo;
 import org.eclipse.set.feature.table.messages.Messages;
-import org.eclipse.set.feature.table.messages.MessagesWrapper;
 import org.eclipse.set.model.planpro.PlanPro.Container_AttributeGroup;
 import org.eclipse.set.ppmodel.extensions.utils.TableNameInfo;
+import org.eclipse.set.services.table.TableService;
+import org.eclipse.set.services.table.TableService.TableInfo;
 import org.eclipse.set.utils.BasePart;
 import org.eclipse.set.utils.ToolboxConfiguration;
 import org.eclipse.set.utils.events.ContainerDataChanged;
@@ -90,12 +89,6 @@ public class TableOverviewPart extends BasePart {
 	@Inject
 	private TableMenuService tableMenuService;
 
-	// IMPROVE:
-	// Workaround for table services not being registered in TableService
-	// when no table part has been opened yet
-	@Inject
-	MessagesWrapper wrapper;
-
 	private Label completenessHint;
 	private Text missingTablesText;
 	private Button calculateMissing;

diff --git a/java/bundles/org.eclipse.set.services/META-INF/MANIFEST.MF b/java/bundles/org.eclipse.set.services/META-INF/MANIFEST.MF
@@ -5,7 +5,8 @@ Bundle-SymbolicName: org.eclipse.set.services;singleton:=true
 Bundle-Version: 2.4.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.10.0",
- org.eclipse.e4.core.di;bundle-version="1.4.0"
+ org.eclipse.e4.core.di;bundle-version="1.4.0",
+ org.eclipse.set.model.planpro
 Bundle-Vendor: Eclipse Signalling Engineering Toolbox
 Import-Package: com.google.common.cache;version="15.0.0",
  com.google.common.collect;version="15.0.0",
@@ -32,6 +33,9 @@ Import-Package: com.google.common.cache;version="15.0.0",
  org.eclipse.set.model.titlebox,
  org.eclipse.set.model.validationreport,
  org.eclipse.set.ppmodel.extensions.container,
+ org.eclipse.set.ppmodel.extensions.utils,
+ org.eclipse.set.utils,
+ org.eclipse.set.utils.table,
  org.eclipse.swt.widgets,
  org.osgi.service.event;version="1.4.0",
  org.slf4j;version="1.7.2"

diff --git a/...lipse/set/feature/table/TableService.java → ...ipse/set/services/table/TableService.java b/...lipse/set/feature/table/TableService.java → ...ipse/set/services/table/TableService.java
@@ -6,7 +6,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  */
-package org.eclipse.set.feature.table;
+package org.eclipse.set.services.table;
 
 import java.util.Collection;
 import java.util.List;