Skip to content

Commit 6b17621

Browse files
rubenporrasjoaodinissf
authored andcommitted
chore: eliminate all usages of Xpand
Co-Authored-By: Rubén Porras Campo <[email protected]>
1 parent 3764bb6 commit 6b17621

File tree

17 files changed

+75
-98
lines changed

17 files changed

+75
-98
lines changed

com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/validation/ExecutionEnvironmentStandaloneSetup.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package com.avaloq.tools.ddk.check.validation;
22

3-
import org.apache.logging.log4j.Logger;
43
import org.apache.logging.log4j.LogManager;
4+
import org.apache.logging.log4j.Logger;
55

66
import com.avaloq.tools.ddk.check.runtime.configuration.ModelLocation;
77
import com.avaloq.tools.ddk.check.runtime.registry.ICheckCatalogRegistry;
88
import com.avaloq.tools.ddk.check.runtime.registry.ICheckValidatorRegistry;
99
import com.avaloq.tools.ddk.check.runtime.registry.ICheckValidatorStandaloneSetup;
1010

11+
1112
/**
1213
* Standalone setup for ExecutionEnvironment as required by the standalone builder.
1314
*/
@@ -21,8 +22,7 @@ public class ExecutionEnvironmentStandaloneSetup implements ICheckValidatorStand
2122
@Override
2223
public void doSetup() {
2324
ICheckValidatorRegistry.INSTANCE.registerValidator(GRAMMAR_NAME, new ExecutionEnvironmentCheckImpl());
24-
ICheckCatalogRegistry.INSTANCE.registerCatalog(GRAMMAR_NAME, new ModelLocation(
25-
ExecutionEnvironmentStandaloneSetup.class.getClassLoader().getResource(CATALOG_FILE_PATH), CATALOG_FILE_PATH));
25+
ICheckCatalogRegistry.INSTANCE.registerCatalog(GRAMMAR_NAME, new ModelLocation(ExecutionEnvironmentStandaloneSetup.class.getClassLoader().getResource(CATALOG_FILE_PATH), CATALOG_FILE_PATH));
2626
LOG.info("Standalone setup done for com/avaloq/tools/ddk/check/validation/ExecutionEnvironment.check");
2727
}
2828

com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/validation/LibraryChecksStandaloneSetup.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package com.avaloq.tools.ddk.check.validation;
22

3-
import org.apache.logging.log4j.Logger;
43
import org.apache.logging.log4j.LogManager;
4+
import org.apache.logging.log4j.Logger;
55

66
import com.avaloq.tools.ddk.check.runtime.configuration.ModelLocation;
77
import com.avaloq.tools.ddk.check.runtime.registry.ICheckCatalogRegistry;
88
import com.avaloq.tools.ddk.check.runtime.registry.ICheckValidatorRegistry;
99
import com.avaloq.tools.ddk.check.runtime.registry.ICheckValidatorStandaloneSetup;
1010

11+
1112
/**
1213
* Standalone setup for LibraryChecks as required by the standalone builder.
1314
*/
@@ -21,8 +22,7 @@ public class LibraryChecksStandaloneSetup implements ICheckValidatorStandaloneSe
2122
@Override
2223
public void doSetup() {
2324
ICheckValidatorRegistry.INSTANCE.registerValidator(GRAMMAR_NAME, new LibraryChecksCheckImpl());
24-
ICheckCatalogRegistry.INSTANCE.registerCatalog(GRAMMAR_NAME, new ModelLocation(
25-
LibraryChecksStandaloneSetup.class.getClassLoader().getResource(CATALOG_FILE_PATH), CATALOG_FILE_PATH));
25+
ICheckCatalogRegistry.INSTANCE.registerCatalog(GRAMMAR_NAME, new ModelLocation(LibraryChecksStandaloneSetup.class.getClassLoader().getResource(CATALOG_FILE_PATH), CATALOG_FILE_PATH));
2626
LOG.info("Standalone setup done for com/avaloq/tools/ddk/check/validation/LibraryChecks.check");
2727
}
2828

