Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Oct 1, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ...ntime.core/src/com/avaloq/tools/ddk/check/runtime/issue/AbstractDispatchingCheckImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/DefaultCheckImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/DispatchingCheckImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/MonitoredClusteringBuilderState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...builder/src/com/avaloq/tools/ddk/xtext/builder/resourceloader/ParallelResourceLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ols.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/tracing/BuildPhaseEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


/**
Expand Down
2 changes: 1 addition & 1 deletion ....ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/tracing/LoaderDequeueEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


/**
Expand Down
2 changes: 1 addition & 1 deletion com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/LazyLinkingResource2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
4 changes: 2 additions & 2 deletions ...c/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ...com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageLoadable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/ResourceEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions ....ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/ResourceValidationRuleSummaryEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down
50 changes: 0 additions & 50 deletions ...q.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/ForgivingPolymorphicDispatcher.java
View file
Open in desktop

This file was deleted.

44 changes: 0 additions & 44 deletions com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/StringPool.java
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/URIUtil.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...dk.xtext/src/com/avaloq/tools/ddk/xtext/validation/AbstractDeclarativeValidValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 6 additions & 2 deletions com.avaloq.tools.ddk/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,12 @@ 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.util,
com.avaloq.tools.ddk.tracing
Import-Package: org.apache.logging.log4j,org.apache.log4j
Automatic-Module-Name: com.avaloq.tools.ddk

0 ...s/ddk/annotations/SuppressFBWarnings.java → ...s/ddk/annotations/SuppressFBWarnings.java
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...t/tracing/FullGarbageCollectionEvent.java → ...k/tracing/FullGarbageCollectionEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...oq/tools/ddk/xtext/tracing/ITraceSet.java → ...m/avaloq/tools/ddk/tracing/ITraceSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion .../tracing/MinorGarbageCollectionEvent.java → .../tracing/MinorGarbageCollectionEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...tools/ddk/xtext/tracing/NullTraceSet.java → ...valoq/tools/ddk/tracing/NullTraceSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...ddk/xtext/tracing/TraceConfiguration.java → ...tools/ddk/tracing/TraceConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...q/tools/ddk/xtext/tracing/TraceEvent.java → .../avaloq/tools/ddk/tracing/TraceEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...loq/tools/ddk/xtext/tracing/TraceSet.java → ...om/avaloq/tools/ddk/tracing/TraceSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Loading