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 to allow reducing dependencies to ddk.xtext.builder #1002

Merged
merged 1 commit into from
Sep 25, 2024
Merged

Refactor to allow reducing dependencies to ddk.xtext.builder #1002

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
2 changes: 1 addition & 1 deletion ....tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/CurrentDescriptions2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
import org.eclipse.xtext.resource.IResourceDescriptions;
import org.eclipse.xtext.resource.impl.ResourceDescriptionsData;

import com.avaloq.tools.ddk.xtext.builder.layered.NullResourceDescriptionsData;
import com.avaloq.tools.ddk.xtext.resource.extensions.DelegatingResourceDescriptionsData;
import com.avaloq.tools.ddk.xtext.resource.extensions.IResourceDescriptions2;
import com.avaloq.tools.ddk.xtext.resource.extensions.IResourceDescriptionsData;
import com.avaloq.tools.ddk.xtext.resource.extensions.NullResourceDescriptionsData;
import com.avaloq.tools.ddk.xtext.resource.extensions.ResourceDescriptions2;


Expand Down
8 changes: 4 additions & 4 deletions ...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 @@ -66,11 +66,7 @@

import com.avaloq.tools.ddk.caching.CacheManager;
import com.avaloq.tools.ddk.xtext.build.BuildPhases;
import com.avaloq.tools.ddk.xtext.builder.layered.ILayeredResourceDescriptions;
import com.avaloq.tools.ddk.xtext.builder.layered.IXtextBuildTrigger;
import com.avaloq.tools.ddk.xtext.builder.layered.IXtextTargetPlatform;
import com.avaloq.tools.ddk.xtext.builder.layered.IXtextTargetPlatformManager;
import com.avaloq.tools.ddk.xtext.builder.layered.NullResourceDescriptionsData;
import com.avaloq.tools.ddk.xtext.builder.tracing.BuildFlushEvent;
import com.avaloq.tools.ddk.xtext.builder.tracing.BuildIndexingEvent;
import com.avaloq.tools.ddk.xtext.builder.tracing.BuildLinkingEvent;
Expand All @@ -80,6 +76,9 @@
import com.avaloq.tools.ddk.xtext.builder.tracing.ResourceLinkingMemoryEvent;
import com.avaloq.tools.ddk.xtext.builder.tracing.ResourceProcessingEvent;
import com.avaloq.tools.ddk.xtext.builder.tracing.ResourceValidationEvent;
import com.avaloq.tools.ddk.xtext.layered.ILayeredResourceDescriptions;
import com.avaloq.tools.ddk.xtext.layered.IXtextTargetPlatform;
import com.avaloq.tools.ddk.xtext.layered.IXtextTargetPlatformManager;
import com.avaloq.tools.ddk.xtext.linking.ILazyLinkingResource2;
import com.avaloq.tools.ddk.xtext.resource.AbstractCachingResourceDescriptionManager;
import com.avaloq.tools.ddk.xtext.resource.AbstractResourceDescriptionDelta;
Expand All @@ -90,6 +89,7 @@
import com.avaloq.tools.ddk.xtext.resource.extensions.ForwardingResourceDescriptions;
import com.avaloq.tools.ddk.xtext.resource.extensions.IResourceDescriptions2;
import com.avaloq.tools.ddk.xtext.resource.extensions.IResourceDescriptionsData;
import com.avaloq.tools.ddk.xtext.resource.extensions.NullResourceDescriptionsData;
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;
Expand Down
84 changes: 0 additions & 84 deletions ...xt.builder/src/com/avaloq/tools/ddk/xtext/builder/layered/DefaultXtextTargetPlatform.java
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions ...xt.builder/src/com/avaloq/tools/ddk/xtext/builder/layered/NullPersistedStateProvider.java
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Export-Package: com.avaloq.tools.ddk.xtext.build,
com.avaloq.tools.ddk.xtext.formatting.locators,
com.avaloq.tools.ddk.xtext.formatting.locators.conditional,
com.avaloq.tools.ddk.xtext.grammar,
com.avaloq.tools.ddk.xtext.layered,
com.avaloq.tools.ddk.xtext.linking,
com.avaloq.tools.ddk.xtext.modelinference,
com.avaloq.tools.ddk.xtext.modelinference.impl,
Expand Down
4 changes: 2 additions & 2 deletions .../ddk/xtext/builder/IBinaryModelStore.java → ...ls/ddk/xtext/build/IBinaryModelStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* licence agreement you entered into with Avaloq Licence AG.
*/

package com.avaloq.tools.ddk.xtext.builder;
package com.avaloq.tools.ddk.xtext.build;

import java.io.IOException;
import java.io.InputStream;
Expand All @@ -17,7 +17,7 @@

import org.eclipse.emf.common.util.URI;

import com.avaloq.tools.ddk.xtext.builder.IBinaryModelStore.NullBinaryModelStore;
import com.avaloq.tools.ddk.xtext.build.IBinaryModelStore.NullBinaryModelStore;
import com.google.inject.ImplementedBy;


