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 6c215d915f..3e0486f593 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 87d7adaa91..953b921bc6 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 @@ -83,7 +83,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/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF index 87ae45120e..fd6734711c 100644 --- a/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF @@ -23,7 +23,6 @@ Require-Bundle: org.eclipse.xtext, com.avaloq.tools.ddk.xtext.expression;visibility:=reexport, org.eclipse.core.resources, org.eclipse.core.runtime, - org.eclipse.xtend.shared.ui;resolution:=optional, org.eclipse.xtext.ui.codetemplates;resolution:=optional, org.eclipse.xtext.xbase.lib Import-Package: org.apache.log4j 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 395841af8b..07bfd2b86f 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 @@ -62,13 +62,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 c13280669d..9ea73bc407 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. */ @SuppressWarnings("nls") 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 a0beb95720..c46d0c6196 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,8 +5,6 @@ Bundle-Vendor: Avaloq Group AG Bundle-Version: 16.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, com.avaloq.tools.ddk.xtext.generator;visibility:=reexport, 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 834a1d4f2e..4b4563a8fe 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-21 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, @@ -17,7 +16,6 @@ Require-Bundle: org.eclipse.jface, com.avaloq.tools.ddk.xtext, com.avaloq.tools.ddk.xtext.expression, com.avaloq.tools.ddk.xtext.expression.ui, - org.eclipse.xtend.util.stdlib, com.google.guava, com.avaloq.tools.ddk.xtext.ui, org.eclipse.xtend.lib, diff --git a/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF index b724d8be5e..fc743c9037 100644 --- a/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF @@ -8,6 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.xtext, com.avaloq.tools.ddk.xtext.expression;visibility:=reexport, org.eclipse.xtend, + org.eclipse.xtend.typesystem.emf, org.eclipse.emf.mwe2.launch;resolution:=optional, org.eclipse.xtext.util, org.eclipse.emf.ecore, @@ -17,9 +18,7 @@ Require-Bundle: org.eclipse.xtext, com.avaloq.tools.ddk.xtext, org.eclipse.core.resources, org.eclipse.core.runtime, - org.eclipse.xtend.shared.ui;resolution:=optional, - org.eclipse.xtext.xbase.lib, - org.eclipse.xtend.typesystem.emf + org.eclipse.xtext.xbase.lib Import-Package: org.apache.logging.log4j, org.apache.log4j Export-Package: com.avaloq.tools.ddk.xtext.scope, 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 899be2c4a4..cf57184807 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 @@ -252,7 +252,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 6fd49538f5..8c69917504 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 518845b5e2..a7e22d764f 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 7dbe6c51b0..d2497f1ff9 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.target b/ddk-target/ddk.target index 2abb27270f..764cebd36b 100644 --- a/ddk-target/ddk.target +++ b/ddk-target/ddk.target @@ -25,7 +25,9 @@ - + + + @@ -47,6 +49,7 @@ +