Skip to content

Commit b293737

Browse files
committed
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
1 parent ff3ea62 commit b293737

File tree

29 files changed

+34
-163
lines changed

29 files changed

+34
-163
lines changed

com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.core.resources,
1010
org.eclipse.xtext,
1111
org.eclipse.xtext.xbase.lib,
1212
org.apache.commons.lang,
13-
com.avaloq.tools.ddk.xtext
13+
com.avaloq.tools.ddk.xtext,
14+
com.avaloq.tools.ddk
1415
Export-Package: com.avaloq.tools.ddk.check.runtime,
1516
com.avaloq.tools.ddk.check.runtime.configuration,
1617
com.avaloq.tools.ddk.check.runtime.context,

com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/AbstractDispatchingCheckImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.eclipse.xtext.validation.CheckType;
2323
import org.eclipse.xtext.validation.ValidationMessageAcceptor;
2424

25-
import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
25+
import com.avaloq.tools.ddk.tracing.ITraceSet;
2626
import com.avaloq.tools.ddk.xtext.tracing.ResourceValidationRuleSummaryEvent;
2727
import com.google.inject.Inject;
2828

com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/DefaultCheckImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.eclipse.xtext.validation.Check;
2828
import org.eclipse.xtext.validation.CheckMode;
2929

30-
import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
30+
import com.avaloq.tools.ddk.tracing.ITraceSet;
3131
import com.avaloq.tools.ddk.xtext.tracing.ResourceValidationRuleSummaryEvent;
3232
import com.google.common.collect.Lists;
3333
import com.google.common.collect.Maps;

com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/DispatchingCheckImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.eclipse.xtext.validation.CheckType;
2323
import org.eclipse.xtext.validation.ValidationMessageAcceptor;
2424

25-
import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
25+
import com.avaloq.tools.ddk.tracing.ITraceSet;
2626
import com.avaloq.tools.ddk.xtext.tracing.ResourceValidationRuleSummaryEvent;
2727
import com.avaloq.tools.ddk.xtext.tracing.ResourceValidationRuleSummaryEvent.Collector;
2828
import com.google.inject.Inject;

com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/MonitoredClusteringBuilderState.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
import org.eclipse.xtext.util.Tuples;
6666

6767
import com.avaloq.tools.ddk.caching.CacheManager;
68+
import com.avaloq.tools.ddk.tracing.ITraceSet;
6869
import com.avaloq.tools.ddk.xtext.build.BuildPhases;
6970
import com.avaloq.tools.ddk.xtext.builder.layered.IXtextBuildTrigger;
7071
import com.avaloq.tools.ddk.xtext.builder.tracing.BuildFlushEvent;
@@ -94,7 +95,6 @@
9495
import com.avaloq.tools.ddk.xtext.resource.extensions.ResourceDescriptions2;
9596
import com.avaloq.tools.ddk.xtext.resource.persistence.DirectLinkingResourceStorageFacade;
9697
import com.avaloq.tools.ddk.xtext.scoping.ImplicitReferencesAdapter;
97-
import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
9898
import com.avaloq.tools.ddk.xtext.tracing.ResourceValidationRuleSummaryEvent;
9999
import com.avaloq.tools.ddk.xtext.util.EmfResourceSetUtil;
100100
import com.avaloq.tools.ddk.xtext.util.ThrowableUtil;

com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/resourceloader/ParallelResourceLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
import org.eclipse.xtext.util.Triple;
4040
import org.eclipse.xtext.util.Tuples;
4141

42+
import com.avaloq.tools.ddk.tracing.ITraceSet;
4243
import com.avaloq.tools.ddk.xtext.build.BuildPhases;
4344
import com.avaloq.tools.ddk.xtext.builder.tracing.LoaderDequeueEvent;
4445
import com.avaloq.tools.ddk.xtext.builder.tracing.ResourceLoadEvent;
4546
import com.avaloq.tools.ddk.xtext.linking.ILazyLinkingResource2;
46-
import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
4747
import com.avaloq.tools.ddk.xtext.util.EmfResourceSetUtil;
4848
import com.google.common.base.Joiner;
4949
import com.google.common.collect.Lists;

com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/tracing/BuildPhaseEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*******************************************************************************/
1111
package com.avaloq.tools.ddk.xtext.builder.tracing;
1212

13-
import com.avaloq.tools.ddk.xtext.tracing.TraceEvent;
13+
import com.avaloq.tools.ddk.tracing.TraceEvent;
1414

1515

1616
/**

com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/tracing/LoaderDequeueEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*******************************************************************************/
1111
package com.avaloq.tools.ddk.xtext.builder.tracing;
1212

13-
import com.avaloq.tools.ddk.xtext.tracing.TraceEvent;
13+
import com.avaloq.tools.ddk.tracing.TraceEvent;
1414

1515

1616
/**

com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/LazyLinkingResource2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
import org.eclipse.xtext.util.CancelIndicator;
4040
import org.eclipse.xtext.util.Triple;
4141

42+
import com.avaloq.tools.ddk.tracing.ITraceSet;
4243
import com.avaloq.tools.ddk.xtext.build.BuildPhases;
4344
import com.avaloq.tools.ddk.xtext.parser.IResourceAwareParser;
4445
import com.avaloq.tools.ddk.xtext.resource.IResourceSetServiceCache;
4546
import com.avaloq.tools.ddk.xtext.resource.ResourceSetOptions;
4647
import com.avaloq.tools.ddk.xtext.resource.ServiceCacheAdapter;
4748
import com.avaloq.tools.ddk.xtext.resource.persistence.ResourceLoadMode;
48-
import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
4949
import com.avaloq.tools.ddk.xtext.tracing.ResourceInferenceEvent;
5050
import com.google.common.collect.Sets;
5151
import com.google.inject.Inject;

com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public QualifiedName toQualifiedName(final String qualifiedNameAsString) {
3131
if (Strings.isEmpty(qualifiedNameAsString)) {
3232
return super.toQualifiedName(qualifiedNameAsString);
3333
}
34-
List<String> segs = com.avaloq.tools.ddk.xtext.util.Strings.split(qualifiedNameAsString, '.');
34+
List<String> segs = com.avaloq.tools.ddk.util.Strings.split(qualifiedNameAsString, '.');
3535
return QualifiedName.create(segs);
3636
}
3737

0 commit comments

Comments
 (0)