Refactor of Xtext-independent classes in com.avaloq.tools.ddk.xtext

In addition, unused classes in com.avaloq.tools.ddk.xtext.util have been removed
dsldevkit · Oct 1, 2024 · 601249f · 601249f
1 parent ff3ea62
commit 601249f
Show file tree

Hide file tree

Showing 29 changed files with 33 additions and 163 deletions.
diff --git a/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.core.resources,
  org.eclipse.xtext,
  org.eclipse.xtext.xbase.lib,
  org.apache.commons.lang,
- com.avaloq.tools.ddk.xtext
+ com.avaloq.tools.ddk.xtext,
+ com.avaloq.tools.ddk
 Export-Package: com.avaloq.tools.ddk.check.runtime,
  com.avaloq.tools.ddk.check.runtime.configuration,
  com.avaloq.tools.ddk.check.runtime.context,

diff --git a/...ntime.core/src/com/avaloq/tools/ddk/check/runtime/issue/AbstractDispatchingCheckImpl.java b/...ntime.core/src/com/avaloq/tools/ddk/check/runtime/issue/AbstractDispatchingCheckImpl.java
@@ -22,7 +22,7 @@
 import org.eclipse.xtext.validation.CheckType;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
 
-import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
+import com.avaloq.tools.ddk.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.tracing.ResourceValidationRuleSummaryEvent;
 import com.google.inject.Inject;
 

diff --git a/...ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/DefaultCheckImpl.java b/...ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/DefaultCheckImpl.java
@@ -27,7 +27,7 @@
 import org.eclipse.xtext.validation.Check;
 import org.eclipse.xtext.validation.CheckMode;
 
-import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
+import com.avaloq.tools.ddk.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.tracing.ResourceValidationRuleSummaryEvent;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;

diff --git a/...check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/DispatchingCheckImpl.java b/...check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/DispatchingCheckImpl.java
@@ -22,7 +22,7 @@
 import org.eclipse.xtext.validation.CheckType;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
 
-import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
+import com.avaloq.tools.ddk.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.tracing.ResourceValidationRuleSummaryEvent;
 import com.avaloq.tools.ddk.xtext.tracing.ResourceValidationRuleSummaryEvent.Collector;
 import com.google.inject.Inject;

diff --git a/...xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/MonitoredClusteringBuilderState.java b/...xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/MonitoredClusteringBuilderState.java
@@ -65,6 +65,7 @@
 import org.eclipse.xtext.util.Tuples;
 
 import com.avaloq.tools.ddk.caching.CacheManager;
+import com.avaloq.tools.ddk.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.build.BuildPhases;
 import com.avaloq.tools.ddk.xtext.builder.layered.IXtextBuildTrigger;
 import com.avaloq.tools.ddk.xtext.builder.tracing.BuildFlushEvent;
@@ -94,7 +95,6 @@
 import com.avaloq.tools.ddk.xtext.resource.extensions.ResourceDescriptions2;
 import com.avaloq.tools.ddk.xtext.resource.persistence.DirectLinkingResourceStorageFacade;
 import com.avaloq.tools.ddk.xtext.scoping.ImplicitReferencesAdapter;
-import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.tracing.ResourceValidationRuleSummaryEvent;
 import com.avaloq.tools.ddk.xtext.util.EmfResourceSetUtil;
 import com.avaloq.tools.ddk.xtext.util.ThrowableUtil;

diff --git a/...builder/src/com/avaloq/tools/ddk/xtext/builder/resourceloader/ParallelResourceLoader.java b/...builder/src/com/avaloq/tools/ddk/xtext/builder/resourceloader/ParallelResourceLoader.java
@@ -39,11 +39,11 @@
 import org.eclipse.xtext.util.Triple;
 import org.eclipse.xtext.util.Tuples;
 
+import com.avaloq.tools.ddk.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.build.BuildPhases;
 import com.avaloq.tools.ddk.xtext.builder.tracing.LoaderDequeueEvent;
 import com.avaloq.tools.ddk.xtext.builder.tracing.ResourceLoadEvent;
 import com.avaloq.tools.ddk.xtext.linking.ILazyLinkingResource2;
-import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.util.EmfResourceSetUtil;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;

diff --git a/...ols.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/tracing/BuildPhaseEvent.java b/...ols.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/tracing/BuildPhaseEvent.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package com.avaloq.tools.ddk.xtext.builder.tracing;
 
