#899 Introduced builder plugin

plugins/org.yakindu.sct.generator.builder/.classpath

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

plugins/org.yakindu.sct.generator.builder/.gitignore

@@ -0,0 +1 @@
+/bin/

plugins/org.yakindu.sct.generator.builder/.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.yakindu.sct.generator.builder</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

plugins/org.yakindu.sct.generator.builder/.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

plugins/org.yakindu.sct.generator.builder/META-INF/MANIFEST.MF

@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: YAKINDU Builder
+Bundle-SymbolicName: org.yakindu.sct.generator.builder;singleton:=true
+Bundle-Version: 2.7.1.qualifier
+Bundle-Activator: org.yakindu.sct.generator.builder.BuilderActivator
+Bundle-Vendor: statecharts.org
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.emf.ecore,
+ com.google.guava,
+ org.yakindu.sct.generator.genmodel,
+ org.yakindu.sct.domain
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-ActivationPolicy: lazy
+Export-Package: org.yakindu.sct.generator.builder,
+ org.yakindu.sct.generator.builder.action,
+ org.yakindu.sct.generator.builder.nature

plugins/org.yakindu.sct.generator.builder/build.properties

@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml

plugins/org.yakindu.sct.generator.builder/plugin.xml

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+<extension
+         id="org.yakindu.sct.builder.SCTBuilder"
+         name="YAKINDU SCT Builder"
+         point="org.eclipse.core.resources.builders">
+      <builder hasNature="true">
+         <run  class="org.yakindu.sct.generator.builder.SCTBuilder">
+         </run>
+      </builder>
+   </extension>
+   <extension
+         point="org.eclipse.core.resources.natures"
+         id="org.yakindu.sct.builder.SCTNature"
+         name="YAKINDU SCT Project Nature">
+      <runtime>
+         <run class="org.yakindu.sct.generator.builder.nature.SCTNature">
+         </run>
+      </runtime>
+      <builder
+            id="org.yakindu.sct.builder.SCTBuilder">
+      </builder>
+   </extension>
+   <extension
+         point="org.eclipse.ui.popupMenus">
+      <objectContribution
+            adaptable="true"
+            objectClass="org.eclipse.core.resources.IProject"
+            nameFilter="*"
+            id="org.yakindu.sct.builder.addNature">
+         <action
+               label="Add YAKINDU SCT Nature"
+               class="org.yakindu.sct.generator.builder.action.ToggleSCTNatureAction"
+               menubarPath="org.eclipse.ui.projectConfigure/additions"
+               enablesFor="+"
+               id="org.yakindu.sct.builder.addRemoveNatureAction">
+         </action>
+           <visibility>
+         	<not>
+	            <objectState
+    	              name="nature"
+        	          value="org.yakindu.sct.builder.SCTNature">
+            	</objectState>
+            </not>
+         </visibility>
+      </objectContribution>
+      <objectContribution
+            adaptable="true"
+            objectClass="org.eclipse.core.resources.IProject"
+            nameFilter="*"
+            id="org.yakindu.sct.builder.removeNature">
+         <action
+               label="Remove YAKINDU SCT Nature"
+               class="org.yakindu.sct.generator.builder.action.ToggleSCTNatureAction"
+               menubarPath="org.eclipse.ui.projectConfigure/additions"
+               enablesFor="+"
+               id="org.yakindu.sct.builder.addRemoveNatureAction">
+         </action>
+           <visibility>
+	            <objectState
+    	              name="nature"
+        	          value="org.yakindu.sct.builder.SCTNature">
+            	</objectState>
+         </visibility>
+      </objectContribution>
+   </extension>
+     <extension
+       point="org.eclipse.core.runtime.preferences">
+    	<initializer class="org.yakindu.sct.generator.core.preferences.GenModelPreferenceInitializer">
+    	</initializer>
+ 	</extension>
+ 	  <extension point = "org.eclipse.ui.popupMenus">
+     <objectContribution
+        id="org.yakindu.sct.builder.generate"
+        objectClass="org.eclipse.core.resources.IFile"
+	    nameFilter="*.sgen">
+	    <action
+           class="org.yakindu.sct.generator.builder.action.GenerateModelAction"
+           enablesFor="1"
+           id="org.yakindu.sct.generator.ui.generateaction"
+           label="Generate Code Artifacts"
+           menubarPath="additions">
+	    </action>
+	 </objectContribution>
+	</extension>
+</plugin>