com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/wizard/CheckCatalogGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class CheckCatalogGenerator {
3434
private JavaIoFileSystemAccess fsa;
3535

3636
/**
37-
* Generates a check file. Calls an Xpand template.
37+
* Generates a check file.
3838
*
3939
* @param path
4040
* the path used for the output file destination

com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/wizard/CheckProjectInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public String getDefaultPackageImport() {
8383
}
8484

8585
/**
86-
* Gets the path to where files should be generated by Xpand. If {@code path} is {@code null}, a default is calculated.
86+
* Gets the path to where files should be generated. If {@code path} is {@code null}, a default is calculated.
8787
*
8888
* @return the path
8989
*/

com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ Require-Bundle: org.eclipse.xtext,
2222
com.avaloq.tools.ddk.xtext.expression;visibility:=reexport,
2323
org.eclipse.core.resources,
2424
org.eclipse.core.runtime,
25-
org.eclipse.xtend.shared.ui;resolution:=optional,
2625
org.eclipse.xtext.ui.codetemplates;resolution:=optional,
2726
org.eclipse.xtext.xbase.lib
2827
Import-Package: org.apache.log4j

com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/validation/ExportValidator.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,7 @@ public void checkExtensions(final ExportModel model) {
6262
if (!Platform.isRunning()) {
6363
resourceManager = new ResourceManagerDefaultImpl();
6464
}
65-
// } else {
66-
// FIXME: sort out xpand
67-
// IXtendXpandProject project = Activator.getExtXptModelManager().findProject(ResourcesPlugin.getWorkspace().getRoot().getFile(new
68-
// Path(model.eResource().getURI().toPlatformString(true))).getProject());
69-
// if (project != null) {
70-
// resourceManager = new XpandPluginExecutionContext(project).getResourceManager();
71-
// }
65+
7266
if (resourceManager == null) {
7367
return;
7468
}

com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/generator/CompilationContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* The CompilationContext is used by CodeGeneration.ext to resolve types, get information about local variables, etc. It is a
3535
* wrapper around {@link ExecutionContext}.
3636
* <p>
37-
* 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.
37+
* Note that many of these methods are called from Xtend and will thus not show up when doing a find references in Eclipse.
3838
*/
3939
@SuppressWarnings("nls")
4040
public class CompilationContext {

com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ Bundle-Vendor: Avaloq Group AG
55
Bundle-Version: 16.2.0.qualifier
66
Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format.generator;singleton:=true
77
Require-Bundle: com.avaloq.tools.ddk.xtext.format;visibility:=reexport,
8-
org.eclipse.xpand,
9-
org.eclipse.xtend,
108
org.eclipse.xtext.xtext.generator,
119
org.eclipse.xtext,
1210
com.avaloq.tools.ddk.xtext.generator;visibility:=reexport,

com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Bundle-Vendor: Avaloq Group AG
77
Bundle-RequiredExecutionEnvironment: JavaSE-21
88
Bundle-ActivationPolicy: lazy
99
Fragment-Host: com.avaloq.tools.ddk.xtext.generator
10-
Require-Bundle: com.avaloq.tools.ddk.test.core,
10+
Require-Bundle: com.avaloq.tools.ddk.test.core,
1111
com.avaloq.tools.ddk.xtext.expression,
1212
com.avaloq.tools.ddk.xtext.test.core,
1313
org.eclipse.xtend,

com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21
88
Require-Bundle: org.eclipse.jface,
99
org.eclipse.ui.views,
1010
org.eclipse.emf.codegen.ecore,
11-
org.eclipse.xpand,
1211
org.eclipse.xtext,
1312
org.eclipse.xtext.xtext.generator,
1413
org.eclipse.emf.mwe2.lib,
@@ -17,7 +16,6 @@ Require-Bundle: org.eclipse.jface,
1716
com.avaloq.tools.ddk.xtext,
1817
com.avaloq.tools.ddk.xtext.expression,
1918
com.avaloq.tools.ddk.xtext.expression.ui,
20-
org.eclipse.xtend.util.stdlib,
2119
com.google.guava,
2220
com.avaloq.tools.ddk.xtext.ui,
2321
org.eclipse.xtend.lib,

0 commit comments

Comments
 (0)