diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/AbstractCheckRuntimeModule.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/AbstractCheckRuntimeModule.java
index 739317532d..87d5b36d81 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/AbstractCheckRuntimeModule.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/AbstractCheckRuntimeModule.java
@@ -3,7 +3,6 @@
*/
package com.avaloq.tools.ddk.check;
-import com.avaloq.tools.ddk.check.jvmmodel.CheckJvmModelInferrer;
import com.avaloq.tools.ddk.check.parser.antlr.CheckAntlrTokenFileProvider;
import com.avaloq.tools.ddk.check.parser.antlr.CheckParser;
import com.avaloq.tools.ddk.check.parser.antlr.internal.InternalCheckLexer;
@@ -45,7 +44,6 @@
import org.eclipse.xtext.validation.IResourceValidator;
import org.eclipse.xtext.xbase.annotations.DefaultXbaseWithAnnotationsRuntimeModule;
import org.eclipse.xtext.xbase.annotations.validation.DerivedStateAwareResourceValidator;
-import org.eclipse.xtext.xbase.jvmmodel.IJvmModelInferrer;
import org.eclipse.xtext.xbase.jvmmodel.JvmLocationInFileProvider;
import org.eclipse.xtext.xbase.scoping.XbaseQualifiedNameProvider;
import org.eclipse.xtext.xbase.typesystem.internal.DefaultBatchTypeResolver;
@@ -201,9 +199,4 @@ public Class extends IResourceValidator> bindIResourceValidator() {
return DerivedStateAwareResourceValidator.class;
}
- // contributed by org.eclipse.xtext.xtext.generator.xbase.XbaseGeneratorFragment2
- public Class extends IJvmModelInferrer> bindIJvmModelInferrer() {
- return CheckJvmModelInferrer.class;
- }
-
}
diff --git a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/CheckRuntimeModule.java b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/CheckRuntimeModule.java
index 18f6c1ba64..893f180edb 100644
--- a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/CheckRuntimeModule.java
+++ b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/CheckRuntimeModule.java
@@ -23,6 +23,7 @@
import org.eclipse.xtext.scoping.IScopeProvider;
import org.eclipse.xtext.xbase.compiler.XbaseCompiler;
import org.eclipse.xtext.xbase.imports.RewritableImportSection;
+import org.eclipse.xtext.xbase.jvmmodel.IJvmModelInferrer;
import org.eclipse.xtext.xbase.scoping.XImportSectionNamespaceScopeProvider;
import org.eclipse.xtext.xbase.typesystem.computation.ITypeComputer;
import org.eclipse.xtext.xbase.util.XExpressionHelper;
@@ -31,6 +32,7 @@
import com.avaloq.tools.ddk.check.generator.CheckCompiler;
import com.avaloq.tools.ddk.check.generator.CheckOutputConfigurationProvider;
import com.avaloq.tools.ddk.check.imports.CheckRewritableImportSectionFactory;
+import com.avaloq.tools.ddk.check.jvmmodel.CheckJvmModelInferrer;
import com.avaloq.tools.ddk.check.naming.CheckDeclarativeQualifiedNameProvider;
import com.avaloq.tools.ddk.check.resource.CheckBatchLinkableResource;
import com.avaloq.tools.ddk.check.resource.CheckBatchLinkableResourceStorageFacade;
@@ -195,4 +197,12 @@ public void configureFormatterPreferences(final com.google.inject.Binder binder)
binder.bind(IPreferenceValuesProvider.class).annotatedWith(org.eclipse.xtext.formatting2.FormatterPreferences.class).to(org.eclipse.xtext.formatting2.FormatterPreferenceValuesProvider.class);
}
+ /**
+ * Binds the Java JVM model inferrer, which the Xbase generator fragment does not bind with {@code generateXtendInferrer = false}.
+ *
+ * @return the {@link CheckJvmModelInferrer} class, never {@code null}
+ */
+ public Class extends IJvmModelInferrer> bindIJvmModelInferrer() {
+ return CheckJvmModelInferrer.class;
+ }
}
diff --git a/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
index 134bcf217a..9194b66b6f 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: com.avaloq.tools.ddk.checkcfg.core
Bundle-Vendor: Avaloq Group AG
-Bundle-Version: 17.3.3.qualifier
+Bundle-Version: 17.3.4.qualifier
Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.core; singleton:=true
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-21
diff --git a/com.avaloq.tools.ddk.checkcfg.core/pom.xml b/com.avaloq.tools.ddk.checkcfg.core/pom.xml
index 8580af50df..a09397c6ba 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.core/pom.xml
@@ -6,7 +6,7 @@
18.0.1-SNAPSHOT
../ddk-parent
- 17.3.3-SNAPSHOT
+ 17.3.4-SNAPSHOT
com.avaloq.tools.ddk
com.avaloq.tools.ddk.checkcfg.core
eclipse-plugin
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/AbstractCheckCfgRuntimeModule.java b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/AbstractCheckCfgRuntimeModule.java
index 9e9b856f09..cd8f3db4ec 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/AbstractCheckCfgRuntimeModule.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/AbstractCheckCfgRuntimeModule.java
@@ -3,7 +3,6 @@
*/
package com.avaloq.tools.ddk.checkcfg;
-import com.avaloq.tools.ddk.checkcfg.jvmmodel.CheckCfgJvmModelInferrer;
import com.avaloq.tools.ddk.checkcfg.parser.antlr.CheckCfgAntlrTokenFileProvider;
import com.avaloq.tools.ddk.checkcfg.parser.antlr.CheckCfgParser;
import com.avaloq.tools.ddk.checkcfg.parser.antlr.internal.InternalCheckCfgLexer;
@@ -46,7 +45,6 @@
import org.eclipse.xtext.xbase.DefaultXbaseRuntimeModule;
import org.eclipse.xtext.xbase.annotations.validation.DerivedStateAwareResourceValidator;
import org.eclipse.xtext.xbase.imports.RewritableImportSection;
-import org.eclipse.xtext.xbase.jvmmodel.IJvmModelInferrer;
import org.eclipse.xtext.xbase.jvmmodel.JvmLocationInFileProvider;
import org.eclipse.xtext.xbase.scoping.XbaseQualifiedNameProvider;
import org.eclipse.xtext.xbase.typesystem.internal.DefaultBatchTypeResolver;
@@ -209,9 +207,4 @@ public Class extends IResourceValidator> bindIResourceValidator() {
return DerivedStateAwareResourceValidator.class;
}
- // contributed by org.eclipse.xtext.xtext.generator.xbase.XbaseGeneratorFragment2
- public Class extends IJvmModelInferrer> bindIJvmModelInferrer() {
- return CheckCfgJvmModelInferrer.class;
- }
-
}
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src/com/avaloq/tools/ddk/checkcfg/CheckCfgRuntimeModule.java b/com.avaloq.tools.ddk.checkcfg.core/src/com/avaloq/tools/ddk/checkcfg/CheckCfgRuntimeModule.java
index 973eed76f9..99eccb6556 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src/com/avaloq/tools/ddk/checkcfg/CheckCfgRuntimeModule.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src/com/avaloq/tools/ddk/checkcfg/CheckCfgRuntimeModule.java
@@ -17,12 +17,14 @@
import org.eclipse.xtext.resource.ILocationInFileProvider;
import org.eclipse.xtext.scoping.IGlobalScopeProvider;
import org.eclipse.xtext.scoping.IScopeProvider;
+import org.eclipse.xtext.xbase.jvmmodel.IJvmModelInferrer;
import org.eclipse.xtext.xbase.resource.BatchLinkingService;
import org.eclipse.xtext.xbase.scoping.XImportSectionNamespaceScopeProvider;
import com.avaloq.tools.ddk.check.scoping.ExtensionPointAwareScopeProvider;
import com.avaloq.tools.ddk.checkcfg.conversion.CheckCfgValueConverterService;
import com.avaloq.tools.ddk.checkcfg.generator.CheckCfgGenerator;
+import com.avaloq.tools.ddk.checkcfg.jvmmodel.CheckCfgJvmModelInferrer;
import com.avaloq.tools.ddk.checkcfg.naming.CheckCfgDeclarativeQualifiedNameProvider;
import com.avaloq.tools.ddk.checkcfg.resource.CheckCfgLocationInFileProvider;
import com.avaloq.tools.ddk.checkcfg.scoping.CheckCfgBatchLinkingService;
@@ -107,4 +109,12 @@ public Class extends BatchLinkingService> bindBatchLinkingService() {
return CheckCfgBatchLinkingService.class;
}
+ /**
+ * Binds the Java JVM model inferrer, which the Xbase generator fragment does not bind with {@code generateXtendInferrer = false}.
+ *
+ * @return the {@link CheckCfgJvmModelInferrer} class, never {@code null}
+ */
+ public Class extends IJvmModelInferrer> bindIJvmModelInferrer() {
+ return CheckCfgJvmModelInferrer.class;
+ }
}
diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/CommonXbase.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/CommonXbase.mwe2
index d66b7e32c3..94280990a0 100644
--- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/CommonXbase.mwe2
+++ b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/CommonXbase.mwe2
@@ -191,7 +191,9 @@ Workflow {
// Xbase support
fragment = types.TypesGeneratorFragment2 {}
fragment = xbase.XtypeGeneratorFragment2 {}
- fragment = xbase.XbaseGeneratorFragment2 {}
+ fragment = xbase.XbaseGeneratorFragment2 {
+ generateXtendInferrer = false
+ }
// Code generator
fragment = generator.GeneratorFragment2 {
diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExport.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExport.mwe2
index 99778aa52a..0d67936ff3 100644
--- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExport.mwe2
+++ b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExport.mwe2
@@ -158,7 +158,9 @@ Workflow {
// Xbase support
fragment = org.eclipse.xtext.xtext.generator.types.TypesGeneratorFragment2 {}
fragment = org.eclipse.xtext.xtext.generator.xbase.XtypeGeneratorFragment2 {}
- fragment = org.eclipse.xtext.xtext.generator.xbase.XbaseGeneratorFragment2 {}
+ fragment = org.eclipse.xtext.xtext.generator.xbase.XbaseGeneratorFragment2 {
+ generateXtendInferrer = false
+ }
// Code generator
fragment = org.eclipse.xtext.xtext.generator.generator.GeneratorFragment2 {
diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExpression.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExpression.mwe2
index 9f1c81aa1a..b7374df1ee 100644
--- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExpression.mwe2
+++ b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExpression.mwe2
@@ -131,7 +131,9 @@ Workflow {
// Xbase support
fragment = org.eclipse.xtext.xtext.generator.types.TypesGeneratorFragment2 {}
fragment = org.eclipse.xtext.xtext.generator.xbase.XtypeGeneratorFragment2 {}
- fragment = org.eclipse.xtext.xtext.generator.xbase.XbaseGeneratorFragment2 {}
+ fragment = org.eclipse.xtext.xtext.generator.xbase.XbaseGeneratorFragment2 {
+ generateXtendInferrer = false
+ }
fragment = BundleVersionStripperFragment {
bundle = "org.antlr.runtime"
diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateFormat.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateFormat.mwe2
index c47f886b41..c39e322bbe 100644
--- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateFormat.mwe2
+++ b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateFormat.mwe2
@@ -81,6 +81,9 @@ Workflow {
generateStub = true
generateXtendStub = false
}
+ xbaseSupport = {
+ generateXtendInferrer = false
+ }
validator = {
// composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator"
}
diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateScope.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateScope.mwe2
index cf6b19b949..ce2a4660ef 100644
--- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateScope.mwe2
+++ b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateScope.mwe2
@@ -157,7 +157,9 @@ Workflow {
// Xbase support
fragment = org.eclipse.xtext.xtext.generator.types.TypesGeneratorFragment2 {}
fragment = org.eclipse.xtext.xtext.generator.xbase.XtypeGeneratorFragment2 {}
- fragment = org.eclipse.xtext.xtext.generator.xbase.XbaseGeneratorFragment2 {}
+ fragment = org.eclipse.xtext.xtext.generator.xbase.XbaseGeneratorFragment2 {
+ generateXtendInferrer = false
+ }
// Code generator
fragment = org.eclipse.xtext.xtext.generator.generator.GeneratorFragment2 {
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 742f1654bb..940dd1b784 100644
--- a/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: com.avaloq.tools.ddk.xtext.export
Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export;singleton:=true
-Bundle-Version: 17.3.6.qualifier
+Bundle-Version: 17.3.7.qualifier
Bundle-Vendor: Avaloq Group AG
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.export/pom.xml b/com.avaloq.tools.ddk.xtext.export/pom.xml
index f22df65c88..05bea34477 100644
--- a/com.avaloq.tools.ddk.xtext.export/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export/pom.xml
@@ -6,7 +6,7 @@
18.0.1-SNAPSHOT
../ddk-parent
- 17.3.6-SNAPSHOT
+ 17.3.7-SNAPSHOT
com.avaloq.tools.ddk
com.avaloq.tools.ddk.xtext.export
eclipse-plugin
diff --git a/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/AbstractExportRuntimeModule.java b/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/AbstractExportRuntimeModule.java
index 4044d4fd51..1da89a0068 100644
--- a/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/AbstractExportRuntimeModule.java
+++ b/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/AbstractExportRuntimeModule.java
@@ -40,7 +40,6 @@
import org.eclipse.xtext.xbase.DefaultXbaseRuntimeModule;
import org.eclipse.xtext.xbase.annotations.validation.DerivedStateAwareResourceValidator;
import org.eclipse.xtext.xbase.imports.RewritableImportSection;
-import org.eclipse.xtext.xbase.jvmmodel.IJvmModelInferrer;
import org.eclipse.xtext.xbase.jvmmodel.JvmLocationInFileProvider;
import org.eclipse.xtext.xbase.scoping.XImportSectionNamespaceScopeProvider;
import org.eclipse.xtext.xbase.scoping.batch.IBatchScopeProvider;
@@ -51,7 +50,6 @@
import org.eclipse.xtext.xbase.validation.FeatureNameValidator;
import org.eclipse.xtext.xbase.validation.LogicalContainerAwareFeatureNameValidator;
-import com.avaloq.tools.ddk.xtext.export.jvmmodel.ExportJvmModelInferrer;
import com.avaloq.tools.ddk.xtext.export.parser.antlr.ExportAntlrTokenFileProvider;
import com.avaloq.tools.ddk.xtext.export.parser.antlr.ExportParser;
import com.avaloq.tools.ddk.xtext.export.parser.antlr.internal.InternalExportLexer;
@@ -241,9 +239,4 @@ public Class extends IResourceValidator> bindIResourceValidator() {
return DerivedStateAwareResourceValidator.class;
}
- // contributed by org.eclipse.xtext.xtext.generator.xbase.XbaseGeneratorFragment2
- public Class extends IJvmModelInferrer> bindIJvmModelInferrer() {
- return ExportJvmModelInferrer.class;
- }
-
}
diff --git a/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/ExportRuntimeModule.java b/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/ExportRuntimeModule.java
index 4930e3387b..f158db85c2 100644
--- a/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/ExportRuntimeModule.java
+++ b/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/ExportRuntimeModule.java
@@ -15,10 +15,12 @@
import org.eclipse.xtext.naming.IQualifiedNameConverter;
import org.eclipse.xtext.resource.IResourceDescription;
import org.eclipse.xtext.xbase.compiler.JvmModelGenerator;
+import org.eclipse.xtext.xbase.jvmmodel.IJvmModelInferrer;
import com.avaloq.tools.ddk.xtext.export.conversion.ExportValueConverterService;
import com.avaloq.tools.ddk.xtext.export.generator.ExportJvmModelGenerator;
import com.avaloq.tools.ddk.xtext.export.generator.ExportOutputConfigurationProvider;
+import com.avaloq.tools.ddk.xtext.export.jvmmodel.ExportJvmModelInferrer;
import com.avaloq.tools.ddk.xtext.export.naming.ExportQualifiedNameConverter;
import com.avaloq.tools.ddk.xtext.export.resource.ExportResourceDescriptionManager;
import com.avaloq.tools.ddk.xtext.formatting.LfLineSeparatorInformation;
@@ -87,4 +89,13 @@ public Class extends JvmModelGenerator> bindJvmModelGenerator() {
public Class extends org.eclipse.xtext.formatting.IFormatter> bindIFormatter() {
return com.avaloq.tools.ddk.xtext.export.formatting.ExportFormatter.class;
}
+
+ /**
+ * Binds the Java JVM model inferrer, which the Xbase generator fragment does not bind with {@code generateXtendInferrer = false}.
+ *
+ * @return the {@link ExportJvmModelInferrer} class, never {@code null}
+ */
+ public Class extends IJvmModelInferrer> bindIJvmModelInferrer() {
+ return ExportJvmModelInferrer.class;
+ }
}
diff --git a/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
index b32a35f252..78b961a8a2 100644
--- a/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: com.avaloq.tools.ddk.xtext.expression
Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.expression;singleton:=true
-Bundle-Version: 17.3.5.qualifier
+Bundle-Version: 17.3.6.qualifier
Bundle-Vendor: Avaloq Group AG
Bundle-RequiredExecutionEnvironment: JavaSE-21
Require-Bundle: org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.expression/pom.xml b/com.avaloq.tools.ddk.xtext.expression/pom.xml
index 7c9df7a2f1..e66ec1eaed 100644
--- a/com.avaloq.tools.ddk.xtext.expression/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.expression/pom.xml
@@ -6,7 +6,7 @@
18.0.1-SNAPSHOT
../ddk-parent
- 17.3.5-SNAPSHOT
+ 17.3.6-SNAPSHOT
com.avaloq.tools.ddk
com.avaloq.tools.ddk.xtext.expression
eclipse-plugin
diff --git a/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/AbstractExpressionRuntimeModule.java b/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/AbstractExpressionRuntimeModule.java
index fc4fd82a4d..da00f8666b 100644
--- a/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/AbstractExpressionRuntimeModule.java
+++ b/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/AbstractExpressionRuntimeModule.java
@@ -3,7 +3,6 @@
*/
package com.avaloq.tools.ddk.xtext.expression;
-import com.avaloq.tools.ddk.xtext.expression.jvmmodel.ExpressionJvmModelInferrer;
import com.avaloq.tools.ddk.xtext.expression.parser.antlr.ExpressionAntlrTokenFileProvider;
import com.avaloq.tools.ddk.xtext.expression.parser.antlr.ExpressionParser;
import com.avaloq.tools.ddk.xtext.expression.parser.antlr.internal.InternalExpressionLexer;
@@ -51,7 +50,6 @@
import org.eclipse.xtext.xbase.DefaultXbaseRuntimeModule;
import org.eclipse.xtext.xbase.annotations.validation.DerivedStateAwareResourceValidator;
import org.eclipse.xtext.xbase.imports.RewritableImportSection;
-import org.eclipse.xtext.xbase.jvmmodel.IJvmModelInferrer;
import org.eclipse.xtext.xbase.jvmmodel.JvmLocationInFileProvider;
import org.eclipse.xtext.xbase.scoping.XImportSectionNamespaceScopeProvider;
import org.eclipse.xtext.xbase.scoping.batch.IBatchScopeProvider;
@@ -230,9 +228,4 @@ public Class extends IResourceValidator> bindIResourceValidator() {
return DerivedStateAwareResourceValidator.class;
}
- // contributed by org.eclipse.xtext.xtext.generator.xbase.XbaseGeneratorFragment2
- public Class extends IJvmModelInferrer> bindIJvmModelInferrer() {
- return ExpressionJvmModelInferrer.class;
- }
-
}
diff --git a/com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/ExpressionRuntimeModule.java b/com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/ExpressionRuntimeModule.java
index 685e701e8d..549cb1974a 100644
--- a/com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/ExpressionRuntimeModule.java
+++ b/com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/ExpressionRuntimeModule.java
@@ -12,8 +12,10 @@
import org.eclipse.xtext.conversion.IValueConverterService;
import org.eclipse.xtext.formatting.ILineSeparatorInformation;
+import org.eclipse.xtext.xbase.jvmmodel.IJvmModelInferrer;
import com.avaloq.tools.ddk.xtext.expression.conversion.ExpressionValueConverterService;
+import com.avaloq.tools.ddk.xtext.expression.jvmmodel.ExpressionJvmModelInferrer;
import com.avaloq.tools.ddk.xtext.formatting.LfLineSeparatorInformation;
@@ -41,4 +43,13 @@ public Class extends IValueConverterService> bindIValueConverterService() {
public Class extends org.eclipse.xtext.formatting.IFormatter> bindIFormatter() {
return com.avaloq.tools.ddk.xtext.expression.formatting.ExpressionFormatter.class;
}
+
+ /**
+ * Binds the Java JVM model inferrer, which the Xbase generator fragment does not bind with {@code generateXtendInferrer = false}.
+ *
+ * @return the {@link ExpressionJvmModelInferrer} class, never {@code null}
+ */
+ public Class extends IJvmModelInferrer> bindIJvmModelInferrer() {
+ return ExpressionJvmModelInferrer.class;
+ }
}
diff --git a/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF
index cca41acbef..877811bcf5 100644
--- a/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: com.avaloq.tools.ddk.xtext.format
Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format;singleton:=true
-Bundle-Version: 17.3.4.qualifier
+Bundle-Version: 17.3.5.qualifier
Bundle-Vendor: Avaloq Group AG
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.format/pom.xml b/com.avaloq.tools.ddk.xtext.format/pom.xml
index d21c482257..ad77a51ea5 100644
--- a/com.avaloq.tools.ddk.xtext.format/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format/pom.xml
@@ -6,7 +6,7 @@
18.0.1-SNAPSHOT
../ddk-parent
- 17.3.4-SNAPSHOT
+ 17.3.5-SNAPSHOT
com.avaloq.tools.ddk
com.avaloq.tools.ddk.xtext.format
eclipse-plugin
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/AbstractFormatRuntimeModule.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/AbstractFormatRuntimeModule.java
index 87226edc71..2a7cd7584c 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/AbstractFormatRuntimeModule.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/AbstractFormatRuntimeModule.java
@@ -4,7 +4,6 @@
package com.avaloq.tools.ddk.xtext.format;
import com.avaloq.tools.ddk.xtext.format.formatting.FormatFormatter;
-import com.avaloq.tools.ddk.xtext.format.jvmmodel.FormatJvmModelInferrer;
import com.avaloq.tools.ddk.xtext.format.parser.antlr.FormatAntlrTokenFileProvider;
import com.avaloq.tools.ddk.xtext.format.parser.antlr.FormatParser;
import com.avaloq.tools.ddk.xtext.format.parser.antlr.internal.InternalFormatLexer;
@@ -56,7 +55,6 @@
import org.eclipse.xtext.xbase.annotations.DefaultXbaseWithAnnotationsRuntimeModule;
import org.eclipse.xtext.xbase.annotations.validation.DerivedStateAwareResourceValidator;
import org.eclipse.xtext.xbase.imports.RewritableImportSection;
-import org.eclipse.xtext.xbase.jvmmodel.IJvmModelInferrer;
import org.eclipse.xtext.xbase.jvmmodel.JvmLocationInFileProvider;
import org.eclipse.xtext.xbase.scoping.XImportSectionNamespaceScopeProvider;
import org.eclipse.xtext.xbase.scoping.XbaseQualifiedNameProvider;
@@ -236,11 +234,6 @@ public Class extends IResourceValidator> bindIResourceValidator() {
return DerivedStateAwareResourceValidator.class;
}
- // contributed by org.eclipse.xtext.xtext.generator.xbase.XbaseGeneratorFragment2
- public Class extends IJvmModelInferrer> bindIJvmModelInferrer() {
- return FormatJvmModelInferrer.class;
- }
-
// contributed by com.avaloq.tools.ddk.xtext.generator.formatting.FormatterFragment2
public Class extends IFormatter> bindIFormatter() {
return FormatFormatter.class;
diff --git a/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/FormatRuntimeModule.java b/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/FormatRuntimeModule.java
index c20d17a4f6..877f494cd0 100644
--- a/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/FormatRuntimeModule.java
+++ b/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/FormatRuntimeModule.java
@@ -23,12 +23,14 @@
import org.eclipse.xtext.resource.containers.ResourceSetBasedAllContainersStateProvider;
import org.eclipse.xtext.scoping.IScopeProvider;
import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider;
+import org.eclipse.xtext.xbase.jvmmodel.IJvmModelInferrer;
import org.eclipse.xtext.xbase.scoping.XImportSectionNamespaceScopeProvider;
import org.eclipse.xtext.xtext.generator.model.project.IXtextProjectConfig;
import org.eclipse.xtext.xtext.generator.model.project.XtextProjectConfig;
import com.avaloq.tools.ddk.xtext.format.conversion.FormatValueConverterService;
import com.avaloq.tools.ddk.xtext.format.generator.FormatOutputConfigurationProvider;
+import com.avaloq.tools.ddk.xtext.format.jvmmodel.FormatJvmModelInferrer;
import com.avaloq.tools.ddk.xtext.format.naming.FormatQualifiedNameConverter;
import com.avaloq.tools.ddk.xtext.format.naming.FormatQualifiedNameProvider;
import com.avaloq.tools.ddk.xtext.format.resource.FormatResource;
@@ -134,4 +136,13 @@ public void configure(final Binder binder) {
super.configure(binder);
binder.bind(IXtextProjectConfig.class).to(XtextProjectConfig.class);
}
+
+ /**
+ * Binds the Java JVM model inferrer, which the Xbase generator fragment does not bind with {@code generateXtendInferrer = false}.
+ *
+ * @return the {@link FormatJvmModelInferrer} class, never {@code null}
+ */
+ public Class extends IJvmModelInferrer> bindIJvmModelInferrer() {
+ return FormatJvmModelInferrer.class;
+ }
}
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 9b73a648d0..29b0286991 100644
--- a/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: com.avaloq.tools.ddk.xtext.scope
Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.scope;singleton:=true
-Bundle-Version: 17.3.6.qualifier
+Bundle-Version: 17.3.7.qualifier
Bundle-Vendor: Avaloq Group AG
Bundle-RequiredExecutionEnvironment: JavaSE-21
Require-Bundle: org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.scope/pom.xml b/com.avaloq.tools.ddk.xtext.scope/pom.xml
index da95cbcc2d..dc30d1abed 100644
--- a/com.avaloq.tools.ddk.xtext.scope/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.scope/pom.xml
@@ -6,7 +6,7 @@
18.0.1-SNAPSHOT
../ddk-parent
- 17.3.6-SNAPSHOT
+ 17.3.7-SNAPSHOT
com.avaloq.tools.ddk
com.avaloq.tools.ddk.xtext.scope
eclipse-plugin
diff --git a/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/AbstractScopeRuntimeModule.java b/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/AbstractScopeRuntimeModule.java
index 6f604e3cc4..da8ae025b0 100644
--- a/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/AbstractScopeRuntimeModule.java
+++ b/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/AbstractScopeRuntimeModule.java
@@ -3,7 +3,6 @@
*/
package com.avaloq.tools.ddk.xtext.scope;
-import com.avaloq.tools.ddk.xtext.scope.jvmmodel.ScopeJvmModelInferrer;
import com.avaloq.tools.ddk.xtext.scope.parser.antlr.ScopeAntlrTokenFileProvider;
import com.avaloq.tools.ddk.xtext.scope.parser.antlr.ScopeParser;
import com.avaloq.tools.ddk.xtext.scope.parser.antlr.internal.InternalScopeLexer;
@@ -51,7 +50,6 @@
import org.eclipse.xtext.xbase.DefaultXbaseRuntimeModule;
import org.eclipse.xtext.xbase.annotations.validation.DerivedStateAwareResourceValidator;
import org.eclipse.xtext.xbase.imports.RewritableImportSection;
-import org.eclipse.xtext.xbase.jvmmodel.IJvmModelInferrer;
import org.eclipse.xtext.xbase.jvmmodel.JvmLocationInFileProvider;
import org.eclipse.xtext.xbase.scoping.XImportSectionNamespaceScopeProvider;
import org.eclipse.xtext.xbase.scoping.batch.IBatchScopeProvider;
@@ -230,9 +228,4 @@ public Class extends IResourceValidator> bindIResourceValidator() {
return DerivedStateAwareResourceValidator.class;
}
- // contributed by org.eclipse.xtext.xtext.generator.xbase.XbaseGeneratorFragment2
- public Class extends IJvmModelInferrer> bindIJvmModelInferrer() {
- return ScopeJvmModelInferrer.class;
- }
-
}
diff --git a/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/ScopeRuntimeModule.java b/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/ScopeRuntimeModule.java
index df620eb7c1..404fa1f1de 100644
--- a/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/ScopeRuntimeModule.java
+++ b/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/ScopeRuntimeModule.java
@@ -18,10 +18,12 @@
import org.eclipse.xtext.resource.ILocationInFileProvider;
import org.eclipse.xtext.resource.IResourceDescription;
import org.eclipse.xtext.xbase.compiler.JvmModelGenerator;
+import org.eclipse.xtext.xbase.jvmmodel.IJvmModelInferrer;
import com.avaloq.tools.ddk.xtext.formatting.LfLineSeparatorInformation;
import com.avaloq.tools.ddk.xtext.scope.conversion.ScopeValueConverterService;
import com.avaloq.tools.ddk.xtext.scope.generator.ScopeJvmModelGenerator;
+import com.avaloq.tools.ddk.xtext.scope.jvmmodel.ScopeJvmModelInferrer;
import com.avaloq.tools.ddk.xtext.scope.linking.ScopeLinkingService;
import com.avaloq.tools.ddk.xtext.scope.naming.ScopeQualifiedNameConverter;
import com.avaloq.tools.ddk.xtext.scope.resource.ScopeLocationInFileProvider;
@@ -113,4 +115,13 @@ public Class extends JvmModelGenerator> bindJvmModelGenerator() {
public Class extends org.eclipse.xtext.formatting.IFormatter> bindIFormatter() {
return com.avaloq.tools.ddk.xtext.scope.formatting.ScopeFormatter.class;
}
+
+ /**
+ * Binds the Java JVM model inferrer, which the Xbase generator fragment does not bind with {@code generateXtendInferrer = false}.
+ *
+ * @return the {@link ScopeJvmModelInferrer} class, never {@code null}
+ */
+ public Class extends IJvmModelInferrer> bindIJvmModelInferrer() {
+ return ScopeJvmModelInferrer.class;
+ }
}