plugins/org.yakindu.sct.generator.builder/src/org/yakindu/sct/generator/builder/BuilderActivator.java

@@ -0,0 +1,50 @@
+package org.yakindu.sct.generator.builder;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class BuilderActivator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.yakindu.sct.builder"; //$NON-NLS-1$
+
+	// The shared instance
+	private static BuilderActivator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public BuilderActivator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static BuilderActivator getDefault() {
+		return plugin;
+	}
+
+}

plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/GeneratorExecutor.java

@@ -8,7 +8,7 @@
  * 	committers of YAKINDU - initial API and implementation
  * 
  */
-package org.yakindu.sct.generator.core;
+package org.yakindu.sct.generator.builder;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -25,6 +25,7 @@ import org.yakindu.base.types.typesystem.AbstractTypeSystem;
 import org.yakindu.base.types.typesystem.ITypeSystem;
 import org.yakindu.sct.domain.extension.DomainRegistry;
 import org.yakindu.sct.domain.extension.IDomainDescriptor;
+import org.yakindu.sct.generator.core.ISCTGenerator;
 import org.yakindu.sct.generator.core.extensions.GeneratorExtensions;
 import org.yakindu.sct.generator.core.extensions.IGeneratorDescriptor;
 import org.yakindu.sct.generator.core.impl.AbstractSGraphModelGenerator;

plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/builder/SCTBuilder.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     committers of YAKINDU - initial API and implementation
  */
-package org.yakindu.sct.builder;
+package org.yakindu.sct.generator.builder;
 
 import java.util.Map;
 import java.util.Set;
@@ -34,7 +34,6 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.yakindu.sct.generator.core.GeneratorActivator;
-import org.yakindu.sct.generator.core.GeneratorExecutor;
 import org.yakindu.sct.model.sgen.GeneratorEntry;
 import org.yakindu.sct.model.sgen.GeneratorModel;
 import org.yakindu.sct.model.sgraph.Statechart;

plugins/org.yakindu.sct.generator.genmodel.ui/src/org/yakindu/sct/generator/genmodel/ui/action/GenerateModelAction.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     committers of YAKINDU - initial API and implementation
  */
-package org.yakindu.sct.generator.genmodel.ui.action;
+package org.yakindu.sct.generator.builder.action;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
@@ -30,11 +30,9 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PlatformUI;
+import org.yakindu.sct.generator.builder.BuilderActivator;
+import org.yakindu.sct.generator.builder.GeneratorExecutor;
 import org.yakindu.sct.generator.core.GeneratorActivator;
-import org.yakindu.sct.generator.core.GeneratorExecutor;
-import org.yakindu.sct.generator.genmodel.ui.internal.SGenActivator;
-
-import com.google.inject.Inject;
 
 /**
  * 
@@ -45,8 +43,11 @@ public class GenerateModelAction implements IObjectActionDelegate {
 
 	private ISelection selection;
 
-	@Inject
 	private GeneratorExecutor generatorExecutor;
+	
+	public GenerateModelAction() {
+		generatorExecutor = new GeneratorExecutor();
+	}
 
 	public void run(IAction action) {
 		IFile file = unwrap();
@@ -71,9 +72,8 @@ public class GenerateModelAction implements IObjectActionDelegate {
 				}
 			}
 		} catch (CoreException e) {
-			SGenActivator.getInstance().getLog()
-					.log(new Status(IStatus.WARNING, SGenActivator.ORG_YAKINDU_SCT_GENERATOR_GENMODEL_SGEN,
-							"Error in determine, if file contains errors", e));
+			BuilderActivator.getDefault().getLog().log(new Status(IStatus.WARNING, BuilderActivator.PLUGIN_ID,
+					"Error in determine, if file contains errors", e));
 		}
 
 		ResourceSet rs = new ResourceSetImpl();
@@ -93,8 +93,8 @@ public class GenerateModelAction implements IObjectActionDelegate {
 				}
 			}
 		} catch (RuntimeException e) {
-			SGenActivator.getInstance().getLog().log(new Status(IStatus.INFO,
-					SGenActivator.ORG_YAKINDU_SCT_GENERATOR_GENMODEL_SGEN, "Error in opening Resource", e));
+			BuilderActivator.getDefault().getLog()
+					.log(new Status(IStatus.WARNING, BuilderActivator.PLUGIN_ID, "Error in opening resource", e));
 		}
 		return false;
 	}

plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/builder/nature/ToggleSCTNatureAction.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     committers of YAKINDU - initial API and implementation
  */
