From 35f673d43d4ec45832f642a7d1fff397590b6a94 Mon Sep 17 00:00:00 2001 From: Michael Keppler Date: Sun, 6 Oct 2024 14:51:19 +0200 Subject: [PATCH 1/3] remove generated plugin manifests --- .gitignore | 1 + com.wamas.ide.launching.ui/plugin.xml_gen | 425 ---------------------- com.wamas.ide.launching/plugin.xml_gen | 10 - 3 files changed, 1 insertion(+), 435 deletions(-) delete mode 100644 com.wamas.ide.launching.ui/plugin.xml_gen delete mode 100644 com.wamas.ide.launching/plugin.xml_gen diff --git a/.gitignore b/.gitignore index 0159e23..c00416c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ *.ser Thumbs.db *.swp +*.xml_gen \ No newline at end of file diff --git a/com.wamas.ide.launching.ui/plugin.xml_gen b/com.wamas.ide.launching.ui/plugin.xml_gen deleted file mode 100644 index 4782db5..0000000 --- a/com.wamas.ide.launching.ui/plugin.xml_gen +++ /dev/null @@ -1,425 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/com.wamas.ide.launching/plugin.xml_gen b/com.wamas.ide.launching/plugin.xml_gen deleted file mode 100644 index 4fb8524..0000000 --- a/com.wamas.ide.launching/plugin.xml_gen +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - From 0a0f68ee175af08c11558bae3f77dfd3233a8fac Mon Sep 17 00:00:00 2001 From: Michael Keppler Date: Sun, 6 Oct 2024 14:55:46 +0200 Subject: [PATCH 2/3] remove unneeded SuppressWarnings --- .../src/com/wamas/ide/launching/ui/LcDslHelper.java | 1 - .../wamas/ide/launching/ui/build/LcDslContributions.java | 1 - .../ide/launching/ui/build/LcDslResourceSetProvider.java | 1 - .../launching/ui/build/LcDslResourceUIServiceProvider.java | 7 +++---- .../ide/launching/ui/build/LcDslTargetPlatformSupport.java | 1 - .../ide/launching/ui/hyperlink/LcDslIFeatureHyperlink.java | 1 - .../ui/hyperlink/LcDslIPluginModelBaseHyperlink.java | 1 - .../ide/launching/ui/launchview/LcDslLaunchObject.java | 1 - .../wamas/ide/launching/ui/launchview/LcDslProvider.java | 1 - 9 files changed, 3 insertions(+), 12 deletions(-) diff --git a/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/LcDslHelper.java b/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/LcDslHelper.java index dbf48e6..5292231 100644 --- a/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/LcDslHelper.java +++ b/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/LcDslHelper.java @@ -37,7 +37,6 @@ /** * Provides programmatic access to launch configuration loading and generation */ -@SuppressWarnings("restriction") public class LcDslHelper { /** Controls how many lines of logfile are appended in case of error **/ diff --git a/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/build/LcDslContributions.java b/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/build/LcDslContributions.java index 4f352ac..7f7750f 100644 --- a/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/build/LcDslContributions.java +++ b/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/build/LcDslContributions.java @@ -8,7 +8,6 @@ import com.google.inject.Binder; -@SuppressWarnings("restriction") public class LcDslContributions implements com.google.inject.Module { @Override diff --git a/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/build/LcDslResourceSetProvider.java b/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/build/LcDslResourceSetProvider.java index d97da35..8a92ec5 100644 --- a/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/build/LcDslResourceSetProvider.java +++ b/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/build/LcDslResourceSetProvider.java @@ -16,7 +16,6 @@ import com.google.inject.Inject; import com.google.inject.Provider; -@SuppressWarnings("restriction") public class LcDslResourceSetProvider implements IResourceSetProvider { @Inject diff --git a/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/build/LcDslResourceUIServiceProvider.java b/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/build/LcDslResourceUIServiceProvider.java index 84b3577..4cf8d1d 100644 --- a/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/build/LcDslResourceUIServiceProvider.java +++ b/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/build/LcDslResourceUIServiceProvider.java @@ -12,7 +12,6 @@ import com.google.inject.Inject; import com.google.inject.Singleton; -@SuppressWarnings("restriction") @Singleton public class LcDslResourceUIServiceProvider extends DefaultResourceUIServiceProvider { @@ -20,7 +19,7 @@ public class LcDslResourceUIServiceProvider extends DefaultResourceUIServiceProv public LcDslResourceUIServiceProvider(IResourceServiceProvider delegate) { super(delegate); } - + @Override public boolean canBuild(URI uri, IStorage storage) { // Don't build jar entries from classpath but process them from the TP instead @@ -34,6 +33,6 @@ public boolean canBuild(URI uri, IStorage storage) { } return super.canBuild(uri, storage); } - - + + } diff --git a/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/build/LcDslTargetPlatformSupport.java b/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/build/LcDslTargetPlatformSupport.java index 133e75f..05fafdc 100644 --- a/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/build/LcDslTargetPlatformSupport.java +++ b/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/build/LcDslTargetPlatformSupport.java @@ -90,7 +90,6 @@ * make an explicit dependency on the contributing plug-in from the target * platform. */ -@SuppressWarnings("restriction") @Singleton public class LcDslTargetPlatformSupport implements IStorage2UriMapperContribution, IResourceSetInitializer, IToBeBuiltComputerContribution, diff --git a/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/hyperlink/LcDslIFeatureHyperlink.java b/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/hyperlink/LcDslIFeatureHyperlink.java index 6321646..8c206e4 100644 --- a/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/hyperlink/LcDslIFeatureHyperlink.java +++ b/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/hyperlink/LcDslIFeatureHyperlink.java @@ -7,7 +7,6 @@ import org.eclipse.pde.internal.ui.editor.feature.FeatureEditor; import org.eclipse.xtext.ui.editor.hyperlinking.AbstractHyperlink; -@SuppressWarnings("restriction") public class LcDslIFeatureHyperlink extends AbstractHyperlink { private IFeatureModel model; diff --git a/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/hyperlink/LcDslIPluginModelBaseHyperlink.java b/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/hyperlink/LcDslIPluginModelBaseHyperlink.java index 90c1f09..150d7d9 100644 --- a/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/hyperlink/LcDslIPluginModelBaseHyperlink.java +++ b/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/hyperlink/LcDslIPluginModelBaseHyperlink.java @@ -7,7 +7,6 @@ import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor; import org.eclipse.xtext.ui.editor.hyperlinking.AbstractHyperlink; -@SuppressWarnings("restriction") public class LcDslIPluginModelBaseHyperlink extends AbstractHyperlink { private IPluginModelBase model; diff --git a/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/launchview/LcDslLaunchObject.java b/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/launchview/LcDslLaunchObject.java index e979409..847e442 100644 --- a/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/launchview/LcDslLaunchObject.java +++ b/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/launchview/LcDslLaunchObject.java @@ -34,7 +34,6 @@ import com.wamas.ide.launching.ui.internal.LaunchingActivator; import com.wamas.ide.launching.ui.internal.LcDslInternalHelper; -@SuppressWarnings("restriction") public class LcDslLaunchObject implements ILaunchObject { private static final ImageDescriptor NATURE_OVERLAY = LaunchingActivator diff --git a/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/launchview/LcDslProvider.java b/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/launchview/LcDslProvider.java index 9ee6b2d..65fcceb 100644 --- a/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/launchview/LcDslProvider.java +++ b/com.wamas.ide.launching.ui/src/com/wamas/ide/launching/ui/launchview/LcDslProvider.java @@ -45,7 +45,6 @@ import com.wamas.ide.launching.ui.internal.LaunchingActivator; import com.wamas.ide.launching.ui.internal.LcDslInternalHelper; -@SuppressWarnings("restriction") @Component(service = ILaunchObjectProvider.class) public class LcDslProvider implements ILaunchObjectProvider { From 2cd9a2dc31df435f845b979e44696c50b41047b1 Mon Sep 17 00:00:00 2001 From: Michael Keppler Date: Sun, 6 Oct 2024 15:13:33 +0200 Subject: [PATCH 3/3] remove unused Xtext enum values While they are in the grammar definition, they are not part of the generated code and parser. So they can be deleted. --- .../src/com/wamas/ide/launching/LcDsl.xtext | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/com.wamas.ide.launching/src/com/wamas/ide/launching/LcDsl.xtext b/com.wamas.ide.launching/src/com/wamas/ide/launching/LcDsl.xtext index daa8b8e..df46b9c 100644 --- a/com.wamas.ide.launching/src/com/wamas/ide/launching/LcDsl.xtext +++ b/com.wamas.ide.launching/src/com/wamas/ide/launching/LcDsl.xtext @@ -9,15 +9,15 @@ import "http://www.eclipse.org/emf/2002/Ecore" as ecore /** * TODO: The language is still missing some things that could be set: - * + * * Java: * - additional classpath entries (low prio) * - additional source lookup (low prio) - * + * * Eclipse,Rap: * - config location (low prio) * - default start level & autostart - * + * * How to support different launch config types - some generic attribute support? * Or really implement support for each type separately (probably the best experience). */ @@ -39,7 +39,7 @@ LaunchConfig: ((explicit?='explicit')? // Eclipse, JUnit-Plugin, SWTBot, RAP & (manual?='manual')? // All & (abstract?='abstract')? // All - & (foreground?='foreground')? // All + & (foreground?='foreground')? // All & (noConsole?='no-console')? // All but Groups & (noValidate?='no-validate')? // Eclipse, JUnit-Plugin, SWTBot, RAP & (swInstallSupport?='sw-install-allowed')? // Eclipse, JUnit-Plugin, SWTBot @@ -48,7 +48,7 @@ LaunchConfig: & (keepRunning?='keep-running')? // JUnit-Plugin, SWTBot & (runInUiThread?='run-in-ui-thread')? // JUnit-Plugin & (qualify?='qualified' (BRACKET_OPEN qualifierId=STRING BRACKET_CLOSE)?)? // All - naming - ) type=LaunchConfigType 'configuration' name=FQName + ) type=LaunchConfigType 'configuration' name=FQName (':' superConfig=[LaunchConfig|FQName])? BLOCK_BEGIN ( // things that may appear only once (clears=ClearOption)? // Eclipse, JUnit-Plugin, SWTBot, RAP (partial) @@ -270,8 +270,8 @@ enum LaunchModeType: ; enum MemoryUnit: - MB = 'M' | MB = 'mb' | MB = 'MB' | MB = 'm' | - GB = 'G' | GB = 'gb' | GB = 'GB' | GB = 'g' + MB = 'M' | + GB = 'G' ; enum OutputStream: @@ -286,10 +286,10 @@ enum TestRunnerType: JUNIT5 = "junit5" | JUNIT4 = "junit4" | JUNIT3 = "junit3" ; -@Override +@Override terminal INT returns ecore::EInt: ('0'..'9')+; terminal BOOLEAN returns ecore::EBoolean: ('true' | 'false'); -@Override +@Override terminal ID: '^'?('a'..'z'|'A'..'Z'|'_') ('.'? ('a'..'z'|'A'..'Z'|'^'|'_'|'-'|'0'..'9'))*; terminal QUALIFIER: ('a'..'z'|'A'..'Z'|'_'|'-'|'0'..'9')*; terminal VERSION: INT (('.' INT) (('.' INT) ('.' QUALIFIER)?)?)?;