From a03abd39468834cafac3a956636062782c2d7beb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Dinis=20Ferreira?= Date: Thu, 11 Jun 2026 14:12:04 +0100 Subject: [PATCH 1/2] refactor: migrate Xtend to Java - com.avaloq.tools.ddk.sample.helloworld.ui.test --- .../.classpath | 1 - .../.project | 6 -- .../build.properties | 1 - ...d => CheckConfigurationIsAppliedTest.java} | 61 ++++++------- .../CheckExecutionEnvironmentProjectTest.java | 86 +++++++++++++++++++ ...CheckExecutionEnvironmentProjectTest.xtend | 83 ------------------ .../helloworld/label/IssueLabelTest.java | 61 +++++++++++++ .../helloworld/label/IssueLabelTest.xtend | 56 ------------ .../xtend-gen/.gitignore | 0 9 files changed, 179 insertions(+), 176 deletions(-) rename com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/{CheckConfigurationIsAppliedTest.xtend => CheckConfigurationIsAppliedTest.java} (53%) create mode 100644 com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/CheckExecutionEnvironmentProjectTest.java delete mode 100644 com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/CheckExecutionEnvironmentProjectTest.xtend create mode 100644 com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/label/IssueLabelTest.java delete mode 100644 com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/label/IssueLabelTest.xtend delete mode 100644 com.avaloq.tools.ddk.sample.helloworld.ui.test/xtend-gen/.gitignore diff --git a/com.avaloq.tools.ddk.sample.helloworld.ui.test/.classpath b/com.avaloq.tools.ddk.sample.helloworld.ui.test/.classpath index 878fa1acf1..5e7f7b8c44 100644 --- a/com.avaloq.tools.ddk.sample.helloworld.ui.test/.classpath +++ b/com.avaloq.tools.ddk.sample.helloworld.ui.test/.classpath @@ -2,7 +2,6 @@ - diff --git a/com.avaloq.tools.ddk.sample.helloworld.ui.test/.project b/com.avaloq.tools.ddk.sample.helloworld.ui.test/.project index 55dde5c027..ae6cb7d008 100644 --- a/com.avaloq.tools.ddk.sample.helloworld.ui.test/.project +++ b/com.avaloq.tools.ddk.sample.helloworld.ui.test/.project @@ -5,11 +5,6 @@ - - org.eclipse.xtext.ui.shared.xtextBuilder - - - org.eclipse.jdt.core.javabuilder @@ -27,7 +22,6 @@ - org.eclipse.xtext.ui.shared.xtextNature org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature diff --git a/com.avaloq.tools.ddk.sample.helloworld.ui.test/build.properties b/com.avaloq.tools.ddk.sample.helloworld.ui.test/build.properties index babb66e3cb..1c1c3817a9 100644 --- a/com.avaloq.tools.ddk.sample.helloworld.ui.test/build.properties +++ b/com.avaloq.tools.ddk.sample.helloworld.ui.test/build.properties @@ -1,6 +1,5 @@ source.. = src/,\ src-gen/,\ - xtend-gen/,\ resource/ bin.includes = .,\ META-INF/ diff --git a/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/CheckConfigurationIsAppliedTest.xtend b/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/CheckConfigurationIsAppliedTest.java similarity index 53% rename from com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/CheckConfigurationIsAppliedTest.xtend rename to com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/CheckConfigurationIsAppliedTest.java index 854185b11b..657aa26e4d 100644 --- a/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/CheckConfigurationIsAppliedTest.xtend +++ b/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/CheckConfigurationIsAppliedTest.java @@ -8,33 +8,36 @@ * Contributors: * Avaloq Group AG - initial API and implementation *******************************************************************************/ -package com.avaloq.tools.ddk.sample.helloworld.check +package com.avaloq.tools.ddk.sample.helloworld.check; -import com.avaloq.tools.ddk.check.core.test.AbstractCheckTestCase -import com.google.common.collect.Lists -import com.google.inject.Inject -import java.util.List -import org.eclipse.xtext.testing.InjectWith -import org.eclipse.xtext.testing.validation.ValidationTestHelper -import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil -import com.avaloq.tools.ddk.sample.helloworld.helloWorld.Model -import com.avaloq.tools.ddk.sample.helloworld.ui.internal.HelloworldActivator -import com.avaloq.tools.ddk.sample.helloworld.helloWorld.HelloWorldPackage -import com.avaloq.tools.ddk.sample.helloworld.validation.ExecutionEnvironmentIssueCodes -import com.avaloq.tools.ddk.sample.helloworld.ui.HelloWorldUiInjectorProvider -import org.junit.jupiter.api.^extension.ExtendWith -import org.eclipse.xtext.testing.extensions.InjectionExtension -import org.junit.jupiter.api.Test +import java.util.List; -@InjectWith(typeof(HelloWorldUiInjectorProvider)) -@ExtendWith(typeof(InjectionExtension)) -class CheckConfigurationIsAppliedTest extends AbstractCheckTestCase { +import org.eclipse.xtext.testing.InjectWith; +import org.eclipse.xtext.testing.extensions.InjectionExtension; +import org.eclipse.xtext.testing.validation.ValidationTestHelper; +import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import com.avaloq.tools.ddk.check.core.test.AbstractCheckTestCase; +import com.avaloq.tools.ddk.sample.helloworld.helloWorld.HelloWorldPackage; +import com.avaloq.tools.ddk.sample.helloworld.helloWorld.Model; +import com.avaloq.tools.ddk.sample.helloworld.ui.HelloWorldUiInjectorProvider; +import com.avaloq.tools.ddk.sample.helloworld.ui.internal.HelloworldActivator; +import com.avaloq.tools.ddk.sample.helloworld.validation.ExecutionEnvironmentIssueCodes; +import com.google.inject.Inject; +import com.google.inject.Injector; + +@InjectWith(HelloWorldUiInjectorProvider.class) +@ExtendWith(InjectionExtension.class) +public class CheckConfigurationIsAppliedTest extends AbstractCheckTestCase { @Inject - ValidationTestHelper helper + private ValidationTestHelper helper; - override getInjector() { - HelloworldActivator::instance.getInjector(HelloworldActivator::COM_AVALOQ_TOOLS_DDK_SAMPLE_HELLOWORLD_HELLOWORLD) + @Override + protected Injector getInjector() { + return HelloworldActivator.getInstance().getInjector(HelloworldActivator.COM_AVALOQ_TOOLS_DDK_SAMPLE_HELLOWORLD_HELLOWORLD); } /* @@ -43,8 +46,8 @@ override getInjector() { * Eclipse has the Check runtime plugins installed, code will automatically be generated * for those resources. In order to avoid that the file extensions have been ommitted. */ - def List getRequiredSourceFileNames() { - Lists::newArrayList('.settings/com.avaloq.tools.ddk.checkcfg.core.prefs', 'Greetings') + public List getRequiredSourceFileNames() { + return List.of(".settings/com.avaloq.tools.ddk.checkcfg.core.prefs", "Greetings"); } /* @@ -52,13 +55,13 @@ def List getRequiredSourceFileNames() { * and applied: the severity is changed from ERROR to WARNING. */ @Test - def void testCheckConfigurationIsApplied() { + public void testCheckConfigurationIsApplied() throws Exception { // sources are copied into the project and then built by the Xtext builder - addSourcesToWorkspace(typeof(CheckConfigurationIsAppliedTest), requiredSourceFileNames) + addSourcesToWorkspace(CheckConfigurationIsAppliedTest.class, getRequiredSourceFileNames()); // wait for build to finish, otherwise included catalog may not be resolvable - IResourcesSetupUtil::waitForBuild - val model = getModel("Greetings") as Model - helper.assertWarning(model.greetings.get(0), HelloWorldPackage$Literals::GREETING, ExecutionEnvironmentIssueCodes::FRANZNAME) + IResourcesSetupUtil.waitForBuild(); + final Model model = (Model) getModel("Greetings"); + helper.assertWarning(model.getGreetings().get(0), HelloWorldPackage.Literals.GREETING, ExecutionEnvironmentIssueCodes.FRANZNAME); } } diff --git a/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/CheckExecutionEnvironmentProjectTest.java b/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/CheckExecutionEnvironmentProjectTest.java new file mode 100644 index 0000000000..86de49605f --- /dev/null +++ b/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/CheckExecutionEnvironmentProjectTest.java @@ -0,0 +1,86 @@ +/******************************************************************************* + * Copyright (c) 2016 Avaloq Group AG and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Avaloq Group AG - initial API and implementation + *******************************************************************************/ +package com.avaloq.tools.ddk.sample.helloworld.check; + +import org.eclipse.xtext.testing.InjectWith; +import org.eclipse.xtext.testing.extensions.InjectionExtension; +import org.eclipse.xtext.testing.util.ParseHelper; +import org.eclipse.xtext.testing.validation.ValidationTestHelper; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import com.avaloq.tools.ddk.check.core.test.AbstractCheckTestCase; +import com.avaloq.tools.ddk.sample.helloworld.helloWorld.HelloWorldPackage; +import com.avaloq.tools.ddk.sample.helloworld.helloWorld.Model; +import com.avaloq.tools.ddk.sample.helloworld.ui.HelloWorldUiInjectorProvider; +import com.avaloq.tools.ddk.sample.helloworld.ui.internal.HelloworldActivator; +import com.avaloq.tools.ddk.sample.helloworld.validation.ExecutionEnvironmentIssueCodes; +import com.avaloq.tools.ddk.sample.helloworld.validation.IssueCodes; +import com.avaloq.tools.ddk.sample.helloworld.validation.LibraryChecksIssueCodes; +import com.google.inject.Inject; +import com.google.inject.Injector; + +@InjectWith(HelloWorldUiInjectorProvider.class) +@ExtendWith(InjectionExtension.class) +public class CheckExecutionEnvironmentProjectTest extends AbstractCheckTestCase { + + @Inject + private ValidationTestHelper helper; + + @Inject + private ParseHelper parser; + + @Override + protected Injector getInjector() { + return HelloworldActivator.getInstance().getInjector(HelloworldActivator.COM_AVALOQ_TOOLS_DDK_SAMPLE_HELLOWORLD_HELLOWORLD); + } + + @Test + public void testFranz() throws Exception { + final Model model = parser.parse("Hello Franz!"); + helper.assertError(model, HelloWorldPackage.Literals.GREETING, ExecutionEnvironmentIssueCodes.FRANZNAME); + } + + @Test + public void testFrans() throws Exception { + final Model model = parser.parse("Hello Frans!"); + helper.assertNoError(model, ExecutionEnvironmentIssueCodes.FRANZNAME); + helper.assertNoError(model, ExecutionEnvironmentIssueCodes.NAMELENGTH); + } + + @Test + public void testGreetingNameIssue() throws Exception { + final Model model = parser.parse("Hello GreetingNameTooLong!"); + helper.assertError(model, HelloWorldPackage.Literals.GREETING, ExecutionEnvironmentIssueCodes.NAMELENGTH); + } + + /* + * Tests that both validations emerging from the Java validator as well as such emerging from the check based + * validator appear. (Fixed by CheckCompositeEValidator). + */ + @Test + // @BugTest("AIG-709") // this plugin should be ACF independent + public void testBugAig709() throws Exception { + final Model model = parser.parse("Hello GreetingNameTooLong!"); + helper.assertError(model, HelloWorldPackage.Literals.GREETING, ExecutionEnvironmentIssueCodes.NAMELENGTH); + helper.assertWarning(model, HelloWorldPackage.Literals.GREETING, IssueCodes.GREETING_NAME_PREFIX); + } + + @Test + public void testLibraryInjection() throws Exception { + final Model model = parser.parse("Hello Peter!"); + helper.assertWarning(model, HelloWorldPackage.Literals.GREETING, LibraryChecksIssueCodes.CHECK_CATALOG_IS_ACTIVE); + helper.assertNoError(model, LibraryChecksIssueCodes.CACHE_DOESNT_WORK); + helper.assertNoError(model, LibraryChecksIssueCodes.CACHE_INJECTION_FAILED); + helper.assertNoError(model, LibraryChecksIssueCodes.FORMAL_PARAMETERS); + } + +} diff --git a/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/CheckExecutionEnvironmentProjectTest.xtend b/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/CheckExecutionEnvironmentProjectTest.xtend deleted file mode 100644 index 98dc6869e7..0000000000 --- a/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/check/CheckExecutionEnvironmentProjectTest.xtend +++ /dev/null @@ -1,83 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Avaloq Group AG and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Avaloq Group AG - initial API and implementation - *******************************************************************************/ -package com.avaloq.tools.ddk.sample.helloworld.check - -import com.avaloq.tools.ddk.check.core.test.AbstractCheckTestCase -import com.google.inject.Inject -import org.eclipse.xtext.testing.InjectWith -import org.eclipse.xtext.testing.util.ParseHelper -import org.eclipse.xtext.testing.validation.ValidationTestHelper -import org.junit.jupiter.api.^extension.ExtendWith -import org.eclipse.xtext.testing.extensions.InjectionExtension -import org.junit.jupiter.api.Test - -import com.avaloq.tools.ddk.sample.helloworld.ui.internal.HelloworldActivator -import com.avaloq.tools.ddk.sample.helloworld.helloWorld.Model -import com.avaloq.tools.ddk.sample.helloworld.helloWorld.HelloWorldPackage -import com.avaloq.tools.ddk.sample.helloworld.validation.ExecutionEnvironmentIssueCodes -import com.avaloq.tools.ddk.sample.helloworld.validation.LibraryChecksIssueCodes -import com.avaloq.tools.ddk.sample.helloworld.validation.IssueCodes -import com.avaloq.tools.ddk.sample.helloworld.ui.HelloWorldUiInjectorProvider - -@InjectWith(HelloWorldUiInjectorProvider) -@ExtendWith(typeof(InjectionExtension)) -class CheckExecutionEnvironmentProjectTest extends AbstractCheckTestCase { - - @Inject - ValidationTestHelper helper - - @Inject - ParseHelper parser - - override getInjector() { - HelloworldActivator::instance.getInjector(HelloworldActivator::COM_AVALOQ_TOOLS_DDK_SAMPLE_HELLOWORLD_HELLOWORLD) - } - - @Test - def void testFranz() { - val model = parser.parse("Hello Franz!") - helper.assertError(model, HelloWorldPackage.Literals::GREETING, ExecutionEnvironmentIssueCodes::FRANZNAME) - } - - @Test - def void testFrans() { - val model = parser.parse("Hello Frans!") - helper.assertNoError(model, ExecutionEnvironmentIssueCodes::FRANZNAME) - helper.assertNoError(model, ExecutionEnvironmentIssueCodes::NAMELENGTH) - } - - @Test - def void testGreetingNameIssue() { - val model = parser.parse("Hello GreetingNameTooLong!") - helper.assertError(model, HelloWorldPackage.Literals::GREETING, ExecutionEnvironmentIssueCodes::NAMELENGTH) - } - - /* - * Tests that both validations emerging from the Java validator as well as such emerging from the check based - * validator appear. (Fixed by CheckCompositeEValidator). - */ - @Test - //@BugTest("AIG-709") // this plugin should be ACF independent - def void testBugAig709() { - val model = parser.parse("Hello GreetingNameTooLong!") - helper.assertError(model, HelloWorldPackage.Literals::GREETING, ExecutionEnvironmentIssueCodes::NAMELENGTH) - helper.assertWarning(model, HelloWorldPackage.Literals::GREETING, IssueCodes::GREETING_NAME_PREFIX) - } - - @Test - def void testLibraryInjection() { - val model = parser.parse("Hello Peter!"); - helper.assertWarning(model, HelloWorldPackage.Literals::GREETING, LibraryChecksIssueCodes::CHECK_CATALOG_IS_ACTIVE); - helper.assertNoError(model, LibraryChecksIssueCodes::CACHE_DOESNT_WORK); - helper.assertNoError(model, LibraryChecksIssueCodes::CACHE_INJECTION_FAILED); - helper.assertNoError(model, LibraryChecksIssueCodes::FORMAL_PARAMETERS); - } -} diff --git a/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/label/IssueLabelTest.java b/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/label/IssueLabelTest.java new file mode 100644 index 0000000000..d9150aa7df --- /dev/null +++ b/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/label/IssueLabelTest.java @@ -0,0 +1,61 @@ +/******************************************************************************* + * Copyright (c) 2016 Avaloq Group AG and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Avaloq Group AG - initial API and implementation + *******************************************************************************/ +package com.avaloq.tools.ddk.sample.helloworld.label; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.util.Map; + +import org.junit.jupiter.api.Test; + +import com.avaloq.tools.ddk.check.runtime.label.ICheckRuleLabelProvider; +import com.avaloq.tools.ddk.sample.helloworld.validation.LibraryChecksIssueCodes; +import com.google.inject.AbstractModule; +import com.google.inject.Guice; + +/** + * End-to-end test for getting Check labels. + */ +public class IssueLabelTest { + + /** + * End-to-end test for getting Check labels. + */ + @Test + public void testGetLabel() { + + // ARRANGE + final ICheckRuleLabelProvider checkRuleLabelProvider = Guice.createInjector(new AbstractModule() { + @Override + protected void configure() { + } + }).getInstance(ICheckRuleLabelProvider.class); + + final Map expectedMap = Map.of( + // @Format-Off + LibraryChecksIssueCodes.CACHE_DOESNT_WORK, "Cache doesn't work", + LibraryChecksIssueCodes.CACHE_INJECTION_FAILED, "Cache injection failed", + LibraryChecksIssueCodes.CHECK_CATALOG_IS_ACTIVE, "Check catalog is active", + LibraryChecksIssueCodes.FORMAL_PARAMETERS, "Formal Parameters" + // @Format-On + ); + + for (final Map.Entry entry : expectedMap.entrySet()) { + // ACT + final String label = checkRuleLabelProvider.getLabel(entry.getKey()); + + // ASSERT + assertNotNull(label, "Label should be returned for key " + entry.getKey()); + assertEquals(entry.getValue(), label, "Correct label should be returned for key " + entry.getKey()); + } + } +} diff --git a/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/label/IssueLabelTest.xtend b/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/label/IssueLabelTest.xtend deleted file mode 100644 index 13b5345f33..0000000000 --- a/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/label/IssueLabelTest.xtend +++ /dev/null @@ -1,56 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Avaloq Group AG and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Avaloq Group AG - initial API and implementation - *******************************************************************************/ -package com.avaloq.tools.ddk.sample.helloworld.label - -import com.google.inject.AbstractModule -import com.google.inject.Guice - -import com.avaloq.tools.ddk.sample.helloworld.validation.LibraryChecksIssueCodes -import com.avaloq.tools.ddk.check.runtime.label.ICheckRuleLabelProvider -import org.junit.jupiter.api.Test -import static org.junit.jupiter.api.Assertions.assertNotNull -import static org.junit.jupiter.api.Assertions.assertEquals - -/** - * End-to-end test for getting Check labels. - */ -class IssueLabelTest { - - /** - * End-to-end test for getting Check labels. - */ - @Test - def testGetLabel() { - - // ARRANGE - val checkRuleLabelProvider = Guice.createInjector(new AbstractModule() { - protected override configure() {} - }).getInstance(ICheckRuleLabelProvider); - - val expectedMap = #{ - // @Format-Off - LibraryChecksIssueCodes.CACHE_DOESNT_WORK -> "Cache doesn't work", - LibraryChecksIssueCodes.CACHE_INJECTION_FAILED -> "Cache injection failed", - LibraryChecksIssueCodes.CHECK_CATALOG_IS_ACTIVE -> "Check catalog is active", - LibraryChecksIssueCodes.FORMAL_PARAMETERS -> "Formal Parameters" - // @Format-On - } - - for (entry : expectedMap.entrySet) { - // ACT - val label = checkRuleLabelProvider.getLabel(entry.key); - - // ASSERT - assertNotNull(label,"Label should be returned for key " + entry.key); - assertEquals(entry.value, label, "Correct label should be returned for key " + entry.key); - } - } -} diff --git a/com.avaloq.tools.ddk.sample.helloworld.ui.test/xtend-gen/.gitignore b/com.avaloq.tools.ddk.sample.helloworld.ui.test/xtend-gen/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 From f1369f195bc3c7d845e9956765be6ae5bdca35e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Dinis=20Ferreira?= Date: Thu, 11 Jun 2026 14:12:04 +0100 Subject: [PATCH 2/2] refactor: drop stale Xtend dependencies from sample.helloworld bundles org.eclipse.xtend.lib is no longer used by any source in the sample.helloworld bundles. The only remaining reference was the inert @FinalFieldsConstructor annotation on HelloWorldUiModule, an Xtend active annotation that generates nothing in Java source - the constructor it would generate is declared explicitly. --- com.avaloq.tools.ddk.sample.helloworld.ide/META-INF/MANIFEST.MF | 1 - com.avaloq.tools.ddk.sample.helloworld.ui/META-INF/MANIFEST.MF | 1 - .../tools/ddk/sample/helloworld/ui/HelloWorldUiModule.java | 2 -- com.avaloq.tools.ddk.sample.helloworld/META-INF/MANIFEST.MF | 1 - 4 files changed, 5 deletions(-) diff --git a/com.avaloq.tools.ddk.sample.helloworld.ide/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.sample.helloworld.ide/META-INF/MANIFEST.MF index fab8a94ca7..eed0ba91f5 100644 --- a/com.avaloq.tools.ddk.sample.helloworld.ide/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.sample.helloworld.ide/META-INF/MANIFEST.MF @@ -10,7 +10,6 @@ Require-Bundle: com.avaloq.tools.ddk.sample.helloworld, org.eclipse.compare, org.eclipse.xtext.builder, org.eclipse.xtext.xbase.lib, - org.eclipse.xtend.lib;resolution:=optional, org.antlr.runtime, com.avaloq.tools.ddk.check.runtime.core, com.google.inject, diff --git a/com.avaloq.tools.ddk.sample.helloworld.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.sample.helloworld.ui/META-INF/MANIFEST.MF index 024e09a23a..b08123919e 100644 --- a/com.avaloq.tools.ddk.sample.helloworld.ui/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.sample.helloworld.ui/META-INF/MANIFEST.MF @@ -16,7 +16,6 @@ Require-Bundle: com.avaloq.tools.ddk.sample.helloworld, org.eclipse.compare, org.eclipse.xtext.builder, org.eclipse.xtext.xbase.lib, - org.eclipse.xtend.lib;resolution:=optional, org.antlr.runtime, com.avaloq.tools.ddk.check.runtime.core, com.avaloq.tools.ddk.xtext.ui, diff --git a/com.avaloq.tools.ddk.sample.helloworld.ui/src/com/avaloq/tools/ddk/sample/helloworld/ui/HelloWorldUiModule.java b/com.avaloq.tools.ddk.sample.helloworld.ui/src/com/avaloq/tools/ddk/sample/helloworld/ui/HelloWorldUiModule.java index 90fb4bcbf7..9e2843c661 100644 --- a/com.avaloq.tools.ddk.sample.helloworld.ui/src/com/avaloq/tools/ddk/sample/helloworld/ui/HelloWorldUiModule.java +++ b/com.avaloq.tools.ddk.sample.helloworld.ui/src/com/avaloq/tools/ddk/sample/helloworld/ui/HelloWorldUiModule.java @@ -4,7 +4,6 @@ package com.avaloq.tools.ddk.sample.helloworld.ui; import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor; import org.eclipse.xtext.ide.editor.contentassist.antlr.FollowElementCalculator; import org.eclipse.xtext.ide.editor.contentassist.antlr.FollowElementComputer; @@ -16,7 +15,6 @@ /** * Use this class to register components to be used within the Eclipse IDE. */ -@FinalFieldsConstructor public class HelloWorldUiModule extends AbstractHelloWorldUiModule { /** diff --git a/com.avaloq.tools.ddk.sample.helloworld/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.sample.helloworld/META-INF/MANIFEST.MF index 45a4aa7489..d8b2cb6117 100644 --- a/com.avaloq.tools.ddk.sample.helloworld/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.sample.helloworld/META-INF/MANIFEST.MF @@ -15,7 +15,6 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.util, org.eclipse.xtext.ide, org.eclipse.emf.common, - org.eclipse.xtend.lib, com.avaloq.tools.ddk.xtext, org.eclipse.emf.mwe2.launch;resolution:=optional, org.eclipse.core.runtime,