-package org.yakindu.sct.builder.nature;
+package org.yakindu.sct.generator.builder.action;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -24,6 +24,7 @@ import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.commands.IElementUpdater;
 import org.eclipse.ui.menus.UIElement;
+import org.yakindu.sct.generator.builder.nature.SCTNature;
 /**
  * 
  * @author andreas muelder - Initial contribution and API

plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/builder/nature/SCTNature.java

@@ -8,14 +8,14 @@
  * Contributors:
  *     committers of YAKINDU - initial API and implementation
  */
-package org.yakindu.sct.builder.nature;
+package org.yakindu.sct.generator.builder.nature;
 
 import org.eclipse.core.resources.ICommand;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
 import org.eclipse.core.resources.IProjectNature;
 import org.eclipse.core.runtime.CoreException;
-import org.yakindu.sct.builder.SCTBuilder;
+import org.yakindu.sct.generator.builder.SCTBuilder;
 /**
  * 
  * @author andreas muelder - Initial contribution and API

plugins/org.yakindu.sct.generator.core/META-INF/MANIFEST.MF

@@ -28,8 +28,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.xtext.generator
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
-Export-Package: org.yakindu.sct.builder.nature,
- org.yakindu.sct.generator.core,
+Export-Package: org.yakindu.sct.generator.core,
  org.yakindu.sct.generator.core.extensions,
  org.yakindu.sct.generator.core.features,
  org.yakindu.sct.generator.core.features.impl,

plugins/org.yakindu.sct.generator.core/plugin.xml

@@ -78,74 +78,4 @@
             generatorId="yakindu::generic">
       </ExtensionGeneratorMapping>
    </extension>
- 
-  <extension
-         id="org.yakindu.sct.builder.SCTBuilder"
-         name="YAKINDU SCT Builder"
-         point="org.eclipse.core.resources.builders">
-      <builder hasNature="true">
-         <run  class="org.yakindu.sct.builder.SCTBuilder">
-         </run>
-      </builder>
-   </extension>
-   <extension
-         point="org.eclipse.core.resources.natures"
-         id="org.yakindu.sct.builder.SCTNature"
-         name="YAKINDU SCT Project Nature">
-      <runtime>
-         <run class="org.yakindu.sct.builder.nature.SCTNature">
-         </run>
-      </runtime>
-      <builder
-            id="org.yakindu.sct.builder.SCTBuilder">
-      </builder>
-   </extension>
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            adaptable="true"
-            objectClass="org.eclipse.core.resources.IProject"
-            nameFilter="*"
-            id="org.yakindu.sct.builder.addNature">
-         <action
-               label="Add YAKINDU SCT Nature"
-               class="org.yakindu.sct.builder.nature.ToggleSCTNatureAction"
-               menubarPath="org.eclipse.ui.projectConfigure/additions"
-               enablesFor="+"
-               id="org.yakindu.sct.builder.addRemoveNatureAction">
-         </action>
-           <visibility>
-         	<not>
-	            <objectState
-    	              name="nature"
-        	          value="org.yakindu.sct.builder.SCTNature">
-            	</objectState>
-            </not>
-         </visibility>
-      </objectContribution>
-      <objectContribution
-            adaptable="true"
-            objectClass="org.eclipse.core.resources.IProject"
-            nameFilter="*"
-            id="org.yakindu.sct.builder.removeNature">
-         <action
-               label="Remove YAKINDU SCT Nature"
-               class="org.yakindu.sct.builder.nature.ToggleSCTNatureAction"
-               menubarPath="org.eclipse.ui.projectConfigure/additions"
-               enablesFor="+"
-               id="org.yakindu.sct.builder.addRemoveNatureAction">
-         </action>
-           <visibility>
-	            <objectState
-    	              name="nature"
-        	          value="org.yakindu.sct.builder.SCTNature">
-            	</objectState>
-         </visibility>
-      </objectContribution>
-   </extension>
-     <extension
-       point="org.eclipse.core.runtime.preferences">
-    	<initializer class="org.yakindu.sct.generator.core.preferences.GenModelPreferenceInitializer">
-    	</initializer>
- 	</extension>
 </plugin>

plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/AbstractWorkspaceGenerator.java

@@ -22,6 +22,7 @@ import org.yakindu.sct.model.sgen.GeneratorEntry;
  * @author holger willebrandt - Initial contribution and API
  * @author Johannes Dicks - refactored because of EFS decoupling
  */ 