Expand Down
2 changes: 1 addition & 1 deletion ...ed/DefaultXtextTargetPlatformManager.java → ...ed/DefaultXtextTargetPlatformManager.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.builder.layered;
package com.avaloq.tools.ddk.xtext.layered;

import java.io.IOException;
import java.util.Collection;
Expand Down
2 changes: 1 addition & 1 deletion ...dk/xtext/builder/layered/IIssueStore.java → .../tools/ddk/xtext/layered/IIssueStore.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.builder.layered;
package com.avaloq.tools.ddk.xtext.layered;

import org.eclipse.emf.common.util.URI;
import org.eclipse.xtext.validation.Issue;
Expand Down
2 changes: 1 addition & 1 deletion ...layered/ILayeredResourceDescriptions.java → ...layered/ILayeredResourceDescriptions.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.builder.layered;
package com.avaloq.tools.ddk.xtext.layered;

import org.eclipse.xtext.resource.IResourceDescription;

Expand Down
7 changes: 2 additions & 5 deletions ...builder/layered/IXtextTargetPlatform.java → ...k/xtext/layered/IXtextTargetPlatform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,17 @@
* Contributors:
* Avaloq Group AG - initial API and implementation
*******************************************************************************/
package com.avaloq.tools.ddk.xtext.builder.layered;
package com.avaloq.tools.ddk.xtext.layered;

import java.io.IOException;
import java.util.Collection;
import java.util.Map;

import org.eclipse.core.runtime.IProgressMonitor;

import com.avaloq.tools.ddk.xtext.builder.IBinaryModelStore;
import com.avaloq.tools.ddk.xtext.builder.layered.DefaultXtextTargetPlatform;
import com.avaloq.tools.ddk.xtext.build.IBinaryModelStore;
import com.avaloq.tools.ddk.xtext.resource.IDerivedObjectAssociationsStore;
import com.avaloq.tools.ddk.xtext.resource.extensions.IResourceDescriptionsData;
import com.google.inject.ImplementedBy;


/**
Expand Down Expand Up @@ -49,7 +47,6 @@
* encapsulated index or the issue store are accessed, the platform must be opened through {@link #open(boolean, IProgressMonitor)}. Once open, all operations
* are allowed. Once it is no longer in use, a platform must be closed through {@link #close(IProgressMonitor)}.
*/
@ImplementedBy(DefaultXtextTargetPlatform.class)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@andrewL-avlq , will I need to bind this now in ASMD or do we have a more specific XtextTargetPlatform?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we do not inject IXtextTargetPlatforms directly, but instead bind the IXtextTargetPlatformFactory and inject/use that instead.

public interface IXtextTargetPlatform {

/**
Expand Down
2 changes: 1 addition & 1 deletion .../layered/IXtextTargetPlatformFactory.java → .../layered/IXtextTargetPlatformFactory.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.builder.layered;
package com.avaloq.tools.ddk.xtext.layered;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
Expand Down
2 changes: 1 addition & 1 deletion .../layered/IXtextTargetPlatformManager.java → .../layered/IXtextTargetPlatformManager.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.builder.layered;
package com.avaloq.tools.ddk.xtext.layered;

import java.util.Collection;

Expand Down
5 changes: 3 additions & 2 deletions ...lder/layered/NullXtextTargetPlatform.java → ...text/layered/NullXtextTargetPlatform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,17 @@
* Contributors:
* Avaloq Group AG - initial API and implementation
*******************************************************************************/
package com.avaloq.tools.ddk.xtext.builder.layered;
package com.avaloq.tools.ddk.xtext.layered;

import java.util.Collection;
import java.util.Map;

import org.eclipse.core.runtime.IProgressMonitor;

import com.avaloq.tools.ddk.xtext.builder.IBinaryModelStore;
import com.avaloq.tools.ddk.xtext.build.IBinaryModelStore;
import com.avaloq.tools.ddk.xtext.resource.IDerivedObjectAssociationsStore;
import com.avaloq.tools.ddk.xtext.resource.extensions.IResourceDescriptionsData;
import com.avaloq.tools.ddk.xtext.resource.extensions.NullResourceDescriptionsData;


/**
Expand Down
5 changes: 1 addition & 4 deletions ...layered/NullResourceDescriptionsData.java → ...ensions/NullResourceDescriptionsData.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.builder.layered;
package com.avaloq.tools.ddk.xtext.resource.extensions;

import java.util.Collections;
import java.util.Set;
Expand All @@ -19,9 +19,6 @@
import org.eclipse.xtext.resource.IResourceDescription;
import org.eclipse.xtext.resource.impl.ResourceDescriptionsData;

import com.avaloq.tools.ddk.xtext.resource.extensions.DelegatingResourceDescriptionsData;
import com.avaloq.tools.ddk.xtext.resource.extensions.IResourceDescriptionsData;


/**
* A null version of {@link ResourceDescriptionsData}.
Expand Down