-import com.avaloq.tools.ddk.xtext.tracing.TraceEvent;
+import com.avaloq.tools.ddk.tracing.TraceEvent;
 
 
 /**

diff --git a/....ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/tracing/LoaderDequeueEvent.java b/....ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/tracing/LoaderDequeueEvent.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package com.avaloq.tools.ddk.xtext.builder.tracing;
 
-import com.avaloq.tools.ddk.xtext.tracing.TraceEvent;
+import com.avaloq.tools.ddk.tracing.TraceEvent;
 
 
 /**

diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/LazyLinkingResource2.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/LazyLinkingResource2.java
@@ -39,13 +39,13 @@
 import org.eclipse.xtext.util.CancelIndicator;
 import org.eclipse.xtext.util.Triple;
 
+import com.avaloq.tools.ddk.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.build.BuildPhases;
 import com.avaloq.tools.ddk.xtext.parser.IResourceAwareParser;
 import com.avaloq.tools.ddk.xtext.resource.IResourceSetServiceCache;
 import com.avaloq.tools.ddk.xtext.resource.ResourceSetOptions;
 import com.avaloq.tools.ddk.xtext.resource.ServiceCacheAdapter;
 import com.avaloq.tools.ddk.xtext.resource.persistence.ResourceLoadMode;
-import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.tracing.ResourceInferenceEvent;
 import com.google.common.collect.Sets;
 import com.google.inject.Inject;

diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameConverter.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameConverter.java
@@ -31,7 +31,7 @@ public QualifiedName toQualifiedName(final String qualifiedNameAsString) {
  if (Strings.isEmpty(qualifiedNameAsString)) {
  return super.toQualifiedName(qualifiedNameAsString);
  }
- List<String> segs = com.avaloq.tools.ddk.xtext.util.Strings.split(qualifiedNameAsString, '.');
+ List<String> segs = com.avaloq.tools.ddk.util.Strings.split(qualifiedNameAsString, '.');
  return QualifiedName.create(segs);
  }
 

diff --git a/...c/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageFacade.java b/...c/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageFacade.java
@@ -22,9 +22,9 @@
 import org.eclipse.xtext.resource.persistence.ResourceStorageWritable;
 import org.eclipse.xtext.resource.persistence.StorageAwareResource;
 
+import com.avaloq.tools.ddk.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.resource.persistence.ResourceLoadMode.Constituent;
 import com.avaloq.tools.ddk.xtext.resource.persistence.ResourceLoadMode.Instruction;
-import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
 
@@ -35,7 +35,7 @@
  */
 public class DirectLinkingResourceStorageFacade extends ResourceStorageFacade {
 
- public static final String STORE_NODE_MODEL = "com.avaloq.tools.ddk.xtext.resource.persistence.DirectLinkingResourceStorageFacade.STORE_NODE_MODEL";
+ public static final String STORE_NODE_MODEL = "com.avaloq.tools.ddk.xtext.resource.persistence.DirectLinkingResourceStorageFacade.STORE_NODE_MODEL"; //$NON-NLS-1$
 
  @Inject(optional = true)
  @Named(value = STORE_NODE_MODEL)

diff --git a/...com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageLoadable.java b/...com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageLoadable.java
@@ -38,11 +38,11 @@
 import org.eclipse.xtext.resource.persistence.ResourceStorageLoadable;
 import org.eclipse.xtext.resource.persistence.StorageAwareResource;
 
+import com.avaloq.tools.ddk.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.modelinference.InferredModelAssociator;
 import com.avaloq.tools.ddk.xtext.resource.ResourceSetOptions;
 import com.avaloq.tools.ddk.xtext.resource.persistence.ResourceLoadMode.Constituent;
 import com.avaloq.tools.ddk.xtext.resource.persistence.ResourceLoadMode.Instruction;
-import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.tracing.ResourceLoadStorageEvent;
 import com.google.common.base.Ascii;
 import com.google.common.io.CharStreams;

diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/ResourceEvent.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/ResourceEvent.java
@@ -12,6 +12,8 @@
 
 import org.eclipse.emf.common.util.URI;
 
+import com.avaloq.tools.ddk.tracing.TraceEvent;
+
 
 /**
  * An event representing an operation on a resource.

diff --git a/....ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/ResourceValidationRuleSummaryEvent.java b/....ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/ResourceValidationRuleSummaryEvent.java
@@ -16,6 +16,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 
+import com.avaloq.tools.ddk.tracing.ITraceSet;
 import com.google.common.collect.Maps;
 
 

diff --git a/...q.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/ForgivingPolymorphicDispatcher.java b/...q.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/ForgivingPolymorphicDispatcher.java
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/StringPool.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/StringPool.java
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/URIUtil.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/URIUtil.java
diff --git a/...dk.xtext/src/com/avaloq/tools/ddk/xtext/validation/AbstractDeclarativeValidValidator.java b/...dk.xtext/src/com/avaloq/tools/ddk/xtext/validation/AbstractDeclarativeValidValidator.java
@@ -19,7 +19,7 @@
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.xtext.validation.AbstractDeclarativeValidator;
 
-import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
+import com.avaloq.tools.ddk.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.tracing.ResourceValidationRuleSummaryEvent;
 import com.avaloq.tools.ddk.xtext.tracing.ResourceValidationRuleSummaryEvent.Collector;
 import com.google.common.base.Strings;

diff --git a/com.avaloq.tools.ddk/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk/META-INF/MANIFEST.MF
@@ -10,8 +10,11 @@ Require-Bundle: com.google.guava,
  org.apache.commons.lang,
  org.eclipse.jdt.annotation,
  org.eclipse.core.resources,
- org.eclipse.core.runtime
-Export-Package: com.avaloq.tools.ddk.caching
+ org.eclipse.core.runtime,
+ com.google.inject
+Export-Package: com.avaloq.tools.ddk.annotations,
+ com.avaloq.tools.ddk.caching,
+ com.avaloq.tools.ddk.tracing
 Import-Package: org.apache.logging.log4j,org.apache.log4j
 Automatic-Module-Name: com.avaloq.tools.ddk
 
diff --git a/...s/ddk/annotations/SuppressFBWarnings.java → ...s/ddk/annotations/SuppressFBWarnings.java b/...s/ddk/annotations/SuppressFBWarnings.java → ...s/ddk/annotations/SuppressFBWarnings.java
diff --git a/...t/tracing/FullGarbageCollectionEvent.java → ...k/tracing/FullGarbageCollectionEvent.java b/...t/tracing/FullGarbageCollectionEvent.java → ...k/tracing/FullGarbageCollectionEvent.java
@@ -9,7 +9,7 @@
  * Avaloq Group AG - initial API and implementation
  *******************************************************************************/
 
-package com.avaloq.tools.ddk.xtext.tracing;
+package com.avaloq.tools.ddk.tracing;
 
 import java.util.Arrays;
 

diff --git a/...oq/tools/ddk/xtext/tracing/ITraceSet.java → ...m/avaloq/tools/ddk/tracing/ITraceSet.java b/...oq/tools/ddk/xtext/tracing/ITraceSet.java → ...m/avaloq/tools/ddk/tracing/ITraceSet.java
@@ -8,7 +8,7 @@
  * Contributors:
  * Avaloq Group AG - initial API and implementation
  *******************************************************************************/
-package com.avaloq.tools.ddk.xtext.tracing;
+package com.avaloq.tools.ddk.tracing;
 
 import java.util.function.Supplier;
 

diff --git a/.../tracing/MinorGarbageCollectionEvent.java → .../tracing/MinorGarbageCollectionEvent.java b/.../tracing/MinorGarbageCollectionEvent.java → .../tracing/MinorGarbageCollectionEvent.java
@@ -9,7 +9,7 @@
  * Avaloq Group AG - initial API and implementation
  *******************************************************************************/
 
-package com.avaloq.tools.ddk.xtext.tracing;
+package com.avaloq.tools.ddk.tracing;
 
 import java.util.Arrays;
 

diff --git a/...tools/ddk/xtext/tracing/NullTraceSet.java → ...valoq/tools/ddk/tracing/NullTraceSet.java b/...tools/ddk/xtext/tracing/NullTraceSet.java → ...valoq/tools/ddk/tracing/NullTraceSet.java
@@ -8,7 +8,7 @@
  * Contributors:
  * Avaloq Group AG - initial API and implementation
  *******************************************************************************/
-package com.avaloq.tools.ddk.xtext.tracing;
+package com.avaloq.tools.ddk.tracing;
 
 import java.util.function.Supplier;
 

diff --git a/...ddk/xtext/tracing/TraceConfiguration.java → ...tools/ddk/tracing/TraceConfiguration.java b/...ddk/xtext/tracing/TraceConfiguration.java → ...tools/ddk/tracing/TraceConfiguration.java
@@ -9,7 +9,7 @@
  * Avaloq Group AG - initial API and implementation
  *******************************************************************************/
 
-package com.avaloq.tools.ddk.xtext.tracing;
+package com.avaloq.tools.ddk.tracing;
 
 import java.util.Map;
 

diff --git a/...q/tools/ddk/xtext/tracing/TraceEvent.java → .../avaloq/tools/ddk/tracing/TraceEvent.java b/...q/tools/ddk/xtext/tracing/TraceEvent.java → .../avaloq/tools/ddk/tracing/TraceEvent.java
@@ -8,7 +8,7 @@
  * Contributors:
  * Avaloq Group AG - initial API and implementation
  *******************************************************************************/
-package com.avaloq.tools.ddk.xtext.tracing;
+package com.avaloq.tools.ddk.tracing;
 
 import java.util.Arrays;
 

diff --git a/...loq/tools/ddk/xtext/tracing/TraceSet.java → ...om/avaloq/tools/ddk/tracing/TraceSet.java b/...loq/tools/ddk/xtext/tracing/TraceSet.java → ...om/avaloq/tools/ddk/tracing/TraceSet.java
@@ -8,7 +8,7 @@
  * Contributors:
  * Avaloq Group AG - initial API and implementation
  *******************************************************************************/
-package com.avaloq.tools.ddk.xtext.tracing;
+package com.avaloq.tools.ddk.tracing;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -18,7 +18,7 @@
 import java.util.function.Supplier;
 
 import com.avaloq.tools.ddk.annotations.SuppressFBWarnings;
-import com.avaloq.tools.ddk.xtext.tracing.TraceEvent.Trigger;
+import com.avaloq.tools.ddk.tracing.TraceEvent.Trigger;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
 import com.google.common.eventbus.AsyncEventBus;