diff --git a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/validation/ExecutionEnvironmentStandaloneSetup.java b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/validation/ExecutionEnvironmentStandaloneSetup.java index 6720c9815..45b516920 100644 --- a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/validation/ExecutionEnvironmentStandaloneSetup.java +++ b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/validation/ExecutionEnvironmentStandaloneSetup.java @@ -1,13 +1,14 @@ package com.avaloq.tools.ddk.check.validation; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.avaloq.tools.ddk.check.runtime.configuration.ModelLocation; import com.avaloq.tools.ddk.check.runtime.registry.ICheckCatalogRegistry; import com.avaloq.tools.ddk.check.runtime.registry.ICheckValidatorRegistry; import com.avaloq.tools.ddk.check.runtime.registry.ICheckValidatorStandaloneSetup; + /** * Standalone setup for ExecutionEnvironment as required by the standalone builder. */ @@ -18,10 +19,10 @@ public class ExecutionEnvironmentStandaloneSetup implements ICheckValidatorStand private static final String GRAMMAR_NAME = "com.avaloq.tools.ddk.check.TestLanguage"; private static final String CATALOG_FILE_PATH = "com/avaloq/tools/ddk/check/validation/ExecutionEnvironment.check"; + @Override public void doSetup() { ICheckValidatorRegistry.INSTANCE.registerValidator(GRAMMAR_NAME, new ExecutionEnvironmentCheckImpl()); - ICheckCatalogRegistry.INSTANCE.registerCatalog(GRAMMAR_NAME, new ModelLocation( - ExecutionEnvironmentStandaloneSetup.class.getClassLoader().getResource(CATALOG_FILE_PATH), CATALOG_FILE_PATH)); + ICheckCatalogRegistry.INSTANCE.registerCatalog(GRAMMAR_NAME, new ModelLocation(ExecutionEnvironmentStandaloneSetup.class.getClassLoader().getResource(CATALOG_FILE_PATH), CATALOG_FILE_PATH)); LOG.info("Standalone setup done for com/avaloq/tools/ddk/check/validation/ExecutionEnvironment.check"); } diff --git a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/validation/LibraryChecksStandaloneSetup.java b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/validation/LibraryChecksStandaloneSetup.java index 55875131f..2d7195ce2 100644 --- a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/validation/LibraryChecksStandaloneSetup.java +++ b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/validation/LibraryChecksStandaloneSetup.java @@ -1,13 +1,14 @@ package com.avaloq.tools.ddk.check.validation; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.avaloq.tools.ddk.check.runtime.configuration.ModelLocation; import com.avaloq.tools.ddk.check.runtime.registry.ICheckCatalogRegistry; import com.avaloq.tools.ddk.check.runtime.registry.ICheckValidatorRegistry; import com.avaloq.tools.ddk.check.runtime.registry.ICheckValidatorStandaloneSetup; + /** * Standalone setup for LibraryChecks as required by the standalone builder. */ @@ -18,10 +19,10 @@ public class LibraryChecksStandaloneSetup implements ICheckValidatorStandaloneSe private static final String GRAMMAR_NAME = "com.avaloq.tools.ddk.check.TestLanguage"; private static final String CATALOG_FILE_PATH = "com/avaloq/tools/ddk/check/validation/LibraryChecks.check"; + @Override public void doSetup() { ICheckValidatorRegistry.INSTANCE.registerValidator(GRAMMAR_NAME, new LibraryChecksCheckImpl()); - ICheckCatalogRegistry.INSTANCE.registerCatalog(GRAMMAR_NAME, new ModelLocation( - LibraryChecksStandaloneSetup.class.getClassLoader().getResource(CATALOG_FILE_PATH), CATALOG_FILE_PATH)); + ICheckCatalogRegistry.INSTANCE.registerCatalog(GRAMMAR_NAME, new ModelLocation(LibraryChecksStandaloneSetup.class.getClassLoader().getResource(CATALOG_FILE_PATH), CATALOG_FILE_PATH)); LOG.info("Standalone setup done for com/avaloq/tools/ddk/check/validation/LibraryChecks.check"); } diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/wizard/CheckCatalogGenerator.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/wizard/CheckCatalogGenerator.java index a95d770ee..ee03af42f 100644 --- a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/wizard/CheckCatalogGenerator.java +++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/wizard/CheckCatalogGenerator.java @@ -34,7 +34,7 @@ public class CheckCatalogGenerator { private JavaIoFileSystemAccess fsa; /** - * Generates a check file. Calls an Xpand template. + * Generates a check file. * * @param path * the path used for the output file destination diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/wizard/CheckProjectInfo.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/wizard/CheckProjectInfo.java index 51f6ebc02..8e42b8a65 100644 --- a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/wizard/CheckProjectInfo.java +++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/wizard/CheckProjectInfo.java @@ -82,7 +82,7 @@ public String getDefaultPackageImport() { } /** - * Gets the path to where files should be generated by Xpand. If {@code path} is {@code null}, a default is calculated. + * Gets the path to where files should be generated. If {@code path} is {@code null}, a default is calculated. * * @return the path */ diff --git a/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/validation/ExportValidator.java b/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/validation/ExportValidator.java index 298d4b1f7..cb1eed997 100644 --- a/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/validation/ExportValidator.java +++ b/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/validation/ExportValidator.java @@ -61,13 +61,7 @@ public void checkExtensions(final ExportModel model) { if (!Platform.isRunning()) { resourceManager = new ResourceManagerDefaultImpl(); } - // } else { - // FIXME: sort out xpand - // IXtendXpandProject project = Activator.getExtXptModelManager().findProject(ResourcesPlugin.getWorkspace().getRoot().getFile(new - // Path(model.eResource().getURI().toPlatformString(true))).getProject()); - // if (project != null) { - // resourceManager = new XpandPluginExecutionContext(project).getResourceManager(); - // } + if (resourceManager == null) { return; } diff --git a/com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/generator/CompilationContext.java b/com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/generator/CompilationContext.java index 2cbd44c99..44c6f104f 100644 --- a/com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/generator/CompilationContext.java +++ b/com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/generator/CompilationContext.java @@ -34,7 +34,7 @@ * The CompilationContext is used by CodeGeneration.ext to resolve types, get information about local variables, etc. It is a * wrapper around {@link ExecutionContext}. *

- * Note that many of these methods are called from Xtend and Xpand and will thus not show up when doing a find references in Eclipse. + * Note that many of these methods are called from Xtend and will thus not show up when doing a find references in Eclipse. */ public class CompilationContext { diff --git a/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF index 9d451bb93..699bcfc3d 100644 --- a/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF @@ -5,7 +5,6 @@ Bundle-Vendor: Avaloq Group AG Bundle-Version: 13.4.0.qualifier Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format.generator;singleton:=true Require-Bundle: com.avaloq.tools.ddk.xtext.format;visibility:=reexport, - org.eclipse.xpand, org.eclipse.xtend, org.eclipse.xtext.xtext.generator, org.eclipse.xtext, diff --git a/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF index e3c5721ce..5735c38d6 100644 --- a/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF @@ -8,7 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.jface, org.eclipse.ui.views, org.eclipse.emf.codegen.ecore, - org.eclipse.xpand, org.eclipse.xtext, org.eclipse.xtext.xtext.generator, org.eclipse.emf.mwe2.lib, diff --git a/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopeProviderGenerator.xtend b/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopeProviderGenerator.xtend index 1575fa990..d26725378 100644 --- a/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopeProviderGenerator.xtend +++ b/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopeProviderGenerator.xtend @@ -220,7 +220,7 @@ class ScopeProviderGenerator { ''' def dispatch scopeExpression(ScopeExpression it, ScopeModel model, String typeOrRef, ScopeDefinition scope, Boolean isGlobal) { - error("Xpand called the wrong definition." + it.toString() + javaContributorComment(it.location())) + error("Xtend called the wrong definition." + it.toString() + javaContributorComment(it.location())) } def dispatch scopeExpression(FactoryExpression it, ScopeModel model, String typeOrRef, ScopeDefinition scope, Boolean isGlobal) { diff --git a/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/validation/ScopeValidator.java b/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/validation/ScopeValidator.java index 6fd49538f..8c6991750 100644 --- a/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/validation/ScopeValidator.java +++ b/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/validation/ScopeValidator.java @@ -69,13 +69,7 @@ public void checkExtensions(final ScopeModel model) { if (!Platform.isRunning()) { resourceManager = new ResourceManagerDefaultImpl(); } - // } else { - // FIXME: xpand - // IXtendXpandProject project = Activator.getExtXptModelManager().findProject(ResourcesPlugin.getWorkspace().getRoot().getFile(new - // Path(model.eResource().getURI().toPlatformString(true))).getProject()); - // if (project != null) { - // resourceManager = new XpandPluginExecutionContext(project).getResourceManager(); - // } + if (resourceManager == null) { return; } diff --git a/com.avaloq.tools.ddk.xtext.test/pom.xml b/com.avaloq.tools.ddk.xtext.test/pom.xml index 0a38beb16..5024c78c3 100644 --- a/com.avaloq.tools.ddk.xtext.test/pom.xml +++ b/com.avaloq.tools.ddk.xtext.test/pom.xml @@ -48,11 +48,6 @@ org.eclipse.xtext.sdk 0.0.0 - - eclipse-feature - org.eclipse.xpand.sdk - 0.0.0 - eclipse-feature org.eclipse.pde diff --git a/ddk-configuration/launches/devkit-run.launch b/ddk-configuration/launches/devkit-run.launch index 8ae7d2f0f..7b4f1b8c4 100644 --- a/ddk-configuration/launches/devkit-run.launch +++ b/ddk-configuration/launches/devkit-run.launch @@ -250,7 +250,6 @@ - diff --git a/ddk-target/ddk-antlr.target b/ddk-target/ddk-antlr.target index 6d977e8ae..1add9148e 100644 --- a/ddk-target/ddk-antlr.target +++ b/ddk-target/ddk-antlr.target @@ -10,7 +10,6 @@ - diff --git a/ddk-target/ddk.target b/ddk-target/ddk.target index c94642c4b..36e180998 100644 --- a/ddk-target/ddk.target +++ b/ddk-target/ddk.target @@ -1,6 +1,6 @@ - + @@ -17,10 +17,6 @@ - - - -