+@Deprecated
 public abstract class AbstractWorkspaceGenerator extends AbstractSExecModelGenerator {
 	
 	/**

plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/impl/GenericJavaBasedGenerator.java

@@ -37,6 +37,7 @@ import com.google.inject.util.Modules;
  * 
  * @author holger willebrandt - Initial contribution and API
  */
+@Deprecated
 public class GenericJavaBasedGenerator extends AbstractSExecModelGenerator {
 
 	@Inject

plugins/org.yakindu.sct.generator.genmodel.ui/META-INF/MANIFEST.MF

@@ -26,7 +26,8 @@ Require-Bundle: org.yakindu.sct.generator.genmodel;visibility:=reexport,
  org.eclipse.help,
  org.yakindu.base.xtext.utils.jface,
  org.yakindu.sct.ui,
- org.yakindu.sct.doc.user
+ org.yakindu.sct.doc.user,
+ org.yakindu.sct.generator.builder
 Import-Package: org.apache.commons.logging,
  org.apache.log4j,
  org.eclipse.jdt.core

plugins/org.yakindu.sct.generator.genmodel.ui/plugin.xml

@@ -363,20 +363,6 @@
             extensions="sgen">
     </provider>
   </extension>
-  <extension point = "org.eclipse.ui.popupMenus">
-     <objectContribution
-        id="org.yakindu.sct.generator.ui"
-        objectClass="org.eclipse.core.resources.IFile"
-	    nameFilter="*.sgen">
-	    <action
-           class="org.yakindu.sct.generator.genmodel.ui.SGenExecutableExtensionFactory:org.yakindu.sct.generator.genmodel.ui.action.GenerateModelAction"
-           enablesFor="1"
-           id="org.yakindu.sct.generator.ui.generateaction"
-           label="Generate Code Artifacts"
-           menubarPath="additions">
-	    </action>
-	 </objectContribution>
-	</extension>	
  <!-- New File Wizard -->
     <extension
          point="org.eclipse.ui.newWizards">

plugins/org.yakindu.sct.generator.genmodel.ui/src/org/yakindu/sct/generator/genmodel/ui/wizard/SGenNewFileWizard.java

@@ -36,8 +36,8 @@ import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
 import org.eclipse.ui.part.FileEditorInput;
-import org.yakindu.sct.builder.nature.SCTNature;
-import org.yakindu.sct.builder.nature.ToggleSCTNatureAction;
+import org.yakindu.sct.generator.builder.action.ToggleSCTNatureAction;
+import org.yakindu.sct.generator.builder.nature.SCTNature;
 import org.yakindu.sct.generator.core.extensions.IGeneratorDescriptor;
 import org.yakindu.sct.model.sgen.GeneratorModel;
 import org.yakindu.sct.ui.wizards.ModelCreationWizardPage;

test-plugins/org.yakindu.sct.generator.c.test/META-INF/MANIFEST.MF

@@ -16,6 +16,7 @@ Require-Bundle: org.junit,
  org.yakindu.sct.model.sgen,
  org.yakindu.sct.test.models,
  org.yakindu.sct.generator.genmodel.ui,
- org.yakindu.sct.model.resource
+ org.yakindu.sct.model.resource,
+ org.yakindu.sct.generator.builder
 Export-Package: org.yakindu.sct.generator.c.gtest,
  org.yakindu.sct.generator.c.test

test-plugins/org.yakindu.sct.generator.c.test/src/org/yakindu/sct/generator/c/gtest/GTestHelper.java

@@ -37,7 +37,7 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
-import org.yakindu.sct.generator.core.GeneratorExecutor;
+import org.yakindu.sct.generator.builder.GeneratorExecutor;
 import org.yakindu.sct.model.sgen.GeneratorModel;
 import org.yakindu.sct.model.sgraph.Statechart;
 import org.yakindu.sct.test.models.SCTUnitTestModels;