From dd486845334993c8e4629f123c475de3d14cfa2a Mon Sep 17 00:00:00 2001 From: Andreas Muelder Date: Fri, 12 Aug 2016 14:25:10 +0200 Subject: [PATCH] #899 extracted workspace runner plugin --- .../sct/generator/c/CCodeGenerator.java | 16 ++--- .../org.yakindu.sct.generator.core/plugin.xml | 30 -------- .../core/AbstractWorkspaceGenerator.java | 66 ------------------ .../sct/generator/cpp/CppCodeGenerator.java | 14 ++-- .../generator/csharp/CSharpCodeGenerator.java | 13 ++-- .../java/AbstractJavaCodeGenerator.java | 8 ++- .../.classpath | 7 ++ .../.gitignore | 1 + .../org.yakindu.sct.generator.runner/.project | 28 ++++++++ .../.settings/org.eclipse.jdt.core.prefs | 7 ++ .../META-INF/MANIFEST.MF | 14 ++++ .../build.properties | 5 ++ .../icons/sct.png | Bin 0 -> 335 bytes .../library/GenericJavaFeatureTypeLibrary.xmi | 0 .../plugin.xml | 37 ++++++++++ .../org.yakindu.sct.generator.runner/pom.xml | 15 ++++ .../runner}/GenericJavaBasedGenerator.java | 13 ++-- .../sct/generator/runner/RunnerActivator.java | 30 ++++++++ ...enericJavaLibraryDefaultValueProvider.java | 8 +-- .../lib}/IGenericJavaFeatureConstants.java | 2 +- .../plugin.xml | 4 +- ...or.java => GenericXpandCodeGenerator.java} | 2 +- 22 files changed, 185 insertions(+), 135 deletions(-) delete mode 100644 plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/AbstractWorkspaceGenerator.java create mode 100644 plugins/org.yakindu.sct.generator.runner/.classpath create mode 100644 plugins/org.yakindu.sct.generator.runner/.gitignore create mode 100644 plugins/org.yakindu.sct.generator.runner/.project create mode 100644 plugins/org.yakindu.sct.generator.runner/.settings/org.eclipse.jdt.core.prefs create mode 100644 plugins/org.yakindu.sct.generator.runner/META-INF/MANIFEST.MF create mode 100644 plugins/org.yakindu.sct.generator.runner/build.properties create mode 100644 plugins/org.yakindu.sct.generator.runner/icons/sct.png rename plugins/{org.yakindu.sct.generator.core => org.yakindu.sct.generator.runner}/library/GenericJavaFeatureTypeLibrary.xmi (100%) create mode 100644 plugins/org.yakindu.sct.generator.runner/plugin.xml create mode 100644 plugins/org.yakindu.sct.generator.runner/pom.xml rename plugins/{org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/impl => org.yakindu.sct.generator.runner/src/org/yakindu/sct/generator/runner}/GenericJavaBasedGenerator.java (88%) create mode 100644 plugins/org.yakindu.sct.generator.runner/src/org/yakindu/sct/generator/runner/RunnerActivator.java rename plugins/{org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/library/impl => org.yakindu.sct.generator.runner/src/org/yakindu/sct/generator/runner/lib}/GenericJavaLibraryDefaultValueProvider.java (87%) rename plugins/{org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/features/impl => org.yakindu.sct.generator.runner/src/org/yakindu/sct/generator/runner/lib}/IGenericJavaFeatureConstants.java (93%) rename plugins/org.yakindu.sct.generator.xpand/src/org/yakindu/sct/generator/xpand/{GenericXPandCodeGenerator.java => GenericXpandCodeGenerator.java} (97%) diff --git a/plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/CCodeGenerator.java b/plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/CCodeGenerator.java index 2c1b8127a1..2b6bd7b6aa 100644 --- a/plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/CCodeGenerator.java +++ b/plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/CCodeGenerator.java @@ -15,7 +15,7 @@ import org.yakindu.sct.domain.generic.modules.GenericSequencerModule; import org.yakindu.sct.generator.c.features.ICFeatureConstants; import org.yakindu.sct.generator.c.types.CTypeSystemAccess; -import org.yakindu.sct.generator.core.impl.GenericJavaBasedGenerator; +import org.yakindu.sct.generator.core.impl.AbstractSExecModelGenerator; import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess; import org.yakindu.sct.model.sexec.ExecutionFlow; import org.yakindu.sct.model.sexec.naming.INamingService; @@ -37,26 +37,26 @@ * @author axel terfloth * */ -public class CCodeGenerator extends GenericJavaBasedGenerator { +public class CCodeGenerator extends AbstractSExecModelGenerator { public static String GENERATOR_ID = "yakindu::c"; - + @Inject private CGenerator delegate; - + @Inject private IGenArtifactConfigurations artifactConfigs; - + @Override protected void prepareGenerator(GeneratorEntry entry) { super.prepareGenerator(entry); initGenArtifactConfigurations(); } - + protected void initGenArtifactConfigurations() { artifactConfigs.setFileSystemAccess(sctFsa); } - + @Override public void runGenerator(Statechart statechart, GeneratorEntry entry) { ExecutionFlow flow = createExecutionFlow(statechart, entry); @@ -76,7 +76,7 @@ public void configure(Binder binder) { binder.bind(GeneratorEntry.class).toInstance(entry); binder.bind(INamingService.class).to(CNamingService.class); binder.bind(ICodegenTypeSystemAccess.class).to(CTypeSystemAccess.class); - + binder.bind(IGenArtifactConfigurations.class).to(GenArtifactConfigurations.class); // default binding to ensure consistency of already used API binder.bind(IGenArtifactConfigurations.class) diff --git a/plugins/org.yakindu.sct.generator.core/plugin.xml b/plugins/org.yakindu.sct.generator.core/plugin.xml index 440722f656..75f6cb1a0b 100644 --- a/plugins/org.yakindu.sct.generator.core/plugin.xml +++ b/plugins/org.yakindu.sct.generator.core/plugin.xml @@ -11,35 +11,5 @@ defaultProvider="org.yakindu.sct.generator.core.library.impl.CoreLibraryDefaultFeatureValueProvider" uri="platform:/plugin/org.yakindu.sct.generator.core/library/CoreFeatureTypeLibrary.xmi"> - - - - - - - - - - - - - - diff --git a/plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/AbstractWorkspaceGenerator.java b/plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/AbstractWorkspaceGenerator.java deleted file mode 100644 index da221bc6fb..0000000000 --- a/plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/AbstractWorkspaceGenerator.java +++ /dev/null @@ -1,66 +0,0 @@ -/** - * Copyright (c) 2011 committers of YAKINDU 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: - * committers of YAKINDU - initial API and implementation - */ -package org.yakindu.sct.generator.core; - -import java.io.File; - -import org.eclipse.emf.common.util.URI; -import org.yakindu.sct.generator.core.impl.AbstractSExecModelGenerator; -import org.yakindu.sct.model.sgen.GeneratorEntry; - -/** - * Base class for generators that are executed inside the workspace - * - * @author holger willebrandt - Initial contribution and API - * @author Johannes Dicks - refactored because of EFS decoupling - */ -@Deprecated -public abstract class AbstractWorkspaceGenerator extends AbstractSExecModelGenerator { - - /** - * - * @param entry - * @deprecated Will be removed in future. Refreshing the project is moved to concrete file system access implementations - */ - @Deprecated - public final void refreshTargetProject(GeneratorEntry entry) { - /** - * This functionality will be provided by concrete file system accesses from now. - */ - } - - public final File getTargetProject(GeneratorEntry entry) { - URI uri = sctFsa.getURI(coreFeatureHelper.getTargetProjectValue(entry).getStringValue()); - return new File(uri.toFileString()); - } - - public final File getTargetFolder(GeneratorEntry entry) { - URI uri = sctFsa.getURI(coreFeatureHelper.getRelativeTargetFolder(entry)); - return new File(uri.toFileString()); - } - - public final File getLibraryTargetFolder(GeneratorEntry entry) { - URI uri = sctFsa.getURI(coreFeatureHelper.getRelativeLibraryFolder(entry)); - return new File(uri.toFileString()); - } - - public final File getApiTargetFolder(GeneratorEntry entry) { - URI uri = sctFsa.getURI(coreFeatureHelper.getRelativeApiFolder(entry)); - return new File(uri.toFileString()); - } - - public final void writeToConsole(String line){ - log.writeToConsole(line); - } - public final void writeToConsole(Throwable e){ - log.writeToConsole(e); - } -} diff --git a/plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/CppCodeGenerator.java b/plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/CppCodeGenerator.java index 1041c724ff..0da14696ee 100644 --- a/plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/CppCodeGenerator.java +++ b/plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/CppCodeGenerator.java @@ -13,7 +13,7 @@ import org.yakindu.sct.generator.c.GenArtifactConfigurations; import org.yakindu.sct.generator.c.IGenArtifactConfigurations; import org.yakindu.sct.generator.c.types.CTypeSystemAccess; -import org.yakindu.sct.generator.core.impl.GenericJavaBasedGenerator; +import org.yakindu.sct.generator.core.impl.AbstractSExecModelGenerator; import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess; import org.yakindu.sct.model.sexec.ExecutionFlow; import org.yakindu.sct.model.sexec.naming.INamingService; @@ -31,24 +31,24 @@ * @author Markus Mühlbrandt - Initial contribution and API * */ -public class CppCodeGenerator extends GenericJavaBasedGenerator { +public class CppCodeGenerator extends AbstractSExecModelGenerator { @Inject private CppGenerator delegate; - + @Inject private IGenArtifactConfigurations artifactConfigs; - + @Override protected void prepareGenerator(GeneratorEntry entry) { super.prepareGenerator(entry); initGenArtifactConfigurations(); } - + protected void initGenArtifactConfigurations() { artifactConfigs.setFileSystemAccess(sctFsa); } - + @Override public void runGenerator(Statechart statechart, GeneratorEntry entry) { ExecutionFlow flow = createExecutionFlow(statechart, entry); @@ -66,7 +66,7 @@ public void configure(Binder binder) { binder.bind(ICodegenTypeSystemAccess.class).to(CTypeSystemAccess.class); binder.bind(INamingService.class).to(CppNamingService.class); binder.bind(GeneratorEntry.class).toInstance(entry); - + binder.bind(IGenArtifactConfigurations.class).to(GenArtifactConfigurations.class); // default binding to ensure consistency of already used API binder.bind(IGenArtifactConfigurations.class) diff --git a/plugins/org.yakindu.sct.generator.csharp/src/org/yakindu/sct/generator/csharp/CSharpCodeGenerator.java b/plugins/org.yakindu.sct.generator.csharp/src/org/yakindu/sct/generator/csharp/CSharpCodeGenerator.java index 4edec0cce4..b2db75ef63 100644 --- a/plugins/org.yakindu.sct.generator.csharp/src/org/yakindu/sct/generator/csharp/CSharpCodeGenerator.java +++ b/plugins/org.yakindu.sct.generator.csharp/src/org/yakindu/sct/generator/csharp/CSharpCodeGenerator.java @@ -9,7 +9,7 @@ */ package org.yakindu.sct.generator.csharp; -import org.yakindu.sct.generator.core.impl.GenericJavaBasedGenerator; +import org.yakindu.sct.generator.core.impl.AbstractSExecModelGenerator; import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess; import org.yakindu.sct.generator.csharp.types.CSharpTypeSystemAccess; import org.yakindu.sct.model.sexec.ExecutionFlow; @@ -22,12 +22,11 @@ import com.google.inject.Module; import com.google.inject.util.Modules; -public class CSharpCodeGenerator extends GenericJavaBasedGenerator { +public class CSharpCodeGenerator extends AbstractSExecModelGenerator { @Inject CSharpGenerator delegate; - - + @Override public void runGenerator(Statechart statechart, GeneratorEntry entry) { ExecutionFlow flow = createExecutionFlow(statechart, entry); @@ -37,18 +36,16 @@ public void runGenerator(Statechart statechart, GeneratorEntry entry) { delegate.generate(flow, entry, sctFsa.getIFileSystemAccess()); } - @Override public Module getOverridesModule(final GeneratorEntry entry) { Module module = super.getOverridesModule(entry); return Modules.override(module).with(new Module() { public void configure(Binder binder) { - binder.bind(ICodegenTypeSystemAccess.class) - .to(CSharpTypeSystemAccess.class); + binder.bind(ICodegenTypeSystemAccess.class).to(CSharpTypeSystemAccess.class); binder.bind(INamingService.class).to(CSharpNamingService.class); binder.bind(GeneratorEntry.class).toInstance(entry); } }); } - + } \ No newline at end of file diff --git a/plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/AbstractJavaCodeGenerator.java b/plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/AbstractJavaCodeGenerator.java index 37d9f680cb..e326c63d4c 100644 --- a/plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/AbstractJavaCodeGenerator.java +++ b/plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/AbstractJavaCodeGenerator.java @@ -10,13 +10,15 @@ */ package org.yakindu.sct.generator.java; -import org.yakindu.sct.generator.core.impl.GenericJavaBasedGenerator; +import static org.yakindu.sct.generator.core.library.ICoreLibraryConstants.OUTLET_FEATURE; +import static org.yakindu.sct.generator.core.library.ICoreLibraryConstants.OUTLET_FEATURE_TARGET_FOLDER; + +import org.yakindu.sct.generator.core.impl.AbstractSExecModelGenerator; import org.yakindu.sct.model.sgen.FeatureConfiguration; import org.yakindu.sct.model.sgen.GeneratorEntry; import org.yakindu.sct.model.sgraph.Statechart; -import static org.yakindu.sct.generator.core.library.ICoreLibraryConstants.*; -abstract public class AbstractJavaCodeGenerator extends GenericJavaBasedGenerator { +abstract public class AbstractJavaCodeGenerator extends AbstractSExecModelGenerator { abstract public void generate(Statechart statechart, GeneratorEntry entry); diff --git a/plugins/org.yakindu.sct.generator.runner/.classpath b/plugins/org.yakindu.sct.generator.runner/.classpath new file mode 100644 index 0000000000..b1dabee382 --- /dev/null +++ b/plugins/org.yakindu.sct.generator.runner/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/plugins/org.yakindu.sct.generator.runner/.gitignore b/plugins/org.yakindu.sct.generator.runner/.gitignore new file mode 100644 index 0000000000..ae3c172604 --- /dev/null +++ b/plugins/org.yakindu.sct.generator.runner/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/plugins/org.yakindu.sct.generator.runner/.project b/plugins/org.yakindu.sct.generator.runner/.project new file mode 100644 index 0000000000..40201d6e41 --- /dev/null +++ b/plugins/org.yakindu.sct.generator.runner/.project @@ -0,0 +1,28 @@ + + + org.yakindu.sct.generator.runner + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/plugins/org.yakindu.sct.generator.runner/.settings/org.eclipse.jdt.core.prefs b/plugins/org.yakindu.sct.generator.runner/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..11f6e462df --- /dev/null +++ b/plugins/org.yakindu.sct.generator.runner/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/plugins/org.yakindu.sct.generator.runner/META-INF/MANIFEST.MF b/plugins/org.yakindu.sct.generator.runner/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..201d8b82d6 --- /dev/null +++ b/plugins/org.yakindu.sct.generator.runner/META-INF/MANIFEST.MF @@ -0,0 +1,14 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: YAKINDU Workspace Generator Runner +Bundle-SymbolicName: org.yakindu.sct.generator.runner;singleton:=true +Bundle-Version: 2.7.1.qualifier +Bundle-Activator: org.yakindu.sct.generator.runner.RunnerActivator +Bundle-Vendor: statecharts.org +Require-Bundle: org.eclipse.core.runtime, + org.yakindu.sct.generator.core, + org.yakindu.sct.generator.genmodel, + org.yakindu.sct.commons, + org.eclipse.jdt.core +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-ActivationPolicy: lazy diff --git a/plugins/org.yakindu.sct.generator.runner/build.properties b/plugins/org.yakindu.sct.generator.runner/build.properties new file mode 100644 index 0000000000..6f20375d6c --- /dev/null +++ b/plugins/org.yakindu.sct.generator.runner/build.properties @@ -0,0 +1,5 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.xml diff --git a/plugins/org.yakindu.sct.generator.runner/icons/sct.png b/plugins/org.yakindu.sct.generator.runner/icons/sct.png new file mode 100644 index 0000000000000000000000000000000000000000..e3bce55d7d6e80b519ade75b9478e71947f09dd3 GIT binary patch literal 335 zcmV-V0kHmwP)v_gJuCBRS(1lK)ex% z7ks)<`+wkYPXr67hurKClpo z9iWDh<^p6ed)1luDssXYhFrM*d;<$H2FOVX3K;9kV2D3|{Y8K%1AhMg%kcf@9}Mwd zfBrELWx%iB{~3P#{)Zv{n^*%t3V;5>V!&Tw4FD?q_2(~!_@BT3i8J8bl_v|{efXw; hE`I6y^Nj!j1^_I#S_-p}ry~FW002ovPDHLkV1k|(gEs&G literal 0 HcmV?d00001 diff --git a/plugins/org.yakindu.sct.generator.core/library/GenericJavaFeatureTypeLibrary.xmi b/plugins/org.yakindu.sct.generator.runner/library/GenericJavaFeatureTypeLibrary.xmi similarity index 100% rename from plugins/org.yakindu.sct.generator.core/library/GenericJavaFeatureTypeLibrary.xmi rename to plugins/org.yakindu.sct.generator.runner/library/GenericJavaFeatureTypeLibrary.xmi diff --git a/plugins/org.yakindu.sct.generator.runner/plugin.xml b/plugins/org.yakindu.sct.generator.runner/plugin.xml new file mode 100644 index 0000000000..26986632db --- /dev/null +++ b/plugins/org.yakindu.sct.generator.runner/plugin.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/org.yakindu.sct.generator.runner/pom.xml b/plugins/org.yakindu.sct.generator.runner/pom.xml new file mode 100644 index 0000000000..b6f0d11473 --- /dev/null +++ b/plugins/org.yakindu.sct.generator.runner/pom.xml @@ -0,0 +1,15 @@ + + + 4.0.0 + + org.yakindu.sct + org.yakindu.sct.releng + 2.7.1-SNAPSHOT + ../../releng/org.yakindu.sct.releng/pom.xml + + org.yakindu.sct.generator.runner + org.yakindu.sct.plugins + eclipse-plugin + diff --git a/plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/impl/GenericJavaBasedGenerator.java b/plugins/org.yakindu.sct.generator.runner/src/org/yakindu/sct/generator/runner/GenericJavaBasedGenerator.java similarity index 88% rename from plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/impl/GenericJavaBasedGenerator.java rename to plugins/org.yakindu.sct.generator.runner/src/org/yakindu/sct/generator/runner/GenericJavaBasedGenerator.java index ff0ce26a98..cc2af93e79 100644 --- a/plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/impl/GenericJavaBasedGenerator.java +++ b/plugins/org.yakindu.sct.generator.runner/src/org/yakindu/sct/generator/runner/GenericJavaBasedGenerator.java @@ -8,12 +8,12 @@ * committers of YAKINDU - initial API and implementation * */ -package org.yakindu.sct.generator.core.impl; +package org.yakindu.sct.generator.runner; -import static org.yakindu.sct.generator.core.features.impl.IGenericJavaFeatureConstants.CONFIGURATION_MODULE; -import static org.yakindu.sct.generator.core.features.impl.IGenericJavaFeatureConstants.GENERATOR_CLASS; -import static org.yakindu.sct.generator.core.features.impl.IGenericJavaFeatureConstants.GENERATOR_PROJECT; -import static org.yakindu.sct.generator.core.features.impl.IGenericJavaFeatureConstants.TEMPLATE_FEATURE; +import static org.yakindu.sct.generator.runner.lib.IGenericJavaFeatureConstants.CONFIGURATION_MODULE; +import static org.yakindu.sct.generator.runner.lib.IGenericJavaFeatureConstants.GENERATOR_CLASS; +import static org.yakindu.sct.generator.runner.lib.IGenericJavaFeatureConstants.GENERATOR_PROJECT; +import static org.yakindu.sct.generator.runner.lib.IGenericJavaFeatureConstants.TEMPLATE_FEATURE; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; @@ -21,6 +21,9 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.xtext.util.Strings; import org.yakindu.sct.commons.WorkspaceClassLoaderFactory; +import org.yakindu.sct.generator.core.impl.AbstractSExecModelGenerator; +import org.yakindu.sct.generator.core.impl.IExecutionFlowGenerator; +import org.yakindu.sct.generator.core.impl.ISGraphGenerator; import org.yakindu.sct.model.sexec.ExecutionFlow; import org.yakindu.sct.model.sgen.FeatureConfiguration; import org.yakindu.sct.model.sgen.FeatureParameterValue; diff --git a/plugins/org.yakindu.sct.generator.runner/src/org/yakindu/sct/generator/runner/RunnerActivator.java b/plugins/org.yakindu.sct.generator.runner/src/org/yakindu/sct/generator/runner/RunnerActivator.java new file mode 100644 index 0000000000..8a9c33f0f9 --- /dev/null +++ b/plugins/org.yakindu.sct.generator.runner/src/org/yakindu/sct/generator/runner/RunnerActivator.java @@ -0,0 +1,30 @@ +package org.yakindu.sct.generator.runner; + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +public class RunnerActivator implements BundleActivator { + + private static BundleContext context; + + static BundleContext getContext() { + return context; + } + + /* + * (non-Javadoc) + * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext bundleContext) throws Exception { + RunnerActivator.context = bundleContext; + } + + /* + * (non-Javadoc) + * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext bundleContext) throws Exception { + RunnerActivator.context = null; + } + +} diff --git a/plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/library/impl/GenericJavaLibraryDefaultValueProvider.java b/plugins/org.yakindu.sct.generator.runner/src/org/yakindu/sct/generator/runner/lib/GenericJavaLibraryDefaultValueProvider.java similarity index 87% rename from plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/library/impl/GenericJavaLibraryDefaultValueProvider.java rename to plugins/org.yakindu.sct.generator.runner/src/org/yakindu/sct/generator/runner/lib/GenericJavaLibraryDefaultValueProvider.java index fe61fc2426..b1646b4403 100644 --- a/plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/library/impl/GenericJavaLibraryDefaultValueProvider.java +++ b/plugins/org.yakindu.sct.generator.runner/src/org/yakindu/sct/generator/runner/lib/GenericJavaLibraryDefaultValueProvider.java @@ -8,11 +8,11 @@ * committers of YAKINDU - initial API and implementation * */ -package org.yakindu.sct.generator.core.library.impl; +package org.yakindu.sct.generator.runner.lib; -import static org.yakindu.sct.generator.core.features.impl.IGenericJavaFeatureConstants.GENERATOR_CLASS; -import static org.yakindu.sct.generator.core.features.impl.IGenericJavaFeatureConstants.GENERATOR_PROJECT; -import static org.yakindu.sct.generator.core.features.impl.IGenericJavaFeatureConstants.LIBRARY_NAME; +import static org.yakindu.sct.generator.runner.lib.IGenericJavaFeatureConstants.GENERATOR_CLASS; +import static org.yakindu.sct.generator.runner.lib.IGenericJavaFeatureConstants.GENERATOR_PROJECT; +import static org.yakindu.sct.generator.runner.lib.IGenericJavaFeatureConstants.LIBRARY_NAME; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; diff --git a/plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/features/impl/IGenericJavaFeatureConstants.java b/plugins/org.yakindu.sct.generator.runner/src/org/yakindu/sct/generator/runner/lib/IGenericJavaFeatureConstants.java similarity index 93% rename from plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/features/impl/IGenericJavaFeatureConstants.java rename to plugins/org.yakindu.sct.generator.runner/src/org/yakindu/sct/generator/runner/lib/IGenericJavaFeatureConstants.java index 5e9158e6a8..e9da5445a3 100644 --- a/plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/features/impl/IGenericJavaFeatureConstants.java +++ b/plugins/org.yakindu.sct.generator.runner/src/org/yakindu/sct/generator/runner/lib/IGenericJavaFeatureConstants.java @@ -8,7 +8,7 @@ * Contributors: * committers of YAKINDU - initial API and implementation */ -package org.yakindu.sct.generator.core.features.impl; +package org.yakindu.sct.generator.runner.lib; public interface IGenericJavaFeatureConstants { public static final String LIBRARY_NAME = "Java"; diff --git a/plugins/org.yakindu.sct.generator.xpand/plugin.xml b/plugins/org.yakindu.sct.generator.xpand/plugin.xml index ac372bb817..7de94756ce 100644 --- a/plugins/org.yakindu.sct.generator.xpand/plugin.xml +++ b/plugins/org.yakindu.sct.generator.xpand/plugin.xml @@ -5,14 +5,14 @@ point="org.yakindu.sct.generator.core.featuretypes">