add modelgen from old structure

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/.classpath b/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/.classpath
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/.gitignore b/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/.gitignore
new file mode 100644
index 0000000..ae3c172
--- /dev/null
+++ b/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/.gitignore

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

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/.project b/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/.project
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/.settings/org.eclipse.jdt.core.prefs
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/META-INF/MANIFEST.MF b/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/META-INF/MANIFEST.MF
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/build.properties b/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/build.properties
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/plugin.xml b/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/plugin.xml
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/src/org/eclipse/stem/model/builder/Activator.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/src/org/eclipse/stem/model/builder/Activator.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/src/org/eclipse/stem/model/builder/BuilderUtils.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/src/org/eclipse/stem/model/builder/BuilderUtils.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/src/org/eclipse/stem/model/builder/ExpressionCompileErrorMarker.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/src/org/eclipse/stem/model/builder/ExpressionCompileErrorMarker.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/src/org/eclipse/stem/model/builder/ExpressionMethodGenerator.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/src/org/eclipse/stem/model/builder/ExpressionMethodGenerator.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/src/org/eclipse/stem/model/builder/MetamodelBuilder.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/src/org/eclipse/stem/model/builder/MetamodelBuilder.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/src/org/eclipse/stem/model/builder/ModelNeedsRegenerationErrorMarker.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.builder/src/org/eclipse/stem/model/builder/ModelNeedsRegenerationErrorMarker.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/.classpath b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/.classpath
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/.gitignore b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/.gitignore
new file mode 100644
index 0000000..ae3c172
--- /dev/null
+++ b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/.gitignore

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

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/.project b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/.project
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/.settings/org.eclipse.core.resources.prefs b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/.settings/org.eclipse.core.resources.prefs
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/.settings/org.eclipse.jdt.core.prefs
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/.settings/org.eclipse.pde.prefs b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/.settings/org.eclipse.pde.prefs
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/META-INF/MANIFEST.MF b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/META-INF/MANIFEST.MF
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/build.properties b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/build.properties
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/customBuildCallbacks.xml b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/customBuildCallbacks.xml
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/icons/disease.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/icons/disease.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/icons/population.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/icons/population.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/edit/BuildProperties_.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/edit/BuildProperties_.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/edit/ItemProviderAdapterFactory_.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/edit/ItemProviderAdapterFactory_.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/edit/ItemProvider_.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/edit/ItemProvider_.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/edit/PluginProperties_.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/edit/PluginProperties_.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/edit/PluginXML_.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/edit/PluginXML_.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/edit/Plugin_.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/edit/Plugin_.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/ActionBarContributor_.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/ActionBarContributor_.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/BuildProperties_.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/BuildProperties_.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/Editor_.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/Editor_.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/ManifestMF_.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/ManifestMF_.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/ModelWizard_.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/ModelWizard_.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/PluginProperties_.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/PluginProperties_.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/PluginXML_.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/PluginXML_.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/Plugin_.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/Plugin_.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditor.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditor.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditorAdapter.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditorAdapter.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditorAdapterFactory.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditorAdapterFactory.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/PropertyStringProviderAdapterFactory.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/PropertyStringProviderAdapterFactory.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/RelativeValueProviderAdapterFactory.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/RelativeValueProviderAdapterFactory.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/WizardMessages.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/WizardMessages.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/WizardMessagesProperties.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/editor/WizardMessagesProperties.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/model/AdapterFactoryClass_.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/model/AdapterFactoryClass_.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/model/BuildProperties_.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/model/BuildProperties_.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/model/Class_$1.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/model/Class_$1.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/model/Class_.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/model/Class_.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/model/FactoryClass_.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/model/FactoryClass_.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/model/PackageClass_$1Information.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/model/PackageClass_$1Information.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/model/PackageClass_$1InformationIterator.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/model/PackageClass_$1InformationIterator.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/model/PackageClass_.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/model/PackageClass_.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/model/PluginProperties_.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/model/PluginProperties_.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/model/SwitchClass_.class b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/jet-compiled/org/eclipse/emf/codegen/ecore/templates/model/SwitchClass_.class
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/plugin.properties b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/plugin.properties
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/plugin.xml b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/plugin.xml
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/schema/model_type.exsd b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/schema/model_type.exsd
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/edit/BuildProperties_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/edit/BuildProperties_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/edit/ItemProviderAdapterFactory_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/edit/ItemProviderAdapterFactory_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/edit/ItemProvider_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/edit/ItemProvider_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/edit/PluginProperties_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/edit/PluginProperties_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/ActionBarContributor_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/ActionBarContributor_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/Editor_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/Editor_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/ModelWizard_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/ModelWizard_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PluginProperties_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PluginProperties_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/Plugin_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/Plugin_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditor.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditor.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditorAdapter.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditorAdapter.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditorAdapterFactory.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyEditorAdapterFactory.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyStringProviderAdapterFactory.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/PropertyStringProviderAdapterFactory.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/RelativeValueProviderAdapterFactory.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/RelativeValueProviderAdapterFactory.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/WizardMessages.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/WizardMessages.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/WizardMessagesProperties.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/editor/WizardMessagesProperties.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/AdapterFactoryClass_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/AdapterFactoryClass_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/BuildProperties_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/BuildProperties_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/Class_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/Class_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/FactoryClass_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/FactoryClass_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/PackageClass_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/PackageClass_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/PluginProperties_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/PluginProperties_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/SwitchClass_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/SwitchClass_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/BuildProperties_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/BuildProperties_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/ManifestMF_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/ManifestMF_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/ModelTestSuite_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/ModelTestSuite_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/PackageExample_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/PackageExample_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/PackageTestSuite_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/PackageTestSuite_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/PluginProperties_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/PluginProperties_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/TestCase_.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/emf/codegen/ecore/templates/model/tests/TestCase_.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/Activator.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/Activator.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/CodeGenConstants.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/CodeGenConstants.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/ExpressionArgumentSerializer.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/ExpressionArgumentSerializer.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/GeneratorUtils.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/GeneratorUtils.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/ModelGeneratorAdapter.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/ModelGeneratorAdapter.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/ModelGeneratorAdapterFactory.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/ModelGeneratorAdapterFactory.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/ModelGeneratorDescriptors.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/ModelGeneratorDescriptors.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/OverridenGenModelGeneratorAdapterFactory.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/OverridenGenModelGeneratorAdapterFactory.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/STEMGenFeature.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/STEMGenFeature.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/STEMGenModel.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/STEMGenModel.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/STEMGenPackage.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/STEMGenPackage.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/descriptor/EClassDescriptor.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/descriptor/EClassDescriptor.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/descriptor/JavaClassDescriptor.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/descriptor/JavaClassDescriptor.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/descriptor/ModelGeneratorDescriptor.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/descriptor/ModelGeneratorDescriptor.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/descriptor/UnknownElementDescriptor.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/descriptor/UnknownElementDescriptor.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/xtext/ExpressionsClassGenerator.xtend b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/xtext/ExpressionsClassGenerator.xtend
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/xtext/ModelExpressionGenerator.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/codegen/xtext/ModelExpressionGenerator.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/xtext/ExpressionMethodDefinition.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/xtext/ExpressionMethodDefinition.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/xtext/ExpressionMethodGenerator.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/xtext/ExpressionMethodGenerator.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/xtext/XtextUtils.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/src/org/eclipse/stem/model/xtext/XtextUtils.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/Header.javajetinc b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/Header.javajetinc
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/Header.jetinc b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/Header.jetinc
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/Header.propertiesjetinc b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/Header.propertiesjetinc
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/Header.xmljetinc b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/Header.xmljetinc
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/edit/ItemProvider.javajet b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/edit/ItemProvider.javajet
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/edit/plugin.xmljet b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/edit/plugin.xmljet
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/editor/PropertyEditor.javajet b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/editor/PropertyEditor.javajet
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/editor/PropertyEditorAdapter.javajet b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/editor/PropertyEditorAdapter.javajet
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/editor/PropertyEditorAdapterFactory.javajet b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/editor/PropertyEditorAdapterFactory.javajet
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/editor/PropertyStringProviderAdapterFactory.javajet b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/editor/PropertyStringProviderAdapterFactory.javajet
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/editor/RelativeValueProviderAdapterFactory.javajet b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/editor/RelativeValueProviderAdapterFactory.javajet
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/editor/WizardMessages.javajet b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/editor/WizardMessages.javajet
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/editor/WizardMessages.propertiesjet b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/editor/WizardMessages.propertiesjet
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/editor/manifest.mfjet b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/editor/manifest.mfjet
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/editor/plugin.xmljet b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/editor/plugin.xmljet
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/emf-merge.xml b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/emf-merge.xml
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/model/Class.javajet b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/model/Class.javajet
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/model/Class/insert.javajetinc b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/model/Class/insert.javajetinc
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/model/plugin.xmljet b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/templates/model/plugin.xmljet
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/xtend-gen/org/eclipse/stem/model/codegen/xtext/.ExpressionsClassGenerator.xtendbin b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/xtend-gen/org/eclipse/stem/model/codegen/xtext/.ExpressionsClassGenerator.xtendbin
new file mode 100644
index 0000000..74d9bc6
--- /dev/null
+++ b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/xtend-gen/org/eclipse/stem/model/codegen/xtext/.ExpressionsClassGenerator.xtendbin
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/xtend-gen/org/eclipse/stem/model/codegen/xtext/.gitignore b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/xtend-gen/org/eclipse/stem/model/codegen/xtext/.gitignore
deleted file mode 100644
index eddfd6b..0000000
--- a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/xtend-gen/org/eclipse/stem/model/codegen/xtext/.gitignore
+++ /dev/null

@@ -1,2 +0,0 @@
-/.ExpressionsClassGenerator.xtendbin
-/ExpressionsClassGenerator.java

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/xtend-gen/org/eclipse/stem/model/codegen/xtext/ExpressionsClassGenerator.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/xtend-gen/org/eclipse/stem/model/codegen/xtext/ExpressionsClassGenerator.java
new file mode 100755
index 0000000..3e809f4
--- /dev/null
+++ b/org.eclipse.stem/modelgen/org.eclipse.stem.model.codegen/xtend-gen/org/eclipse/stem/model/codegen/xtext/ExpressionsClassGenerator.java

@@ -0,0 +1,728 @@
+/**
+ * Copyright (c) 2013 IBM Corporation 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:
+ *     IBM Corporation - initial API and implementation
+ */
+package org.eclipse.stem.model.codegen.xtext;
+
+import com.google.common.base.Objects;
+import com.google.common.collect.Iterables;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.stem.model.codegen.xtext.ModelExpressionGenerator;
+import org.eclipse.stem.model.ctdl.ContextSensitiveResourceWrapper;
+import org.eclipse.stem.model.ctdl.ctdl.AbsoluteCompartmentValueReference;
+import org.eclipse.stem.model.ctdl.ctdl.BooleanLiteral;
+import org.eclipse.stem.model.ctdl.ctdl.CompartmentTransitionDefinitions;
+import org.eclipse.stem.model.ctdl.ctdl.DefStatement;
+import org.eclipse.stem.model.ctdl.ctdl.Div;
+import org.eclipse.stem.model.ctdl.ctdl.Evaluation;
+import org.eclipse.stem.model.ctdl.ctdl.Expression;
+import org.eclipse.stem.model.ctdl.ctdl.ExternalFunctionReference;
+import org.eclipse.stem.model.ctdl.ctdl.FunctionCall;
+import org.eclipse.stem.model.ctdl.ctdl.FunctionReference;
+import org.eclipse.stem.model.ctdl.ctdl.GlobalVariableReference;
+import org.eclipse.stem.model.ctdl.ctdl.LocalVariableReference;
+import org.eclipse.stem.model.ctdl.ctdl.MetamodelResource;
+import org.eclipse.stem.model.ctdl.ctdl.Minus;
+import org.eclipse.stem.model.ctdl.ctdl.ModelParamReference;
+import org.eclipse.stem.model.ctdl.ctdl.Multi;
+import org.eclipse.stem.model.ctdl.ctdl.NumberLiteral;
+import org.eclipse.stem.model.ctdl.ctdl.Plus;
+import org.eclipse.stem.model.ctdl.ctdl.PrimaryExpression;
+import org.eclipse.stem.model.ctdl.ctdl.RelativeCompartmentValueReference;
+import org.eclipse.stem.model.ctdl.ctdl.ScopedVariableReference;
+import org.eclipse.stem.model.ctdl.ctdl.StringLiteral;
+import org.eclipse.stem.model.ctdl.ctdl.TransitionBlock;
+import org.eclipse.stem.model.ctdl.ctdl.VariableReference;
+import org.eclipse.stem.model.ctdl.functions.FunctionArgumentReference;
+import org.eclipse.stem.model.ctdl.functions.JavaMethodArgument;
+import org.eclipse.stem.model.ctdl.functions.SystemArgumentReference;
+import org.eclipse.stem.model.ctdl.serializer.ITypeSerializer;
+import org.eclipse.stem.model.ctdl.serializer.TypeSerializerFactory;
+import org.eclipse.stem.model.metamodel.Compartment;
+import org.eclipse.stem.model.metamodel.Transition;
+import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.generator.IFileSystemAccess;
+import org.eclipse.xtext.resource.XtextResource;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+import org.eclipse.xtext.xbase.lib.IteratorExtensions;
+import org.eclipse.xtext.xbase.lib.StringExtensions;
+
+@SuppressWarnings("all")
+public class ExpressionsClassGenerator extends ModelExpressionGenerator {
+  @Override
+  public void doGenerate(final List<XtextResource> resources, final IFileSystemAccess fsa) {
+    String _name = this.modelGenClass.getName();
+    String fileName = (_name + "Expressions.java");
+    fsa.generateFile(fileName, this.build(resources));
+  }
+  
+  @Override
+  public void doGenerate(final Resource resource, final IFileSystemAccess fsa) {
+    CompartmentTransitionDefinitions ctd = IterableExtensions.<CompartmentTransitionDefinitions>head(Iterables.<CompartmentTransitionDefinitions>filter(IteratorExtensions.<EObject>toIterable(resource.getAllContents()), CompartmentTransitionDefinitions.class));
+    MetamodelResource mm = ctd.getMetamodel();
+    Transition trans = mm.getTransition();
+    String _name = trans.getSource().getName();
+    String _plus = (_name + "_");
+    String _name_1 = trans.getTarget().getName();
+    String fname = (_plus + _name_1);
+    fsa.generateFile(fname, this.compile(resource));
+  }
+  
+  public CharSequence build(final List<XtextResource> r) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("package ");
+    String _classPackageName = this.modelGenClass.getGenPackage().getClassPackageName();
+    _builder.append(_classPackageName);
+    _builder.append(";");
+    String pkg = _builder.toString();
+    StringConcatenation _builder_1 = new StringConcatenation();
+    _builder_1.append("\t\t");
+    _builder_1.append("/**");
+    _builder_1.newLine();
+    _builder_1.append("\t\t ");
+    _builder_1.append("* Generated expressions class for  ");
+    String _name = this.modelGenClass.getName();
+    _builder_1.append(_name, "\t\t ");
+    _builder_1.append(".");
+    _builder_1.newLineIfNotEmpty();
+    _builder_1.append("\t\t ");
+    _builder_1.append("* DO NOT EDIT DIRECTLY.  Use extended class and override methods for transitions as desired.");
+    _builder_1.newLine();
+    _builder_1.append("\t\t ");
+    _builder_1.append("* @generated");
+    _builder_1.newLine();
+    _builder_1.append("\t\t ");
+    _builder_1.append("*/");
+    _builder_1.newLine();
+    _builder_1.append("\t\t");
+    _builder_1.append("public class ");
+    String _name_1 = this.modelGenClass.getName();
+    _builder_1.append(_name_1, "\t\t");
+    _builder_1.append("Expressions {");
+    _builder_1.newLineIfNotEmpty();
+    _builder_1.append("\t");
+    _builder_1.append("public void calculate(double t, long timeDelta, ");
+    String _importedName = this.getImportedName("org.eclipse.stem.core.model.STEMTime");
+    _builder_1.append(_importedName, "\t");
+    _builder_1.append(" time, ");
+    String _importGenClassInterface = this.importGenClassInterface(this.modelGenClass);
+    _builder_1.append(_importGenClassInterface, "\t");
+    _builder_1.append(" model, ");
+    String _importGenClassInterface_1 = this.importGenClassInterface(this.labelGenClass);
+    _builder_1.append(_importGenClassInterface_1, "\t");
+    _builder_1.append(" label, ");
+    String _importGenClassInterface_2 = this.importGenClassInterface(this.labelValueGenClass);
+    _builder_1.append(_importGenClassInterface_2, "\t");
+    _builder_1.append(" labelValue, ");
+    String _importedName_1 = this.getImportedName("org.eclipse.stem.core.graph.Node");
+    _builder_1.append(_importedName_1, "\t");
+    _builder_1.append(" node, ");
+    String _importGenClassInterface_3 = this.importGenClassInterface(this.labelValueGenClass);
+    _builder_1.append(_importGenClassInterface_3, "\t");
+    _builder_1.append(" deltaValue) {");
+    _builder_1.newLineIfNotEmpty();
+    {
+      Set<Compartment> _affectedCompartments = this.getAffectedCompartments(r);
+      for(final Compartment s : _affectedCompartments) {
+        _builder_1.append("\t\t");
+        _builder_1.append("double delta");
+        String _accessorName = this.getAccessorName(s);
+        _builder_1.append(_accessorName, "\t\t");
+        _builder_1.append(" = 0.0;");
+        _builder_1.newLineIfNotEmpty();
+      }
+    }
+    _builder_1.append("\t\t");
+    _builder_1.newLine();
+    {
+      Iterable<ContextSensitiveResourceWrapper> _filter = Iterables.<ContextSensitiveResourceWrapper>filter(r, ContextSensitiveResourceWrapper.class);
+      for(final ContextSensitiveResourceWrapper s_1 : _filter) {
+        _builder_1.append("\t\t");
+        _builder_1.append("// Calculate delta for transition ");
+        String _formattedName = this.getFormattedName(s_1.getTransition());
+        _builder_1.append(_formattedName, "\t\t");
+        _builder_1.newLineIfNotEmpty();
+        _builder_1.append("\t\t");
+        _builder_1.append("double generated_");
+        String _methodName = this.getMethodName(s_1.getTransition());
+        _builder_1.append(_methodName, "\t\t");
+        _builder_1.append(" = ");
+        String _methodName_1 = this.getMethodName(s_1.getTransition());
+        _builder_1.append(_methodName_1, "\t\t");
+        _builder_1.append("(t,timeDelta,time,model,label,labelValue,label.getNode());");
+        _builder_1.newLineIfNotEmpty();
+        _builder_1.append("\t\t");
+        _builder_1.append("delta");
+        String _accessorName_1 = this.getAccessorName(s_1.getTransition().getSource());
+        _builder_1.append(_accessorName_1, "\t\t");
+        _builder_1.append(" -= generated_");
+        String _methodName_2 = this.getMethodName(s_1.getTransition());
+        _builder_1.append(_methodName_2, "\t\t");
+        _builder_1.append(";");
+        _builder_1.newLineIfNotEmpty();
+        _builder_1.append("\t\t");
+        _builder_1.append("delta");
+        String _accessorName_2 = this.getAccessorName(s_1.getTransition().getTarget());
+        _builder_1.append(_accessorName_2, "\t\t");
+        _builder_1.append(" += generated_");
+        String _methodName_3 = this.getMethodName(s_1.getTransition());
+        _builder_1.append(_methodName_3, "\t\t");
+        _builder_1.append(";");
+        _builder_1.newLineIfNotEmpty();
+        {
+          EList<Compartment> _forIncidence = s_1.getTransition().getForIncidence();
+          for(final Compartment c : _forIncidence) {
+            _builder_1.append("\t\t");
+            _builder_1.append("\t");
+            _builder_1.append("delta");
+            String _accessorName_3 = this.getAccessorName(c);
+            _builder_1.append(_accessorName_3, "\t\t\t");
+            _builder_1.append(" += generated_");
+            String _methodName_4 = this.getMethodName(s_1.getTransition());
+            _builder_1.append(_methodName_4, "\t\t\t");
+            _builder_1.append(";");
+            _builder_1.newLineIfNotEmpty();
+          }
+        }
+        _builder_1.append("\t\t");
+        _builder_1.newLine();
+        _builder_1.append("\t\t");
+        _builder_1.append("\t");
+        _builder_1.append("// Stochastic exchange for ");
+        String _formattedName_1 = this.getFormattedName(s_1.getTransition());
+        _builder_1.append(_formattedName_1, "\t\t\t");
+        _builder_1.newLineIfNotEmpty();
+        _builder_1.append("\t\t");
+        _builder_1.append("\t");
+        String _importedName_2 = this.getImportedName("org.eclipse.stem.core.graph.Exchange");
+        _builder_1.append(_importedName_2, "\t\t\t");
+        _builder_1.append(" exchange_");
+        String _methodName_5 = this.getMethodName(s_1.getTransition());
+        _builder_1.append(_methodName_5, "\t\t\t");
+        _builder_1.append(" = (");
+        String _importedName_3 = this.getImportedName("org.eclipse.stem.core.graph.Exchange");
+        _builder_1.append(_importedName_3, "\t\t\t");
+        _builder_1.append(")");
+        String _importedName_4 = this.getImportedName("org.eclipse.stem.core.graph.ExchangePool");
+        _builder_1.append(_importedName_4, "\t\t\t");
+        _builder_1.append(".POOL.get();");
+        _builder_1.newLineIfNotEmpty();
+        _builder_1.append("\t\t");
+        _builder_1.append("\t");
+        _builder_1.append("deltaValue.getDepartures().add(exchange_");
+        String _methodName_6 = this.getMethodName(s_1.getTransition());
+        _builder_1.append(_methodName_6, "\t\t\t");
+        _builder_1.append(");");
+        _builder_1.newLineIfNotEmpty();
+        _builder_1.append("\t\t");
+        _builder_1.append("\t");
+        _builder_1.append("exchange_");
+        String _methodName_7 = this.getMethodName(s_1.getTransition());
+        _builder_1.append(_methodName_7, "\t\t\t");
+        _builder_1.append(".setType(");
+        String _importedName_5 = this.getImportedName("org.eclipse.stem.core.graph.ExchangeType");
+        _builder_1.append(_importedName_5, "\t\t\t");
+        _builder_1.append(".COMPARTMENT_TRANSITION);");
+        _builder_1.newLineIfNotEmpty();
+        _builder_1.append("\t\t");
+        _builder_1.append("\t");
+        _builder_1.append("exchange_");
+        String _methodName_8 = this.getMethodName(s_1.getTransition());
+        _builder_1.append(_methodName_8, "\t\t\t");
+        _builder_1.append(".setSource(");
+        String _packageAccessorName = this.getPackageAccessorName(this.getGenFeature(s_1.getTransition().getSource()));
+        _builder_1.append(_packageAccessorName, "\t\t\t");
+        _builder_1.append(");");
+        _builder_1.newLineIfNotEmpty();
+        _builder_1.append("\t\t");
+        _builder_1.append("\t");
+        _builder_1.append("exchange_");
+        String _methodName_9 = this.getMethodName(s_1.getTransition());
+        _builder_1.append(_methodName_9, "\t\t\t");
+        _builder_1.append(".setTarget(");
+        String _packageAccessorName_1 = this.getPackageAccessorName(this.getGenFeature(s_1.getTransition().getTarget()));
+        _builder_1.append(_packageAccessorName_1, "\t\t\t");
+        _builder_1.append(");");
+        _builder_1.newLineIfNotEmpty();
+        _builder_1.append("\t\t");
+        _builder_1.append("\t");
+        _builder_1.append("exchange_");
+        String _methodName_10 = this.getMethodName(s_1.getTransition());
+        _builder_1.append(_methodName_10, "\t\t\t");
+        _builder_1.append(".setCount(generated_");
+        String _methodName_11 = this.getMethodName(s_1.getTransition());
+        _builder_1.append(_methodName_11, "\t\t\t");
+        _builder_1.append(");");
+        _builder_1.newLineIfNotEmpty();
+        {
+          EList<Compartment> _forIncidence_1 = s_1.getTransition().getForIncidence();
+          for(final Compartment c_1 : _forIncidence_1) {
+            _builder_1.append("\t\t");
+            _builder_1.append("\t");
+            _builder_1.append("exchange_");
+            String _methodName_12 = this.getMethodName(s_1.getTransition());
+            _builder_1.append(_methodName_12, "\t\t\t");
+            _builder_1.append(".getForIncidence().add(");
+            String _packageAccessorName_2 = this.getPackageAccessorName(this.getGenFeature(c_1));
+            _builder_1.append(_packageAccessorName_2, "\t\t\t");
+            _builder_1.append(");");
+            _builder_1.newLineIfNotEmpty();
+          }
+        }
+      }
+    }
+    _builder_1.append("\t\t");
+    _builder_1.newLine();
+    {
+      Set<Compartment> _affectedCompartments_1 = this.getAffectedCompartments(r);
+      for(final Compartment s_2 : _affectedCompartments_1) {
+        _builder_1.append("\t\t");
+        _builder_1.append("deltaValue.set");
+        String _accessorName_4 = this.getAccessorName(s_2);
+        _builder_1.append(_accessorName_4, "\t\t");
+        _builder_1.append("(delta");
+        String _accessorName_5 = this.getAccessorName(s_2);
+        _builder_1.append(_accessorName_5, "\t\t");
+        _builder_1.append(");");
+        _builder_1.newLineIfNotEmpty();
+      }
+    }
+    _builder_1.append("\t");
+    _builder_1.append("}");
+    _builder_1.newLine();
+    _builder_1.append("\t\t\t");
+    _builder_1.newLine();
+    {
+      for(final XtextResource e : r) {
+        CharSequence _compile = this.compile(e);
+        _builder_1.append(_compile);
+        _builder_1.newLineIfNotEmpty();
+      }
+    }
+    _builder_1.append("} //");
+    String body = _builder_1.toString();
+    String imports = this.getSortedImports();
+    StringConcatenation _builder_2 = new StringConcatenation();
+    _builder_2.append(pkg);
+    _builder_2.newLineIfNotEmpty();
+    _builder_2.newLine();
+    _builder_2.append(imports);
+    _builder_2.newLineIfNotEmpty();
+    _builder_2.newLine();
+    _builder_2.append(body);
+    return ((CharSequence) _builder_2);
+  }
+  
+  protected CharSequence _compile(final Resource r) {
+    StringConcatenation _builder = new StringConcatenation();
+    Object _compile = this.compile(IterableExtensions.<TransitionBlock>head(Iterables.<TransitionBlock>filter(IteratorExtensions.<EObject>toIterable(r.getAllContents()), TransitionBlock.class)));
+    _builder.append(_compile);
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final TransitionBlock t) {
+    EObject _eContainer = t.eContainer();
+    CompartmentTransitionDefinitions ctd = ((CompartmentTransitionDefinitions) _eContainer);
+    Transition transition = ctd.getMetamodel().getTransition();
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("/**");
+    _builder.newLine();
+    _builder.append(" ");
+    _builder.append("* Computes delta for transition ");
+    String _name = transition.getSource().getName();
+    _builder.append(_name, " ");
+    _builder.append(" -> ");
+    String _name_1 = transition.getTarget().getName();
+    _builder.append(_name_1, " ");
+    _builder.newLineIfNotEmpty();
+    _builder.append(" ");
+    _builder.append("* @generated");
+    _builder.newLine();
+    _builder.append(" ");
+    _builder.append("*/");
+    _builder.newLine();
+    _builder.append("protected double ");
+    String _name_2 = transition.getSource().getName();
+    _builder.append(_name_2);
+    _builder.append("_");
+    String _name_3 = transition.getTarget().getName();
+    _builder.append(_name_3);
+    _builder.append(" (double t, long timeDelta, ");
+    String _importedName = this.getImportedName("org.eclipse.stem.core.model.STEMTime");
+    _builder.append(_importedName);
+    _builder.append(" time, ");
+    String _importGenClassInterface = this.importGenClassInterface(this.modelGenClass);
+    _builder.append(_importGenClassInterface);
+    _builder.append(" model, ");
+    String _importGenClassInterface_1 = this.importGenClassInterface(this.labelGenClass);
+    _builder.append(_importGenClassInterface_1);
+    _builder.append(" label, ");
+    String _importGenClassInterface_2 = this.importGenClassInterface(this.labelValueGenClass);
+    _builder.append(_importGenClassInterface_2);
+    _builder.append(" labelValue, ");
+    String _importedName_1 = this.getImportedName("org.eclipse.stem.core.graph.Node");
+    _builder.append(_importedName_1);
+    _builder.append(" node) {");
+    _builder.newLineIfNotEmpty();
+    {
+      EList<DefStatement> _statements = t.getBlock().getStatements();
+      for(final DefStatement s : _statements) {
+        Object _compile = this.compile(s);
+        _builder.append(_compile);
+      }
+    }
+    _builder.newLineIfNotEmpty();
+    _builder.append("return ");
+    Object _compile_1 = this.compile(t.getBlock().getRet());
+    _builder.append(_compile_1);
+    _builder.append(";");
+    _builder.newLineIfNotEmpty();
+    _builder.append("}");
+    _builder.newLine();
+    return ((CharSequence) _builder);
+  }
+  
+  protected CharSequence _compile(final DefStatement d) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("double ");
+    String _varname = d.getVarname();
+    _builder.append(_varname);
+    _builder.append("=");
+    Object _compile = this.compile(d.getExpr());
+    _builder.append(_compile);
+    _builder.append(";");
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final Evaluation e) {
+    StringConcatenation _builder = new StringConcatenation();
+    CharSequence _compile = this.compile(e.getExpression(), Double.TYPE);
+    _builder.append(_compile);
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final PrimaryExpression pe, final Class<?> expectedType) {
+    String neg = "";
+    boolean _isNegate = pe.isNegate();
+    if (_isNegate) {
+      neg = "-";
+    }
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("(");
+    _builder.append(neg);
+    Object _compile = this.compile(pe.getExp(), expectedType);
+    _builder.append(_compile);
+    _builder.append(")");
+    _builder.newLineIfNotEmpty();
+    return ((CharSequence) _builder);
+  }
+  
+  protected CharSequence _compile(final Plus p, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("(");
+    Object _compile = this.compile(p.getLeft(), Double.TYPE);
+    _builder.append(_compile);
+    _builder.append("+");
+    Object _compile_1 = this.compile(p.getRight(), Double.TYPE);
+    _builder.append(_compile_1);
+    _builder.append(")");
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final Minus m, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("(");
+    Object _compile = this.compile(m.getLeft(), Double.TYPE);
+    _builder.append(_compile);
+    _builder.append("-");
+    Object _compile_1 = this.compile(m.getRight(), Double.TYPE);
+    _builder.append(_compile_1);
+    _builder.append(")");
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final Multi m, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    Object _compile = this.compile(m.getLeft(), Double.TYPE);
+    _builder.append(_compile);
+    _builder.append("*");
+    Object _compile_1 = this.compile(m.getRight(), Double.TYPE);
+    _builder.append(_compile_1);
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final Div d, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    Object _compile = this.compile(d.getLeft(), Double.TYPE);
+    _builder.append(_compile);
+    _builder.append("/");
+    Object _compile_1 = this.compile(d.getRight(), Double.TYPE);
+    _builder.append(_compile_1);
+    return _builder;
+  }
+  
+  protected CharSequence _compileReference(final GlobalVariableReference rf, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    String _name = rf.getName();
+    _builder.append(_name);
+    return _builder;
+  }
+  
+  protected CharSequence _compileReference(final LocalVariableReference rf, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    String _name = rf.getName();
+    _builder.append(_name);
+    return _builder;
+  }
+  
+  protected CharSequence _compileReference(final AbsoluteCompartmentValueReference rf, final Class<?> expectedType) {
+    ITypeSerializer serializer = TypeSerializerFactory.getSerializer(rf, expectedType, this.labelValueGenClass);
+    if ((serializer != null)) {
+      return serializer.serialize();
+    }
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("labelValue.get");
+    String _firstUpper = StringExtensions.toFirstUpper(rf.getObj().getName());
+    _builder.append(_firstUpper);
+    _builder.append("()");
+    return ((CharSequence) _builder);
+  }
+  
+  protected CharSequence _compileReference(final RelativeCompartmentValueReference rf, final Class<?> expectedType) {
+    ITypeSerializer serializer = TypeSerializerFactory.getSerializer(rf, expectedType, this.labelValueGenClass);
+    if ((serializer != null)) {
+      return serializer.serialize();
+    }
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("(labelValue.getPopulationCount() > 0)? (labelValue.get");
+    String _firstUpper = StringExtensions.toFirstUpper(rf.getObj().getName());
+    _builder.append(_firstUpper);
+    _builder.append("()/labelValue.getPopulationCount()):0");
+    return ((CharSequence) _builder);
+  }
+  
+  protected CharSequence _compileReference(final ModelParamReference rf, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("model.get");
+    String _firstUpper = StringExtensions.toFirstUpper(rf.getObj().getName());
+    _builder.append(_firstUpper);
+    _builder.append("()");
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final VariableReference rf, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    CharSequence _compileReference = this.compileReference(rf.getRef(), expectedType);
+    _builder.append(_compileReference);
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final NumberLiteral nl, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    double _value = nl.getValue();
+    _builder.append(_value);
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final StringLiteral sl, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("\"");
+    String _value = sl.getValue();
+    _builder.append(_value);
+    _builder.append("\"");
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final BooleanLiteral bl, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    boolean _isValue = bl.isValue();
+    _builder.append(_isValue);
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final Expression exp, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    Object _compile = this.compile(exp.getExp(), expectedType);
+    _builder.append(_compile);
+    return _builder;
+  }
+  
+  protected CharSequence _compileArgument(final SystemArgumentReference arg, final FunctionCall fc) {
+    StringConcatenation _builder = new StringConcatenation();
+    String _mapsFrom = arg.getMapsFrom();
+    _builder.append(_mapsFrom);
+    return _builder;
+  }
+  
+  protected CharSequence _compileArgument(final FunctionArgumentReference arg, final FunctionCall fc) {
+    StringConcatenation _builder = new StringConcatenation();
+    Object _compile = this.compile(fc.getArgs().get(arg.getArgIndex()), arg.getJavaType());
+    _builder.append(_compile);
+    return _builder;
+  }
+  
+  protected CharSequence _compileFunction(final ExternalFunctionReference fcr, final FunctionCall fc) {
+    StringConcatenation _builder = new StringConcatenation();
+    String _importedName = this.getImportedName(fcr.getFunc().getClassName());
+    _builder.append(_importedName);
+    _builder.append(".");
+    String _methodName = fcr.getFunc().getMethodName();
+    _builder.append(_methodName);
+    _builder.append("(");
+    _builder.newLineIfNotEmpty();
+    {
+      EList<JavaMethodArgument> _javaMethodArguments = fcr.getFunc().getJavaMethodArguments();
+      for(final JavaMethodArgument arg : _javaMethodArguments) {
+        _builder.append("\t\t");
+        {
+          JavaMethodArgument _head = IterableExtensions.<JavaMethodArgument>head(fcr.getFunc().getJavaMethodArguments());
+          boolean _notEquals = (!Objects.equal(arg, _head));
+          if (_notEquals) {
+            _builder.append(",");
+          }
+        }
+        _builder.newLineIfNotEmpty();
+        _builder.append("\t\t");
+        CharSequence _compileArgument = this.compileArgument(arg, fc);
+        _builder.append(_compileArgument, "\t\t");
+        _builder.newLineIfNotEmpty();
+        _builder.append("\t\t");
+      }
+    }
+    _builder.append(")");
+    return _builder;
+  }
+  
+  protected CharSequence _compileFunction(final FunctionReference fcr, final FunctionCall fc) {
+    StringConcatenation _builder = new StringConcatenation();
+    String _name = fcr.getName();
+    _builder.append(_name);
+    _builder.append("(");
+    {
+      EList<Expression> _args = fc.getArgs();
+      for(final Expression e : _args) {
+        _builder.append(" ");
+        _builder.newLineIfNotEmpty();
+        {
+          Expression _head = IterableExtensions.<Expression>head(fc.getArgs());
+          boolean _equals = Objects.equal(e, _head);
+          if (_equals) {
+            Object _compile = this.compile(e);
+            _builder.append(_compile);
+            _builder.newLineIfNotEmpty();
+          } else {
+            _builder.append(",");
+            Object _compile_1 = this.compile(e);
+            _builder.append(_compile_1);
+            _builder.newLineIfNotEmpty();
+          }
+        }
+        _builder.append("\t\t\t");
+      }
+    }
+    _builder.append(")");
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final FunctionCall fc, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    CharSequence _compileFunction = this.compileFunction(fc.getRef(), fc);
+    _builder.append(_compileFunction);
+    return _builder;
+  }
+  
+  public CharSequence compile(final Notifier e) {
+    if (e instanceof Evaluation) {
+      return _compile((Evaluation)e);
+    } else if (e instanceof DefStatement) {
+      return _compile((DefStatement)e);
+    } else if (e instanceof TransitionBlock) {
+      return _compile((TransitionBlock)e);
+    } else if (e instanceof Resource) {
+      return _compile((Resource)e);
+    } else {
+      throw new IllegalArgumentException("Unhandled parameter types: " +
+        Arrays.<Object>asList(e).toString());
+    }
+  }
+  
+  public CharSequence compile(final Expression bl, final Class<?> expectedType) {
+    if (bl instanceof BooleanLiteral) {
+      return _compile((BooleanLiteral)bl, expectedType);
+    } else if (bl instanceof Div) {
+      return _compile((Div)bl, expectedType);
+    } else if (bl instanceof FunctionCall) {
+      return _compile((FunctionCall)bl, expectedType);
+    } else if (bl instanceof Minus) {
+      return _compile((Minus)bl, expectedType);
+    } else if (bl instanceof Multi) {
+      return _compile((Multi)bl, expectedType);
+    } else if (bl instanceof NumberLiteral) {
+      return _compile((NumberLiteral)bl, expectedType);
+    } else if (bl instanceof Plus) {
+      return _compile((Plus)bl, expectedType);
+    } else if (bl instanceof PrimaryExpression) {
+      return _compile((PrimaryExpression)bl, expectedType);
+    } else if (bl instanceof StringLiteral) {
+      return _compile((StringLiteral)bl, expectedType);
+    } else if (bl instanceof VariableReference) {
+      return _compile((VariableReference)bl, expectedType);
+    } else if (bl != null) {
+      return _compile(bl, expectedType);
+    } else {
+      throw new IllegalArgumentException("Unhandled parameter types: " +
+        Arrays.<Object>asList(bl, expectedType).toString());
+    }
+  }
+  
+  public CharSequence compileReference(final ScopedVariableReference rf, final Class<?> expectedType) {
+    if (rf instanceof AbsoluteCompartmentValueReference) {
+      return _compileReference((AbsoluteCompartmentValueReference)rf, expectedType);
+    } else if (rf instanceof RelativeCompartmentValueReference) {
+      return _compileReference((RelativeCompartmentValueReference)rf, expectedType);
+    } else if (rf instanceof GlobalVariableReference) {
+      return _compileReference((GlobalVariableReference)rf, expectedType);
+    } else if (rf instanceof LocalVariableReference) {
+      return _compileReference((LocalVariableReference)rf, expectedType);
+    } else if (rf instanceof ModelParamReference) {
+      return _compileReference((ModelParamReference)rf, expectedType);
+    } else {
+      throw new IllegalArgumentException("Unhandled parameter types: " +
+        Arrays.<Object>asList(rf, expectedType).toString());
+    }
+  }
+  
+  public CharSequence compileArgument(final JavaMethodArgument arg, final FunctionCall fc) {
+    if (arg instanceof FunctionArgumentReference) {
+      return _compileArgument((FunctionArgumentReference)arg, fc);
+    } else if (arg instanceof SystemArgumentReference) {
+      return _compileArgument((SystemArgumentReference)arg, fc);
+    } else {
+      throw new IllegalArgumentException("Unhandled parameter types: " +
+        Arrays.<Object>asList(arg, fc).toString());
+    }
+  }
+  
+  public CharSequence compileFunction(final FunctionReference fcr, final FunctionCall fc) {
+    if (fcr instanceof ExternalFunctionReference) {
+      return _compileFunction((ExternalFunctionReference)fcr, fc);
+    } else if (fcr != null) {
+      return _compileFunction(fcr, fc);
+    } else {
+      throw new IllegalArgumentException("Unhandled parameter types: " +
+        Arrays.<Object>asList(fcr, fc).toString());
+    }
+  }
+}

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/.classpath b/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/.classpath
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/.gitignore b/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/.gitignore
new file mode 100644
index 0000000..ae3c172
--- /dev/null
+++ b/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/.gitignore

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

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/.project b/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/.project
old mode 100644
new mode 100755
index 3e3faf7..c701d8d
--- a/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/.project
+++ b/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/.project

@@ -1,16 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*******************************************************************************
- * Copyright (c) 2013 IBM Corporation 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
- -->
 <projectDescription>
 	<name>org.eclipse.stem.model.common</name>
 	<comment></comment>

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/.settings/org.eclipse.core.resources.prefs b/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/.settings/org.eclipse.core.resources.prefs
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/.settings/org.eclipse.jdt.core.prefs
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/META-INF/MANIFEST.MF b/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/META-INF/MANIFEST.MF
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/build.properties b/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/build.properties
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/plugin.xml b/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/plugin.xml
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/src/org/eclipse/stem/model/common/Activator.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/src/org/eclipse/stem/model/common/Activator.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/src/org/eclipse/stem/model/common/MetamodelUtils.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/src/org/eclipse/stem/model/common/MetamodelUtils.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/src/org/eclipse/stem/model/common/ModelProjectBundleLoadHandler.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/src/org/eclipse/stem/model/common/ModelProjectBundleLoadHandler.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/src/org/eclipse/stem/model/common/ModelProjectNature.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/src/org/eclipse/stem/model/common/ModelProjectNature.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/src/org/eclipse/stem/model/common/ModelProjectUtils.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/src/org/eclipse/stem/model/common/ModelProjectUtils.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/src/org/eclipse/stem/model/common/Starter.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.common/src/org/eclipse/stem/model/common/Starter.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/.classpath b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/.classpath
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/.gitignore b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/.gitignore
new file mode 100644
index 0000000..ae3c172
--- /dev/null
+++ b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/.gitignore

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

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/.project b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/.project
old mode 100644
new mode 100755
index dfa589e..41bd23e
--- a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/.project
+++ b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/.project

@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*******************************************************************************
- * Copyright (c) 2013 IBM Corporation 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
- -->
- <projectDescription>
+<projectDescription>
 	<name>org.eclipse.stem.model.ctdl.functions</name>
 	<comment></comment>
 	<projects>

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/.settings/org.eclipse.core.resources.prefs b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/.settings/org.eclipse.core.resources.prefs
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/.settings/org.eclipse.jdt.core.prefs
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/META-INF/MANIFEST.MF b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/META-INF/MANIFEST.MF
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/build.properties b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/build.properties
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/model/ExternalFunctions.ecore b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/model/ExternalFunctions.ecore
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/model/ExternalFunctions.genmodel b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/model/ExternalFunctions.genmodel
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/plugin.properties b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/plugin.properties
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/plugin.xml b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/plugin.xml
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/schema/functions.exsd b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/schema/functions.exsd
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/Activator.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/Activator.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/ExternalFunctionDefinition.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/ExternalFunctionDefinition.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/ExternalFunctionsFactory.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/ExternalFunctionsFactory.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/ExternalFunctionsPackage.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/ExternalFunctionsPackage.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/FunctionArgument.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/FunctionArgument.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/FunctionArgumentReference.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/FunctionArgumentReference.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/FunctionDefinitionException.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/FunctionDefinitionException.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/FunctionDefinitionLoader.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/FunctionDefinitionLoader.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/JavaMethodArgument.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/JavaMethodArgument.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/STEMDSLUtils.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/STEMDSLUtils.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/SystemArgumentReference.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/SystemArgumentReference.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/TestFunctions.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/TestFunctions.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/impl/ExternalFunctionDefinitionImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/impl/ExternalFunctionDefinitionImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/impl/ExternalFunctionsFactoryImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/impl/ExternalFunctionsFactoryImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/impl/ExternalFunctionsPackageImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/impl/ExternalFunctionsPackageImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/impl/FunctionArgumentImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/impl/FunctionArgumentImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/impl/FunctionArgumentReferenceImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/impl/FunctionArgumentReferenceImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/impl/JavaMethodArgumentImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/impl/JavaMethodArgumentImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/impl/SystemArgumentReferenceImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/impl/SystemArgumentReferenceImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/util/ExternalFunctionsAdapterFactory.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/util/ExternalFunctionsAdapterFactory.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/util/ExternalFunctionsSwitch.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/util/ExternalFunctionsSwitch.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/.classpath b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/.classpath
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/.gitignore b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/.gitignore
new file mode 100644
index 0000000..ae3c172
--- /dev/null
+++ b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/.gitignore

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

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/.project b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/.project
old mode 100644
new mode 100755
index 02711c6..7361e87
--- a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/.project
+++ b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/.project

@@ -1,16 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*******************************************************************************
- * Copyright (c) 2013 IBM Corporation 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-  -->
 <projectDescription>
 	<name>org.eclipse.stem.model.ctdl.ui</name>
 	<comment></comment>

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/.settings/org.eclipse.core.resources.prefs b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/.settings/org.eclipse.core.resources.prefs
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/.settings/org.eclipse.jdt.core.prefs
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/META-INF/MANIFEST.MF b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/META-INF/MANIFEST.MF
old mode 100644
new mode 100755
index efd79f0..e1c27db
--- a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/META-INF/MANIFEST.MF

@@ -18,7 +18,7 @@
  org.eclipse.compare,

  org.eclipse.stem.model

 Import-Package: org.apache.log4j

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8,J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.8

 Export-Package: org.eclipse.stem.model.ctdl.ui.contentassist,

  org.eclipse.stem.model.ctdl.ui.contentassist.antlr,

  org.eclipse.stem.model.ctdl.ui.embed,


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/build.properties b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/build.properties
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/plugin.xml b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/plugin.xml
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/plugin.xml_gen b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/plugin.xml_gen
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src-gen/org/eclipse/stem/model/ctdl/ui/AbstractCTDLUiModule.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src-gen/org/eclipse/stem/model/ctdl/ui/AbstractCTDLUiModule.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src-gen/org/eclipse/stem/model/ctdl/ui/CTDLExecutableExtensionFactory.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src-gen/org/eclipse/stem/model/ctdl/ui/CTDLExecutableExtensionFactory.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src-gen/org/eclipse/stem/model/ctdl/ui/contentassist/AbstractCTDLProposalProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src-gen/org/eclipse/stem/model/ctdl/ui/contentassist/AbstractCTDLProposalProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src-gen/org/eclipse/stem/model/ctdl/ui/contentassist/antlr/CTDLParser.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src-gen/org/eclipse/stem/model/ctdl/ui/contentassist/antlr/CTDLParser.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src-gen/org/eclipse/stem/model/ctdl/ui/contentassist/antlr/PartialCTDLContentAssistParser.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src-gen/org/eclipse/stem/model/ctdl/ui/contentassist/antlr/PartialCTDLContentAssistParser.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src-gen/org/eclipse/stem/model/ctdl/ui/contentassist/antlr/internal/InternalCTDL.g b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src-gen/org/eclipse/stem/model/ctdl/ui/contentassist/antlr/internal/InternalCTDL.g
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src-gen/org/eclipse/stem/model/ctdl/ui/contentassist/antlr/internal/InternalCTDL.tokens b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src-gen/org/eclipse/stem/model/ctdl/ui/contentassist/antlr/internal/InternalCTDL.tokens
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src-gen/org/eclipse/stem/model/ctdl/ui/contentassist/antlr/internal/InternalCTDLLexer.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src-gen/org/eclipse/stem/model/ctdl/ui/contentassist/antlr/internal/InternalCTDLLexer.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src-gen/org/eclipse/stem/model/ctdl/ui/contentassist/antlr/internal/InternalCTDLParser.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src-gen/org/eclipse/stem/model/ctdl/ui/contentassist/antlr/internal/InternalCTDLParser.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src-gen/org/eclipse/stem/model/ctdl/ui/internal/CTDLActivator.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src-gen/org/eclipse/stem/model/ctdl/ui/internal/CTDLActivator.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/CTDLUiModule.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/CTDLUiModule.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/contentassist/CTDLProposalProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/contentassist/CTDLProposalProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/embed/EmbeddedEditorDialog.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/embed/EmbeddedEditorDialog.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/embed/EmbeddedEditorView.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/embed/EmbeddedEditorView.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/embed/EmbeddedExpressionEditorComposite.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/embed/EmbeddedExpressionEditorComposite.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/highlight/CTDLHighlightConfiguration.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/highlight/CTDLHighlightConfiguration.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/highlight/CTDLSemanticHighlighter.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/highlight/CTDLSemanticHighlighter.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/hover/CTDLHoverProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/hover/CTDLHoverProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/labeling/CTDLDescriptionLabelProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/labeling/CTDLDescriptionLabelProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/labeling/CTDLLabelProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/labeling/CTDLLabelProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/outline/CTDLOutlineTreeProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/outline/CTDLOutlineTreeProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/quickfix/CTDLQuickfixProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl.ui/src/org/eclipse/stem/model/ctdl/ui/quickfix/CTDLQuickfixProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl/.settings/com.genuitec.eclipse.modernweb.common.core.prefs b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl/.settings/com.genuitec.eclipse.modernweb.common.core.prefs
deleted file mode 100644
index f990aeb..0000000
--- a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl/.settings/com.genuitec.eclipse.modernweb.common.core.prefs
+++ /dev/null

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-prefer-global-node-apps=false

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl/xtend-gen/org/eclipse/stem/model/ctdl/generator/.CTDLGenerator.xtendbin b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl/xtend-gen/org/eclipse/stem/model/ctdl/generator/.CTDLGenerator.xtendbin
new file mode 100644
index 0000000..2e8457d
--- /dev/null
+++ b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl/xtend-gen/org/eclipse/stem/model/ctdl/generator/.CTDLGenerator.xtendbin
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl/xtend-gen/org/eclipse/stem/model/ctdl/generator/.CTDLGenerator2.xtendbin b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl/xtend-gen/org/eclipse/stem/model/ctdl/generator/.CTDLGenerator2.xtendbin
new file mode 100644
index 0000000..533d851
--- /dev/null
+++ b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl/xtend-gen/org/eclipse/stem/model/ctdl/generator/.CTDLGenerator2.xtendbin
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl/xtend-gen/org/eclipse/stem/model/ctdl/generator/.gitignore b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl/xtend-gen/org/eclipse/stem/model/ctdl/generator/.gitignore
deleted file mode 100644
index d4515cd..0000000
--- a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl/xtend-gen/org/eclipse/stem/model/ctdl/generator/.gitignore
+++ /dev/null

@@ -1,4 +0,0 @@
-/.CTDLGenerator.xtendbin
-/.CTDLGenerator2.xtendbin
-/CTDLGenerator.java
-/CTDLGenerator2.java

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl/xtend-gen/org/eclipse/stem/model/ctdl/generator/CTDLGenerator.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl/xtend-gen/org/eclipse/stem/model/ctdl/generator/CTDLGenerator.java
new file mode 100755
index 0000000..8a0cfcc
--- /dev/null
+++ b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl/xtend-gen/org/eclipse/stem/model/ctdl/generator/CTDLGenerator.java

@@ -0,0 +1,507 @@
+/**
+ * Copyright (c) 2013 IBM Corporation 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:
+ *     IBM Corporation - initial API and implementation
+ */
+package org.eclipse.stem.model.ctdl.generator;
+
+import com.google.common.base.Objects;
+import com.google.common.collect.Iterables;
+import java.util.Arrays;
+import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.stem.model.ctdl.ctdl.AbsoluteCompartmentValueReference;
+import org.eclipse.stem.model.ctdl.ctdl.BooleanLiteral;
+import org.eclipse.stem.model.ctdl.ctdl.CompartmentTransitionDefinitions;
+import org.eclipse.stem.model.ctdl.ctdl.DefStatement;
+import org.eclipse.stem.model.ctdl.ctdl.Div;
+import org.eclipse.stem.model.ctdl.ctdl.Evaluation;
+import org.eclipse.stem.model.ctdl.ctdl.Expression;
+import org.eclipse.stem.model.ctdl.ctdl.ExternalFunctionReference;
+import org.eclipse.stem.model.ctdl.ctdl.FunctionCall;
+import org.eclipse.stem.model.ctdl.ctdl.FunctionReference;
+import org.eclipse.stem.model.ctdl.ctdl.GlobalVariableReference;
+import org.eclipse.stem.model.ctdl.ctdl.LocalVariableReference;
+import org.eclipse.stem.model.ctdl.ctdl.MetamodelResource;
+import org.eclipse.stem.model.ctdl.ctdl.Minus;
+import org.eclipse.stem.model.ctdl.ctdl.ModelParamReference;
+import org.eclipse.stem.model.ctdl.ctdl.Multi;
+import org.eclipse.stem.model.ctdl.ctdl.NumberLiteral;
+import org.eclipse.stem.model.ctdl.ctdl.Plus;
+import org.eclipse.stem.model.ctdl.ctdl.PrimaryExpression;
+import org.eclipse.stem.model.ctdl.ctdl.RelativeCompartmentValueReference;
+import org.eclipse.stem.model.ctdl.ctdl.ScopedVariableReference;
+import org.eclipse.stem.model.ctdl.ctdl.StringLiteral;
+import org.eclipse.stem.model.ctdl.ctdl.TransitionBlock;
+import org.eclipse.stem.model.ctdl.ctdl.VariableReference;
+import org.eclipse.stem.model.ctdl.functions.FunctionArgumentReference;
+import org.eclipse.stem.model.ctdl.functions.JavaMethodArgument;
+import org.eclipse.stem.model.ctdl.functions.SystemArgumentReference;
+import org.eclipse.stem.model.ctdl.serializer.ITypeSerializer;
+import org.eclipse.stem.model.ctdl.serializer.TypeSerializerFactory;
+import org.eclipse.stem.model.metamodel.Transition;
+import org.eclipse.xtend.lib.Property;
+import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.generator.IFileSystemAccess;
+import org.eclipse.xtext.generator.IGenerator;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+import org.eclipse.xtext.xbase.lib.IteratorExtensions;
+import org.eclipse.xtext.xbase.lib.Pure;
+import org.eclipse.xtext.xbase.lib.StringExtensions;
+
+@SuppressWarnings("all")
+public class CTDLGenerator implements IGenerator {
+  @Property
+  private GenClass _modelGenClass;
+  
+  @Property
+  private GenClass _labelValueGenClass;
+  
+  public String addImport(final String fqn) {
+    GenClass _modelGenClass = this.getModelGenClass();
+    boolean _tripleNotEquals = (_modelGenClass != null);
+    if (_tripleNotEquals) {
+      return this.getModelGenClass().getGenModel().getImportedName(fqn);
+    } else {
+      return fqn;
+    }
+  }
+  
+  @Override
+  public void doGenerate(final Resource resource, final IFileSystemAccess fsa) {
+    CompartmentTransitionDefinitions ctd = IterableExtensions.<CompartmentTransitionDefinitions>head(Iterables.<CompartmentTransitionDefinitions>filter(IteratorExtensions.<EObject>toIterable(resource.getAllContents()), CompartmentTransitionDefinitions.class));
+    MetamodelResource mm = ctd.getMetamodel();
+    Transition trans = mm.getTransition();
+    String _name = trans.getSource().getName();
+    String _plus = (_name + "_");
+    String _name_1 = trans.getTarget().getName();
+    String fname = (_plus + _name_1);
+    fsa.generateFile(fname, this.compile(resource));
+  }
+  
+  protected CharSequence _compile(final Resource r) {
+    StringConcatenation _builder = new StringConcatenation();
+    Object _compile = this.compile(IterableExtensions.<TransitionBlock>head(Iterables.<TransitionBlock>filter(IteratorExtensions.<EObject>toIterable(r.getAllContents()), TransitionBlock.class)));
+    _builder.append(_compile);
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final TransitionBlock t) {
+    EObject _eContainer = t.eContainer();
+    CompartmentTransitionDefinitions ctd = ((CompartmentTransitionDefinitions) _eContainer);
+    String modelClass = ctd.getMetamodel().getModel().getClass_().getInstanceTypeName();
+    if ((modelClass == null)) {
+      modelClass = ctd.getMetamodel().getModel().getClass_().getName();
+    }
+    String labelClass = ctd.getMetamodel().getModel().getCompartments().getClass_().getInstanceTypeName();
+    if ((labelClass == null)) {
+      labelClass = ctd.getMetamodel().getModel().getCompartments().getClass_().getName();
+    } else {
+      labelClass = this.addImport(labelClass);
+    }
+    String labelValueClass = ctd.getMetamodel().getModel().getCompartments().getValueClass().getInstanceTypeName();
+    if ((labelValueClass == null)) {
+      labelValueClass = ctd.getMetamodel().getModel().getCompartments().getValueClass().getName();
+    } else {
+      labelValueClass = this.addImport(labelValueClass);
+    }
+    Transition transition = ctd.getMetamodel().getTransition();
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("protected double ");
+    String _name = transition.getSource().getName();
+    String _plus = (_name + "_");
+    String _name_1 = transition.getTarget().getName();
+    String _plus_1 = (_plus + _name_1);
+    _builder.append(_plus_1);
+    _builder.append(" (");
+    _builder.newLineIfNotEmpty();
+    _builder.append("double t, ");
+    _builder.newLine();
+    _builder.append("long timeDelta, ");
+    _builder.newLine();
+    String _addImport = this.addImport("org.eclipse.stem.core.model.STEMTime");
+    _builder.append(_addImport);
+    _builder.append(" time,");
+    _builder.newLineIfNotEmpty();
+    _builder.append(modelClass);
+    _builder.append(" model,");
+    _builder.newLineIfNotEmpty();
+    _builder.append(labelClass);
+    _builder.append(" label,");
+    _builder.newLineIfNotEmpty();
+    _builder.append(labelValueClass);
+    _builder.append(" labelValue,");
+    _builder.newLineIfNotEmpty();
+    String _addImport_1 = this.addImport("org.eclipse.stem.core.graph.Node");
+    _builder.append(_addImport_1);
+    _builder.append(" node) {");
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t");
+    {
+      EList<DefStatement> _statements = t.getBlock().getStatements();
+      for(final DefStatement s : _statements) {
+        Object _compile = this.compile(s);
+        _builder.append(_compile, "\t");
+      }
+    }
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t");
+    _builder.append("return ");
+    Object _compile_1 = this.compile(t.getBlock().getRet());
+    _builder.append(_compile_1, "\t");
+    _builder.append(";");
+    _builder.newLineIfNotEmpty();
+    _builder.append("}");
+    _builder.newLine();
+    return ((CharSequence) _builder);
+  }
+  
+  protected CharSequence _compile(final DefStatement d) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("double ");
+    String _varname = d.getVarname();
+    _builder.append(_varname);
+    _builder.append("=");
+    Object _compile = this.compile(d.getExpr());
+    _builder.append(_compile);
+    _builder.append(";");
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final Evaluation e) {
+    StringConcatenation _builder = new StringConcatenation();
+    CharSequence _compile = this.compile(e.getExpression(), Double.TYPE);
+    _builder.append(_compile);
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final PrimaryExpression pe, final Class<?> expectedType) {
+    String neg = "";
+    boolean _isNegate = pe.isNegate();
+    if (_isNegate) {
+      neg = "-";
+    }
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("(");
+    _builder.append(neg);
+    Object _compile = this.compile(pe.getExp(), expectedType);
+    _builder.append(_compile);
+    _builder.append(")");
+    _builder.newLineIfNotEmpty();
+    return ((CharSequence) _builder);
+  }
+  
+  protected CharSequence _compile(final Plus p, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("(");
+    Object _compile = this.compile(p.getLeft(), Double.TYPE);
+    _builder.append(_compile);
+    _builder.append("+");
+    Object _compile_1 = this.compile(p.getRight(), Double.TYPE);
+    _builder.append(_compile_1);
+    _builder.append(")");
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final Minus m, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("(");
+    Object _compile = this.compile(m.getLeft(), Double.TYPE);
+    _builder.append(_compile);
+    _builder.append("-");
+    Object _compile_1 = this.compile(m.getRight(), Double.TYPE);
+    _builder.append(_compile_1);
+    _builder.append(")");
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final Multi m, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    Object _compile = this.compile(m.getLeft(), Double.TYPE);
+    _builder.append(_compile);
+    _builder.append("*");
+    Object _compile_1 = this.compile(m.getRight(), Double.TYPE);
+    _builder.append(_compile_1);
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final Div d, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    Object _compile = this.compile(d.getLeft(), Double.TYPE);
+    _builder.append(_compile);
+    _builder.append("/");
+    Object _compile_1 = this.compile(d.getRight(), Double.TYPE);
+    _builder.append(_compile_1);
+    return _builder;
+  }
+  
+  protected CharSequence _compileReference(final GlobalVariableReference rf, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    String _name = rf.getName();
+    _builder.append(_name);
+    return _builder;
+  }
+  
+  protected CharSequence _compileReference(final LocalVariableReference rf, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    String _name = rf.getName();
+    _builder.append(_name);
+    return _builder;
+  }
+  
+  protected CharSequence _compileReference(final AbsoluteCompartmentValueReference rf, final Class<?> expectedType) {
+    ITypeSerializer serializer = TypeSerializerFactory.getSerializer(rf, expectedType, this.getLabelValueGenClass());
+    if ((serializer != null)) {
+      return serializer.serialize();
+    }
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("labelValue.get");
+    String _firstUpper = StringExtensions.toFirstUpper(rf.getObj().getName());
+    _builder.append(_firstUpper);
+    _builder.append("()");
+    return ((CharSequence) _builder);
+  }
+  
+  protected CharSequence _compileReference(final RelativeCompartmentValueReference rf, final Class<?> expectedType) {
+    ITypeSerializer serializer = TypeSerializerFactory.getSerializer(rf, expectedType, this.getLabelValueGenClass());
+    if ((serializer != null)) {
+      return serializer.serialize();
+    }
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("labelValue.get");
+    String _firstUpper = StringExtensions.toFirstUpper(rf.getObj().getName());
+    _builder.append(_firstUpper);
+    _builder.append("()/labelValue.getPopulationCount()");
+    return ((CharSequence) _builder);
+  }
+  
+  protected CharSequence _compileReference(final ModelParamReference rf, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("get");
+    String _firstUpper = StringExtensions.toFirstUpper(rf.getObj().getName());
+    _builder.append(_firstUpper);
+    _builder.append("()");
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final VariableReference rf, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    CharSequence _compileReference = this.compileReference(rf.getRef(), expectedType);
+    _builder.append(_compileReference);
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final NumberLiteral nl, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    double _value = nl.getValue();
+    _builder.append(_value);
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final StringLiteral sl, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("\"");
+    String _value = sl.getValue();
+    _builder.append(_value);
+    _builder.append("\"");
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final BooleanLiteral bl, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    boolean _isValue = bl.isValue();
+    _builder.append(_isValue);
+    return _builder;
+  }
+  
+  protected CharSequence _compileArgument(final SystemArgumentReference arg, final FunctionCall fc) {
+    StringConcatenation _builder = new StringConcatenation();
+    String _mapsFrom = arg.getMapsFrom();
+    _builder.append(_mapsFrom);
+    return _builder;
+  }
+  
+  protected CharSequence _compileArgument(final FunctionArgumentReference arg, final FunctionCall fc) {
+    StringConcatenation _builder = new StringConcatenation();
+    Object _compile = this.compile(fc.getArgs().get(arg.getArgIndex()), arg.getJavaType());
+    _builder.append(_compile);
+    return _builder;
+  }
+  
+  protected CharSequence _compileFunction(final ExternalFunctionReference fcr, final FunctionCall fc) {
+    StringConcatenation _builder = new StringConcatenation();
+    String _addImport = this.addImport(fcr.getFunc().getClassName());
+    _builder.append(_addImport);
+    _builder.append(".");
+    String _methodName = fcr.getFunc().getMethodName();
+    _builder.append(_methodName);
+    _builder.append("(");
+    _builder.newLineIfNotEmpty();
+    {
+      EList<JavaMethodArgument> _javaMethodArguments = fcr.getFunc().getJavaMethodArguments();
+      for(final JavaMethodArgument arg : _javaMethodArguments) {
+        _builder.append("\t\t");
+        {
+          JavaMethodArgument _head = IterableExtensions.<JavaMethodArgument>head(fcr.getFunc().getJavaMethodArguments());
+          boolean _notEquals = (!Objects.equal(arg, _head));
+          if (_notEquals) {
+            _builder.append(",");
+          }
+        }
+        _builder.newLineIfNotEmpty();
+        _builder.append("\t\t");
+        CharSequence _compileArgument = this.compileArgument(arg, fc);
+        _builder.append(_compileArgument, "\t\t");
+        _builder.newLineIfNotEmpty();
+        _builder.append("\t\t");
+      }
+    }
+    _builder.append(")");
+    return _builder;
+  }
+  
+  protected CharSequence _compileFunction(final FunctionReference fcr, final FunctionCall fc) {
+    StringConcatenation _builder = new StringConcatenation();
+    String _name = fcr.getName();
+    _builder.append(_name);
+    _builder.append("(");
+    {
+      EList<Expression> _args = fc.getArgs();
+      for(final Expression e : _args) {
+        _builder.append(" ");
+        _builder.newLineIfNotEmpty();
+        {
+          Expression _head = IterableExtensions.<Expression>head(fc.getArgs());
+          boolean _equals = Objects.equal(e, _head);
+          if (_equals) {
+            Object _compile = this.compile(e);
+            _builder.append(_compile);
+            _builder.newLineIfNotEmpty();
+          } else {
+            _builder.append(",");
+            Object _compile_1 = this.compile(e);
+            _builder.append(_compile_1);
+            _builder.newLineIfNotEmpty();
+          }
+        }
+        _builder.append("\t\t\t");
+      }
+    }
+    _builder.append(")");
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final FunctionCall fc, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    CharSequence _compileFunction = this.compileFunction(fc.getRef(), fc);
+    _builder.append(_compileFunction);
+    return _builder;
+  }
+  
+  public CharSequence compile(final Notifier e) {
+    if (e instanceof Evaluation) {
+      return _compile((Evaluation)e);
+    } else if (e instanceof DefStatement) {
+      return _compile((DefStatement)e);
+    } else if (e instanceof TransitionBlock) {
+      return _compile((TransitionBlock)e);
+    } else if (e instanceof Resource) {
+      return _compile((Resource)e);
+    } else {
+      throw new IllegalArgumentException("Unhandled parameter types: " +
+        Arrays.<Object>asList(e).toString());
+    }
+  }
+  
+  public CharSequence compile(final Expression bl, final Class<?> expectedType) {
+    if (bl instanceof BooleanLiteral) {
+      return _compile((BooleanLiteral)bl, expectedType);
+    } else if (bl instanceof Div) {
+      return _compile((Div)bl, expectedType);
+    } else if (bl instanceof FunctionCall) {
+      return _compile((FunctionCall)bl, expectedType);
+    } else if (bl instanceof Minus) {
+      return _compile((Minus)bl, expectedType);
+    } else if (bl instanceof Multi) {
+      return _compile((Multi)bl, expectedType);
+    } else if (bl instanceof NumberLiteral) {
+      return _compile((NumberLiteral)bl, expectedType);
+    } else if (bl instanceof Plus) {
+      return _compile((Plus)bl, expectedType);
+    } else if (bl instanceof PrimaryExpression) {
+      return _compile((PrimaryExpression)bl, expectedType);
+    } else if (bl instanceof StringLiteral) {
+      return _compile((StringLiteral)bl, expectedType);
+    } else if (bl instanceof VariableReference) {
+      return _compile((VariableReference)bl, expectedType);
+    } else {
+      throw new IllegalArgumentException("Unhandled parameter types: " +
+        Arrays.<Object>asList(bl, expectedType).toString());
+    }
+  }
+  
+  public CharSequence compileReference(final ScopedVariableReference rf, final Class<?> expectedType) {
+    if (rf instanceof AbsoluteCompartmentValueReference) {
+      return _compileReference((AbsoluteCompartmentValueReference)rf, expectedType);
+    } else if (rf instanceof RelativeCompartmentValueReference) {
+      return _compileReference((RelativeCompartmentValueReference)rf, expectedType);
+    } else if (rf instanceof GlobalVariableReference) {
+      return _compileReference((GlobalVariableReference)rf, expectedType);
+    } else if (rf instanceof LocalVariableReference) {
+      return _compileReference((LocalVariableReference)rf, expectedType);
+    } else if (rf instanceof ModelParamReference) {
+      return _compileReference((ModelParamReference)rf, expectedType);
+    } else {
+      throw new IllegalArgumentException("Unhandled parameter types: " +
+        Arrays.<Object>asList(rf, expectedType).toString());
+    }
+  }
+  
+  public CharSequence compileArgument(final JavaMethodArgument arg, final FunctionCall fc) {
+    if (arg instanceof FunctionArgumentReference) {
+      return _compileArgument((FunctionArgumentReference)arg, fc);
+    } else if (arg instanceof SystemArgumentReference) {
+      return _compileArgument((SystemArgumentReference)arg, fc);
+    } else {
+      throw new IllegalArgumentException("Unhandled parameter types: " +
+        Arrays.<Object>asList(arg, fc).toString());
+    }
+  }
+  
+  public CharSequence compileFunction(final FunctionReference fcr, final FunctionCall fc) {
+    if (fcr instanceof ExternalFunctionReference) {
+      return _compileFunction((ExternalFunctionReference)fcr, fc);
+    } else if (fcr != null) {
+      return _compileFunction(fcr, fc);
+    } else {
+      throw new IllegalArgumentException("Unhandled parameter types: " +
+        Arrays.<Object>asList(fcr, fc).toString());
+    }
+  }
+  
+  @Pure
+  public GenClass getModelGenClass() {
+    return this._modelGenClass;
+  }
+  
+  public void setModelGenClass(final GenClass modelGenClass) {
+    this._modelGenClass = modelGenClass;
+  }
+  
+  @Pure
+  public GenClass getLabelValueGenClass() {
+    return this._labelValueGenClass;
+  }
+  
+  public void setLabelValueGenClass(final GenClass labelValueGenClass) {
+    this._labelValueGenClass = labelValueGenClass;
+  }
+}

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl/xtend-gen/org/eclipse/stem/model/ctdl/generator/CTDLGenerator2.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl/xtend-gen/org/eclipse/stem/model/ctdl/generator/CTDLGenerator2.java
new file mode 100755
index 0000000..7e6c34b
--- /dev/null
+++ b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ctdl/xtend-gen/org/eclipse/stem/model/ctdl/generator/CTDLGenerator2.java

@@ -0,0 +1,586 @@
+/**
+ * Copyright (c) 2013 IBM Corporation 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:
+ *     IBM Corporation - initial API and implementation
+ */
+package org.eclipse.stem.model.ctdl.generator;
+
+import com.google.common.base.Objects;
+import com.google.common.collect.Iterables;
+import java.util.Arrays;
+import java.util.List;
+import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.stem.model.ctdl.ctdl.AbsoluteCompartmentValueReference;
+import org.eclipse.stem.model.ctdl.ctdl.BooleanLiteral;
+import org.eclipse.stem.model.ctdl.ctdl.CompartmentTransitionDefinitions;
+import org.eclipse.stem.model.ctdl.ctdl.DefStatement;
+import org.eclipse.stem.model.ctdl.ctdl.Div;
+import org.eclipse.stem.model.ctdl.ctdl.Evaluation;
+import org.eclipse.stem.model.ctdl.ctdl.Expression;
+import org.eclipse.stem.model.ctdl.ctdl.ExternalFunctionReference;
+import org.eclipse.stem.model.ctdl.ctdl.FunctionCall;
+import org.eclipse.stem.model.ctdl.ctdl.FunctionReference;
+import org.eclipse.stem.model.ctdl.ctdl.GlobalVariableReference;
+import org.eclipse.stem.model.ctdl.ctdl.LocalVariableReference;
+import org.eclipse.stem.model.ctdl.ctdl.MetamodelResource;
+import org.eclipse.stem.model.ctdl.ctdl.Minus;
+import org.eclipse.stem.model.ctdl.ctdl.ModelParamReference;
+import org.eclipse.stem.model.ctdl.ctdl.Multi;
+import org.eclipse.stem.model.ctdl.ctdl.NumberLiteral;
+import org.eclipse.stem.model.ctdl.ctdl.Plus;
+import org.eclipse.stem.model.ctdl.ctdl.PrimaryExpression;
+import org.eclipse.stem.model.ctdl.ctdl.RelativeCompartmentValueReference;
+import org.eclipse.stem.model.ctdl.ctdl.ScopedVariableReference;
+import org.eclipse.stem.model.ctdl.ctdl.StringLiteral;
+import org.eclipse.stem.model.ctdl.ctdl.TransitionBlock;
+import org.eclipse.stem.model.ctdl.ctdl.VariableReference;
+import org.eclipse.stem.model.ctdl.functions.FunctionArgumentReference;
+import org.eclipse.stem.model.ctdl.functions.JavaMethodArgument;
+import org.eclipse.stem.model.ctdl.functions.SystemArgumentReference;
+import org.eclipse.stem.model.ctdl.generator.ModelExpressionGenerator;
+import org.eclipse.stem.model.ctdl.serializer.ITypeSerializer;
+import org.eclipse.stem.model.ctdl.serializer.TypeSerializerFactory;
+import org.eclipse.stem.model.metamodel.Transition;
+import org.eclipse.xtend.lib.Property;
+import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.generator.IFileSystemAccess;
+import org.eclipse.xtext.resource.XtextResource;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+import org.eclipse.xtext.xbase.lib.IteratorExtensions;
+import org.eclipse.xtext.xbase.lib.Pure;
+import org.eclipse.xtext.xbase.lib.StringExtensions;
+
+@SuppressWarnings("all")
+public class CTDLGenerator2 extends ModelExpressionGenerator {
+  @Property
+  private GenClass _modelGenClass;
+  
+  @Property
+  private GenClass _labelGenClass;
+  
+  @Property
+  private GenClass _labelValueGenClass;
+  
+  @Override
+  public void doGenerate(final List<XtextResource> resources, final IFileSystemAccess fsa) {
+    String _name = this.getModelGenClass().getName();
+    String fileName = (_name + "Expressions.java");
+    fsa.generateFile(fileName, this.build(resources));
+  }
+  
+  @Override
+  public void doGenerate(final Resource resource, final IFileSystemAccess fsa) {
+    CompartmentTransitionDefinitions ctd = IterableExtensions.<CompartmentTransitionDefinitions>head(Iterables.<CompartmentTransitionDefinitions>filter(IteratorExtensions.<EObject>toIterable(resource.getAllContents()), CompartmentTransitionDefinitions.class));
+    MetamodelResource mm = ctd.getMetamodel();
+    Transition trans = mm.getTransition();
+    String _name = trans.getSource().getName();
+    String _plus = (_name + "_");
+    String _name_1 = trans.getTarget().getName();
+    String fname = (_plus + _name_1);
+    fsa.generateFile(fname, this.compile(resource));
+  }
+  
+  public CharSequence build(final List<XtextResource> r) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("package ");
+    String _classPackageName = this.getModelGenClass().getGenPackage().getClassPackageName();
+    _builder.append(_classPackageName);
+    _builder.append(";");
+    String pkg = _builder.toString();
+    StringConcatenation _builder_1 = new StringConcatenation();
+    _builder_1.append("\t\t");
+    _builder_1.append("/**");
+    _builder_1.newLine();
+    _builder_1.append("\t\t ");
+    _builder_1.append("* Generated expressions class for ");
+    String _name = this.getModelGenClass().getName();
+    _builder_1.append(_name, "\t\t ");
+    _builder_1.append(".");
+    _builder_1.newLineIfNotEmpty();
+    _builder_1.append("\t\t ");
+    _builder_1.append("* DO NOT EDIT DIRECTLY.  Use extended class and override methods for transitions as desired.");
+    _builder_1.newLine();
+    _builder_1.append("\t\t ");
+    _builder_1.append("* @generated");
+    _builder_1.newLine();
+    _builder_1.append("\t\t ");
+    _builder_1.append("*/");
+    _builder_1.newLine();
+    _builder_1.append("\t\t");
+    _builder_1.append("public class ");
+    String _name_1 = this.getModelGenClass().getName();
+    _builder_1.append(_name_1, "\t\t");
+    _builder_1.append("Expressions {");
+    _builder_1.newLineIfNotEmpty();
+    _builder_1.append("\t");
+    _builder_1.append("public void calculate(double t, long timeDelta, ");
+    String _importedName = this.getImportedName("org.eclipse.stem.core.model.STEMTime");
+    _builder_1.append(_importedName, "\t");
+    _builder_1.append(" time, ");
+    String _importGenClassInterface = this.importGenClassInterface(this.getModelGenClass());
+    _builder_1.append(_importGenClassInterface, "\t");
+    _builder_1.append(" model, ");
+    String _importGenClassInterface_1 = this.importGenClassInterface(this.getLabelGenClass());
+    _builder_1.append(_importGenClassInterface_1, "\t");
+    _builder_1.append(" label, ");
+    String _importGenClassInterface_2 = this.importGenClassInterface(this.getLabelValueGenClass());
+    _builder_1.append(_importGenClassInterface_2, "\t");
+    _builder_1.append(" labelValue, ");
+    String _importedName_1 = this.getImportedName("org.eclipse.stem.core.graph.Node");
+    _builder_1.append(_importedName_1, "\t");
+    _builder_1.append(" node) {");
+    _builder_1.newLineIfNotEmpty();
+    _builder_1.append("\t");
+    _builder_1.append("}");
+    _builder_1.newLine();
+    _builder_1.append("\t\t\t");
+    _builder_1.newLine();
+    {
+      for(final XtextResource e : r) {
+        CharSequence _compile = this.compile(e);
+        _builder_1.append(_compile);
+        _builder_1.newLineIfNotEmpty();
+      }
+    }
+    _builder_1.append("} //");
+    String body = _builder_1.toString();
+    String imports = this.getSortedImports();
+    StringConcatenation _builder_2 = new StringConcatenation();
+    _builder_2.append(pkg);
+    _builder_2.newLineIfNotEmpty();
+    _builder_2.newLine();
+    _builder_2.append(imports);
+    _builder_2.newLineIfNotEmpty();
+    _builder_2.newLine();
+    _builder_2.append(body);
+    return ((CharSequence) _builder_2);
+  }
+  
+  protected CharSequence _compile(final Resource r) {
+    StringConcatenation _builder = new StringConcatenation();
+    Object _compile = this.compile(IterableExtensions.<TransitionBlock>head(Iterables.<TransitionBlock>filter(IteratorExtensions.<EObject>toIterable(r.getAllContents()), TransitionBlock.class)));
+    _builder.append(_compile);
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final TransitionBlock t) {
+    EObject _eContainer = t.eContainer();
+    CompartmentTransitionDefinitions ctd = ((CompartmentTransitionDefinitions) _eContainer);
+    Transition transition = ctd.getMetamodel().getTransition();
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("/**");
+    _builder.newLine();
+    _builder.append(" ");
+    _builder.append("* Computes delta for transition ");
+    String _name = transition.getSource().getName();
+    _builder.append(_name, " ");
+    _builder.append(" -> ");
+    String _name_1 = transition.getTarget().getName();
+    _builder.append(_name_1, " ");
+    _builder.newLineIfNotEmpty();
+    _builder.append(" ");
+    _builder.append("* @generated");
+    _builder.newLine();
+    _builder.append(" ");
+    _builder.append("*/");
+    _builder.newLine();
+    _builder.append("protected double ");
+    String _name_2 = transition.getSource().getName();
+    _builder.append(_name_2);
+    _builder.append("_");
+    String _name_3 = transition.getTarget().getName();
+    _builder.append(_name_3);
+    _builder.append(" (double t, long timeDelta, ");
+    String _importedName = this.getImportedName("org.eclipse.stem.core.model.STEMTime");
+    _builder.append(_importedName);
+    _builder.append(" time, ");
+    String _importGenClassInterface = this.importGenClassInterface(this.getModelGenClass());
+    _builder.append(_importGenClassInterface);
+    _builder.append(" model, ");
+    String _importGenClassInterface_1 = this.importGenClassInterface(this.getLabelGenClass());
+    _builder.append(_importGenClassInterface_1);
+    _builder.append(" label, ");
+    String _importGenClassInterface_2 = this.importGenClassInterface(this.getLabelValueGenClass());
+    _builder.append(_importGenClassInterface_2);
+    _builder.append(" labelValue, ");
+    String _importedName_1 = this.getImportedName("org.eclipse.stem.core.graph.Node");
+    _builder.append(_importedName_1);
+    _builder.append(" node) {");
+    _builder.newLineIfNotEmpty();
+    {
+      EList<DefStatement> _statements = t.getBlock().getStatements();
+      for(final DefStatement s : _statements) {
+        Object _compile = this.compile(s);
+        _builder.append(_compile);
+      }
+    }
+    _builder.newLineIfNotEmpty();
+    _builder.append("return ");
+    Object _compile_1 = this.compile(t.getBlock().getRet());
+    _builder.append(_compile_1);
+    _builder.append(";");
+    _builder.newLineIfNotEmpty();
+    _builder.append("}");
+    _builder.newLine();
+    return ((CharSequence) _builder);
+  }
+  
+  protected CharSequence _compile(final DefStatement d) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("double ");
+    String _varname = d.getVarname();
+    _builder.append(_varname);
+    _builder.append("=");
+    Object _compile = this.compile(d.getExpr());
+    _builder.append(_compile);
+    _builder.append(";");
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final Evaluation e) {
+    StringConcatenation _builder = new StringConcatenation();
+    CharSequence _compile = this.compile(e.getExpression(), Double.TYPE);
+    _builder.append(_compile);
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final PrimaryExpression pe, final Class<?> expectedType) {
+    String neg = "";
+    boolean _isNegate = pe.isNegate();
+    if (_isNegate) {
+      neg = "-";
+    }
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("(");
+    _builder.append(neg);
+    Object _compile = this.compile(pe.getExp(), expectedType);
+    _builder.append(_compile);
+    _builder.append(")");
+    _builder.newLineIfNotEmpty();
+    return ((CharSequence) _builder);
+  }
+  
+  protected CharSequence _compile(final Plus p, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("(");
+    Object _compile = this.compile(p.getLeft(), Double.TYPE);
+    _builder.append(_compile);
+    _builder.append("+");
+    Object _compile_1 = this.compile(p.getRight(), Double.TYPE);
+    _builder.append(_compile_1);
+    _builder.append(")");
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final Minus m, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("(");
+    Object _compile = this.compile(m.getLeft(), Double.TYPE);
+    _builder.append(_compile);
+    _builder.append("-");
+    Object _compile_1 = this.compile(m.getRight(), Double.TYPE);
+    _builder.append(_compile_1);
+    _builder.append(")");
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final Multi m, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    Object _compile = this.compile(m.getLeft(), Double.TYPE);
+    _builder.append(_compile);
+    _builder.append("*");
+    Object _compile_1 = this.compile(m.getRight(), Double.TYPE);
+    _builder.append(_compile_1);
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final Div d, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    Object _compile = this.compile(d.getLeft(), Double.TYPE);
+    _builder.append(_compile);
+    _builder.append("/");
+    Object _compile_1 = this.compile(d.getRight(), Double.TYPE);
+    _builder.append(_compile_1);
+    return _builder;
+  }
+  
+  protected CharSequence _compileReference(final GlobalVariableReference rf, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    String _name = rf.getName();
+    _builder.append(_name);
+    return _builder;
+  }
+  
+  protected CharSequence _compileReference(final LocalVariableReference rf, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    String _name = rf.getName();
+    _builder.append(_name);
+    return _builder;
+  }
+  
+  protected CharSequence _compileReference(final AbsoluteCompartmentValueReference rf, final Class<?> expectedType) {
+    ITypeSerializer serializer = TypeSerializerFactory.getSerializer(rf, expectedType, this.getLabelValueGenClass());
+    if ((serializer != null)) {
+      return serializer.serialize();
+    }
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("labelValue.get");
+    String _firstUpper = StringExtensions.toFirstUpper(rf.getObj().getName());
+    _builder.append(_firstUpper);
+    _builder.append("()");
+    return ((CharSequence) _builder);
+  }
+  
+  protected CharSequence _compileReference(final RelativeCompartmentValueReference rf, final Class<?> expectedType) {
+    ITypeSerializer serializer = TypeSerializerFactory.getSerializer(rf, expectedType, this.getLabelValueGenClass());
+    if ((serializer != null)) {
+      return serializer.serialize();
+    }
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("labelValue.get");
+    String _firstUpper = StringExtensions.toFirstUpper(rf.getObj().getName());
+    _builder.append(_firstUpper);
+    _builder.append("()/labelValue.getPopulationCount()");
+    return ((CharSequence) _builder);
+  }
+  
+  protected CharSequence _compileReference(final ModelParamReference rf, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("get");
+    String _firstUpper = StringExtensions.toFirstUpper(rf.getObj().getName());
+    _builder.append(_firstUpper);
+    _builder.append("()");
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final VariableReference rf, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    CharSequence _compileReference = this.compileReference(rf.getRef(), expectedType);
+    _builder.append(_compileReference);
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final NumberLiteral nl, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    double _value = nl.getValue();
+    _builder.append(_value);
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final StringLiteral sl, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("\"");
+    String _value = sl.getValue();
+    _builder.append(_value);
+    _builder.append("\"");
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final BooleanLiteral bl, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    boolean _isValue = bl.isValue();
+    _builder.append(_isValue);
+    return _builder;
+  }
+  
+  protected CharSequence _compileArgument(final SystemArgumentReference arg, final FunctionCall fc) {
+    StringConcatenation _builder = new StringConcatenation();
+    String _mapsFrom = arg.getMapsFrom();
+    _builder.append(_mapsFrom);
+    return _builder;
+  }
+  
+  protected CharSequence _compileArgument(final FunctionArgumentReference arg, final FunctionCall fc) {
+    StringConcatenation _builder = new StringConcatenation();
+    Object _compile = this.compile(fc.getArgs().get(arg.getArgIndex()), arg.getJavaType());
+    _builder.append(_compile);
+    return _builder;
+  }
+  
+  protected CharSequence _compileFunction(final ExternalFunctionReference fcr, final FunctionCall fc) {
+    StringConcatenation _builder = new StringConcatenation();
+    String _importedName = this.getImportedName(fcr.getFunc().getClassName());
+    _builder.append(_importedName);
+    _builder.append(".");
+    String _methodName = fcr.getFunc().getMethodName();
+    _builder.append(_methodName);
+    _builder.append("(");
+    _builder.newLineIfNotEmpty();
+    {
+      EList<JavaMethodArgument> _javaMethodArguments = fcr.getFunc().getJavaMethodArguments();
+      for(final JavaMethodArgument arg : _javaMethodArguments) {
+        _builder.append("\t\t");
+        {
+          JavaMethodArgument _head = IterableExtensions.<JavaMethodArgument>head(fcr.getFunc().getJavaMethodArguments());
+          boolean _notEquals = (!Objects.equal(arg, _head));
+          if (_notEquals) {
+            _builder.append(",");
+          }
+        }
+        _builder.newLineIfNotEmpty();
+        _builder.append("\t\t");
+        CharSequence _compileArgument = this.compileArgument(arg, fc);
+        _builder.append(_compileArgument, "\t\t");
+        _builder.newLineIfNotEmpty();
+        _builder.append("\t\t");
+      }
+    }
+    _builder.append(")");
+    return _builder;
+  }
+  
+  protected CharSequence _compileFunction(final FunctionReference fcr, final FunctionCall fc) {
+    StringConcatenation _builder = new StringConcatenation();
+    String _name = fcr.getName();
+    _builder.append(_name);
+    _builder.append("(");
+    {
+      EList<Expression> _args = fc.getArgs();
+      for(final Expression e : _args) {
+        _builder.append(" ");
+        _builder.newLineIfNotEmpty();
+        {
+          Expression _head = IterableExtensions.<Expression>head(fc.getArgs());
+          boolean _equals = Objects.equal(e, _head);
+          if (_equals) {
+            Object _compile = this.compile(e);
+            _builder.append(_compile);
+            _builder.newLineIfNotEmpty();
+          } else {
+            _builder.append(",");
+            Object _compile_1 = this.compile(e);
+            _builder.append(_compile_1);
+            _builder.newLineIfNotEmpty();
+          }
+        }
+        _builder.append("\t\t\t");
+      }
+    }
+    _builder.append(")");
+    return _builder;
+  }
+  
+  protected CharSequence _compile(final FunctionCall fc, final Class<?> expectedType) {
+    StringConcatenation _builder = new StringConcatenation();
+    CharSequence _compileFunction = this.compileFunction(fc.getRef(), fc);
+    _builder.append(_compileFunction);
+    return _builder;
+  }
+  
+  public CharSequence compile(final Notifier e) {
+    if (e instanceof Evaluation) {
+      return _compile((Evaluation)e);
+    } else if (e instanceof DefStatement) {
+      return _compile((DefStatement)e);
+    } else if (e instanceof TransitionBlock) {
+      return _compile((TransitionBlock)e);
+    } else if (e instanceof Resource) {
+      return _compile((Resource)e);
+    } else {
+      throw new IllegalArgumentException("Unhandled parameter types: " +
+        Arrays.<Object>asList(e).toString());
+    }
+  }
+  
+  public CharSequence compile(final Expression bl, final Class<?> expectedType) {
+    if (bl instanceof BooleanLiteral) {
+      return _compile((BooleanLiteral)bl, expectedType);
+    } else if (bl instanceof Div) {
+      return _compile((Div)bl, expectedType);
+    } else if (bl instanceof FunctionCall) {
+      return _compile((FunctionCall)bl, expectedType);
+    } else if (bl instanceof Minus) {
+      return _compile((Minus)bl, expectedType);
+    } else if (bl instanceof Multi) {
+      return _compile((Multi)bl, expectedType);
+    } else if (bl instanceof NumberLiteral) {
+      return _compile((NumberLiteral)bl, expectedType);
+    } else if (bl instanceof Plus) {
+      return _compile((Plus)bl, expectedType);
+    } else if (bl instanceof PrimaryExpression) {
+      return _compile((PrimaryExpression)bl, expectedType);
+    } else if (bl instanceof StringLiteral) {
+      return _compile((StringLiteral)bl, expectedType);
+    } else if (bl instanceof VariableReference) {
+      return _compile((VariableReference)bl, expectedType);
+    } else {
+      throw new IllegalArgumentException("Unhandled parameter types: " +
+        Arrays.<Object>asList(bl, expectedType).toString());
+    }
+  }
+  
+  public CharSequence compileReference(final ScopedVariableReference rf, final Class<?> expectedType) {
+    if (rf instanceof AbsoluteCompartmentValueReference) {
+      return _compileReference((AbsoluteCompartmentValueReference)rf, expectedType);
+    } else if (rf instanceof RelativeCompartmentValueReference) {
+      return _compileReference((RelativeCompartmentValueReference)rf, expectedType);
+    } else if (rf instanceof GlobalVariableReference) {
+      return _compileReference((GlobalVariableReference)rf, expectedType);
+    } else if (rf instanceof LocalVariableReference) {
+      return _compileReference((LocalVariableReference)rf, expectedType);
+    } else if (rf instanceof ModelParamReference) {
+      return _compileReference((ModelParamReference)rf, expectedType);
+    } else {
+      throw new IllegalArgumentException("Unhandled parameter types: " +
+        Arrays.<Object>asList(rf, expectedType).toString());
+    }
+  }
+  
+  public CharSequence compileArgument(final JavaMethodArgument arg, final FunctionCall fc) {
+    if (arg instanceof FunctionArgumentReference) {
+      return _compileArgument((FunctionArgumentReference)arg, fc);
+    } else if (arg instanceof SystemArgumentReference) {
+      return _compileArgument((SystemArgumentReference)arg, fc);
+    } else {
+      throw new IllegalArgumentException("Unhandled parameter types: " +
+        Arrays.<Object>asList(arg, fc).toString());
+    }
+  }
+  
+  public CharSequence compileFunction(final FunctionReference fcr, final FunctionCall fc) {
+    if (fcr instanceof ExternalFunctionReference) {
+      return _compileFunction((ExternalFunctionReference)fcr, fc);
+    } else if (fcr != null) {
+      return _compileFunction(fcr, fc);
+    } else {
+      throw new IllegalArgumentException("Unhandled parameter types: " +
+        Arrays.<Object>asList(fcr, fc).toString());
+    }
+  }
+  
+  @Pure
+  public GenClass getModelGenClass() {
+    return this._modelGenClass;
+  }
+  
+  public void setModelGenClass(final GenClass modelGenClass) {
+    this._modelGenClass = modelGenClass;
+  }
+  
+  @Pure
+  public GenClass getLabelGenClass() {
+    return this._labelGenClass;
+  }
+  
+  public void setLabelGenClass(final GenClass labelGenClass) {
+    this._labelGenClass = labelGenClass;
+  }
+  
+  @Pure
+  public GenClass getLabelValueGenClass() {
+    return this._labelValueGenClass;
+  }
+  
+  public void setLabelValueGenClass(final GenClass labelValueGenClass) {
+    this._labelValueGenClass = labelValueGenClass;
+  }
+}

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/.classpath b/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/.classpath
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/.gitignore b/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/.gitignore
new file mode 100644
index 0000000..ae3c172
--- /dev/null
+++ b/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/.gitignore

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

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/.project b/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/.project
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/.settings/org.eclipse.core.resources.prefs b/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/.settings/org.eclipse.core.resources.prefs
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/.settings/org.eclipse.jdt.core.prefs
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/EcoreToMetamodel.launch b/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/EcoreToMetamodel.launch
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/META-INF/MANIFEST.MF b/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/META-INF/MANIFEST.MF
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/TransformApp-3.7.launch b/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/TransformApp-3.7.launch
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/TransformApp-3.8.launch b/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/TransformApp-3.8.launch
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/build.properties b/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/build.properties
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/plugin.properties b/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/plugin.properties
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/src/org/eclipse/stem/model/transform/Activator.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/src/org/eclipse/stem/model/transform/Activator.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/src/org/eclipse/stem/model/transform/EPackageManager.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/src/org/eclipse/stem/model/transform/EPackageManager.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/src/org/eclipse/stem/model/transform/EcoreTransformSwitch.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/src/org/eclipse/stem/model/transform/EcoreTransformSwitch.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/src/org/eclipse/stem/model/transform/GenModelTransformSwitch.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/src/org/eclipse/stem/model/transform/GenModelTransformSwitch.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/src/org/eclipse/stem/model/transform/MetamodelPackageManager.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/src/org/eclipse/stem/model/transform/MetamodelPackageManager.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/src/org/eclipse/stem/model/transform/MetamodelRegenerateValidator.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/src/org/eclipse/stem/model/transform/MetamodelRegenerateValidator.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/src/org/eclipse/stem/model/transform/MetamodelResourceFactory.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/src/org/eclipse/stem/model/transform/MetamodelResourceFactory.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/src/org/eclipse/stem/model/transform/ModelGenerator.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/src/org/eclipse/stem/model/transform/ModelGenerator.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/src/org/eclipse/stem/model/transform/util/EcoreToMetamodelTransformer.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/src/org/eclipse/stem/model/transform/util/EcoreToMetamodelTransformer.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/src/org/eclipse/stem/model/transform/util/TransformerApplication.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.transform/src/org/eclipse/stem/model/transform/util/TransformerApplication.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/.classpath b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/.classpath
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/.gitignore b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/.gitignore
new file mode 100644
index 0000000..ae3c172
--- /dev/null
+++ b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/.gitignore

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

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/.project b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/.project
old mode 100644
new mode 100755
index 3c51570..3b065f3
--- a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/.project
+++ b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/.project

@@ -1,16 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*******************************************************************************
- * Copyright (c) 2013 IBM Corporation 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ 
--->
 <projectDescription>
 	<name>org.eclipse.stem.model.ui.editor</name>
 	<comment></comment>

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/.settings/org.eclipse.jdt.core.prefs
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/META-INF/MANIFEST.MF b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/META-INF/MANIFEST.MF
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/build.properties b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/build.properties
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/AddCompartmentIcon20.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/AddCompartmentIcon20.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/AddCompartmentIcon24.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/AddCompartmentIcon24.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/AddModelIcon16.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/AddModelIcon16.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/DrawTransitionIcon20.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/DrawTransitionIcon20.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/EditModel.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/EditModel.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/LockIcon12.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/LockIcon12.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/MetaModelIcon.png b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/MetaModelIcon.png
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/Reload.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/Reload.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/RunModelGeneratorIcon20.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/RunModelGeneratorIcon20.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/SelectIcon20.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/SelectIcon20.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/full/ctool16/CreateCanvasPackage_modelElements_ModelElement.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/full/ctool16/CreateCanvasPackage_modelElements_ModelElement.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/full/ctool16/CreateModelElement_compartmentElements_CompartmentElement.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/full/ctool16/CreateModelElement_compartmentElements_CompartmentElement.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/full/ctool16/CreateModelElement_transitionElements_TransitionElement.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/full/ctool16/CreateModelElement_transitionElements_TransitionElement.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/full/obj16/CanvasPackage.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/full/obj16/CanvasPackage.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/full/obj16/CompartmentElement.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/full/obj16/CompartmentElement.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/full/obj16/ConnectorElement.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/full/obj16/ConnectorElement.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/full/obj16/LineElement.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/full/obj16/LineElement.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/full/obj16/ModelElement.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/full/obj16/ModelElement.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/full/obj16/TransitionElement.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/full/obj16/TransitionElement.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/full/obj16/VisualMetamodelModelFile.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/full/obj16/VisualMetamodelModelFile.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/full/wizban/NewVisualMetamodel.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/icons/full/wizban/NewVisualMetamodel.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/model/vmm.ecore b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/model/vmm.ecore
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/model/vmm.genmodel b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/model/vmm.genmodel
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/plugin.properties b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/plugin.properties
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/plugin.xml b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/plugin.xml
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/ModelDiagramEditor.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/ModelDiagramEditor.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/ModelDiagramEditorActionBarContributor.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/ModelDiagramEditorActionBarContributor.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/ModelDiagramEditorContextMenuProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/ModelDiagramEditorContextMenuProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/VisualModelLoader.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/VisualModelLoader.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/VisualModelReconciler.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/VisualModelReconciler.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/VisualModelUtils.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/VisualModelUtils.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/actions/RunModelGeneratorAction.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/actions/RunModelGeneratorAction.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/commands/CompartmentCreateCommand.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/commands/CompartmentCreateCommand.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/commands/CompartmentDeleteCommand.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/commands/CompartmentDeleteCommand.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/commands/CompartmentSetConstraintCommand.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/commands/CompartmentSetConstraintCommand.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/commands/ModelCreateCommand.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/commands/ModelCreateCommand.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/commands/TransitionCreateCommand.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/commands/TransitionCreateCommand.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/commands/TransitionDeleteCommand.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/commands/TransitionDeleteCommand.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/commands/TransitionReconnectCommand.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/commands/TransitionReconnectCommand.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/commands/emf/DelegatingCommandStack.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/commands/emf/DelegatingCommandStack.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/commands/emf/EditExpressionCommand.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/commands/emf/EditExpressionCommand.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/commands/emf/EmfCommandWrapper.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/commands/emf/EmfCommandWrapper.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/controls/ModelCompartmentEditorDialog.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/controls/ModelCompartmentEditorDialog.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/controls/ModelParametersEditorDialog.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/controls/ModelParametersEditorDialog.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/controls/ModelPropertiesComposite.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/controls/ModelPropertiesComposite.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/controls/TransitionEditorComposite.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/controls/TransitionEditorComposite.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/controls/VisualEditorCanvas.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/controls/VisualEditorCanvas.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/controls/VisualEditorComposite.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/controls/VisualEditorComposite.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/controls/VisualEditorToolbar.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/controls/VisualEditorToolbar.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/figures/CompartmentFigure.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/figures/CompartmentFigure.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/figures/ModelFigure.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/figures/ModelFigure.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/figures/TransitionFigure.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/figures/TransitionFigure.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/parts/CompartmentComponentEditPolicy.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/parts/CompartmentComponentEditPolicy.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/parts/CompartmentElementEditPart.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/parts/CompartmentElementEditPart.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/parts/ModelDiagramEditPartFactory.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/parts/ModelDiagramEditPartFactory.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/parts/ModelElementEditPart.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/parts/ModelElementEditPart.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/parts/TransitionElementEditPart.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/parts/TransitionElementEditPart.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/CanvasPackage.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/CanvasPackage.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/CompartmentElement.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/CompartmentElement.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/ConnectorElement.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/ConnectorElement.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/LineElement.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/LineElement.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/ModelElement.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/ModelElement.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/RectangleElement.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/RectangleElement.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/TransitionElement.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/TransitionElement.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/VisualElement.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/VisualElement.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/VisualMetamodelFactory.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/VisualMetamodelFactory.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/VisualMetamodelPackage.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/VisualMetamodelPackage.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/impl/CanvasPackageImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/impl/CanvasPackageImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/impl/CompartmentElementImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/impl/CompartmentElementImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/impl/ConnectorElementImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/impl/ConnectorElementImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/impl/LineElementImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/impl/LineElementImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/impl/ModelElementImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/impl/ModelElementImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/impl/RectangleElementImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/impl/RectangleElementImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/impl/TransitionElementImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/impl/TransitionElementImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/impl/VisualElementImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/impl/VisualElementImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/impl/VisualMetamodelFactoryImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/impl/VisualMetamodelFactoryImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/impl/VisualMetamodelPackageImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/impl/VisualMetamodelPackageImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/presentation/VisualMetamodelActionBarContributor.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/presentation/VisualMetamodelActionBarContributor.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/presentation/VisualMetamodelEditor.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/presentation/VisualMetamodelEditor.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/presentation/VisualMetamodelModelWizard.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/presentation/VisualMetamodelModelWizard.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/provider/CanvasPackageItemProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/provider/CanvasPackageItemProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/provider/CompartmentElementItemProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/provider/CompartmentElementItemProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/provider/ConnectorElementItemProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/provider/ConnectorElementItemProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/provider/LineElementItemProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/provider/LineElementItemProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/provider/ModelElementItemProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/provider/ModelElementItemProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/provider/RectangleElementItemProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/provider/RectangleElementItemProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/provider/TransitionElementItemProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/provider/TransitionElementItemProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/provider/VisualElementItemProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/provider/VisualElementItemProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/provider/VisualMetamodelEditPlugin.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/provider/VisualMetamodelEditPlugin.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/provider/VisualMetamodelItemProviderAdapterFactory.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/provider/VisualMetamodelItemProviderAdapterFactory.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/util/VisualMetamodelAdapterFactory.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/util/VisualMetamodelAdapterFactory.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/util/VisualMetamodelSwitch.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui.editor/src/org/eclipse/stem/model/ui/editor/vismodel/util/VisualMetamodelSwitch.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/.classpath b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/.classpath
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/.gitignore b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/.gitignore
new file mode 100644
index 0000000..ae3c172
--- /dev/null
+++ b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/.gitignore

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

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/.project b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/.project
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/.settings/org.eclipse.core.resources.prefs b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/.settings/org.eclipse.core.resources.prefs
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/.settings/org.eclipse.jdt.core.prefs
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/META-INF/MANIFEST.MF b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/META-INF/MANIFEST.MF
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/build.properties b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/build.properties
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/icons/full/ctool16/NewGenModel.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/icons/full/ctool16/NewGenModel.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/icons/full/obj16/MetamodelModelFile.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/icons/full/obj16/MetamodelModelFile.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/plugin.properties b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/plugin.properties
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/plugin.xml b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/plugin.xml
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/metamodel/presentation/MetamodelActionBarContributor.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/metamodel/presentation/MetamodelActionBarContributor.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/metamodel/presentation/MetamodelEditor.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/metamodel/presentation/MetamodelEditor.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/Constants.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/Constants.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/GenerateWizardAction.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/GenerateWizardAction.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/MetamodelEditorPlugin.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/MetamodelEditorPlugin.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/actions/BundleInstallTester.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/actions/BundleInstallTester.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/actions/LoadBundleAction.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/actions/LoadBundleAction.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/actions/ToggleNatureAction.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/actions/ToggleNatureAction.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/actions/UnloadBundleAction.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/actions/UnloadBundleAction.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/handlers/LoadBundleHandler.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/handlers/LoadBundleHandler.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/handlers/ToggleNatureHandler.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/handlers/ToggleNatureHandler.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/handlers/UnLoadBundleHandler.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/handlers/UnLoadBundleHandler.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/views/ModelPackageView.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/views/ModelPackageView.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/CreatePackagePage.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/CreatePackagePage.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/EMFLabelProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/EMFLabelProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/GeneratorOptionsPage.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/GeneratorOptionsPage.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/InheritedColumnLabelProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/InheritedColumnLabelProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/ModelCompartmentEditorDialog.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/ModelCompartmentEditorDialog.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/ModelCompartmentsPage.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/ModelCompartmentsPage.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/ModelGeneratorWizard.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/ModelGeneratorWizard.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/ModelParamConstraintEditorDialog.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/ModelParamConstraintEditorDialog.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/ModelParamEditorDialog.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/ModelParamEditorDialog.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/ModelParametersPage.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/ModelParametersPage.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/ModelPropertiesPage.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/ModelPropertiesPage.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/ModelTransitionsPage.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/ModelTransitionsPage.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/NewModelProjectWizard.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/NewModelProjectWizard.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/NewModelWizard.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/NewModelWizard.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/PackagePropertiesPage.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/PackagePropertiesPage.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/ProjectListDialog.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/ProjectListDialog.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/TransitionEditorDialog.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/TransitionEditorDialog.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/WizardHelper.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model.ui/src/org/eclipse/stem/model/ui/wizards/WizardHelper.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/.classpath b/org.eclipse.stem/modelgen/org.eclipse.stem.model/.classpath
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/.gitignore b/org.eclipse.stem/modelgen/org.eclipse.stem.model/.gitignore
new file mode 100644
index 0000000..ae3c172
--- /dev/null
+++ b/org.eclipse.stem/modelgen/org.eclipse.stem.model/.gitignore

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

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/.project b/org.eclipse.stem/modelgen/org.eclipse.stem.model/.project
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/.settings/org.eclipse.core.resources.prefs b/org.eclipse.stem/modelgen/org.eclipse.stem.model/.settings/org.eclipse.core.resources.prefs
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.stem/modelgen/org.eclipse.stem.model/.settings/org.eclipse.jdt.core.prefs
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/META-INF/MANIFEST.MF b/org.eclipse.stem/modelgen/org.eclipse.stem.model/META-INF/MANIFEST.MF
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/build.properties b/org.eclipse.stem/modelgen/org.eclipse.stem.model/build.properties
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/ctool16/CreateCompartmentGroup_compartments_Compartment.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/ctool16/CreateCompartmentGroup_compartments_Compartment.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/ctool16/CreateModel_compartments_CompartmentGroup.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/ctool16/CreateModel_compartments_CompartmentGroup.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/ctool16/CreateModel_generatorSettings_ModelGenSettings.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/ctool16/CreateModel_generatorSettings_ModelGenSettings.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/ctool16/CreateModel_parameters_ModelParam.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/ctool16/CreateModel_parameters_ModelParam.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/ctool16/CreateModel_transitions_Transition.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/ctool16/CreateModel_transitions_Transition.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/ctool16/CreatePackage_compartmentGroups_CompartmentGroup.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/ctool16/CreatePackage_compartmentGroups_CompartmentGroup.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/ctool16/CreatePackage_generatorSettings_PackageGenSettings.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/ctool16/CreatePackage_generatorSettings_PackageGenSettings.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/ctool16/CreatePackage_models_Model.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/ctool16/CreatePackage_models_Model.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/ctool16/CreateTransition_source_Compartment.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/ctool16/CreateTransition_source_Compartment.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/ctool16/CreateTransition_target_Compartment.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/ctool16/CreateTransition_target_Compartment.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/obj16/AuthorDetails.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/obj16/AuthorDetails.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/obj16/Compartment.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/obj16/Compartment.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/obj16/CompartmentGroup.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/obj16/CompartmentGroup.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/obj16/Model.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/obj16/Model.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/obj16/ModelGenSettings.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/obj16/ModelGenSettings.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/obj16/ModelParam.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/obj16/ModelParam.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/obj16/ModelParamConstraint.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/obj16/ModelParamConstraint.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/obj16/Package.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/obj16/Package.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/obj16/PackageGenSettings.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/obj16/PackageGenSettings.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/obj16/Transition.gif b/org.eclipse.stem/modelgen/org.eclipse.stem.model/icons/full/obj16/Transition.gif
old mode 100644
new mode 100755
Binary files differ

diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/model/metamodel.ecore b/org.eclipse.stem/modelgen/org.eclipse.stem.model/model/metamodel.ecore
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/model/metamodel.genmodel b/org.eclipse.stem/modelgen/org.eclipse.stem.model/model/metamodel.genmodel
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/plugin.properties b/org.eclipse.stem/modelgen/org.eclipse.stem.model/plugin.properties
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/plugin.xml b/org.eclipse.stem/modelgen/org.eclipse.stem.model/plugin.xml
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/schema/metamodel.exsd b/org.eclipse.stem/modelgen/org.eclipse.stem.model/schema/metamodel.exsd
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/AuthorDetails.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/AuthorDetails.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/Compartment.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/Compartment.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/CompartmentGroup.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/CompartmentGroup.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/CompartmentType.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/CompartmentType.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/MetamodelFactory.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/MetamodelFactory.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/MetamodelPackage.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/MetamodelPackage.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/Model.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/Model.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/ModelGenSettings.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/ModelGenSettings.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/ModelParam.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/ModelParam.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/ModelParamConstraint.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/ModelParamConstraint.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/ModelType.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/ModelType.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/Package.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/Package.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/PackageGenSettings.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/PackageGenSettings.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/Transition.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/Transition.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/AuthorDetailsImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/AuthorDetailsImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/CompartmentGroupImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/CompartmentGroupImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/CompartmentImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/CompartmentImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/MetamodelFactoryImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/MetamodelFactoryImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/MetamodelPackageImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/MetamodelPackageImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/ModelGenSettingsImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/ModelGenSettingsImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/ModelImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/ModelImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/ModelParamConstraintImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/ModelParamConstraintImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/ModelParamImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/ModelParamImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/PackageGenSettingsImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/PackageGenSettingsImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/PackageImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/PackageImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/TransitionImpl.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/impl/TransitionImpl.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/AuthorDetailsItemProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/AuthorDetailsItemProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/CompartmentGroupItemProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/CompartmentGroupItemProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/CompartmentItemProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/CompartmentItemProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/MetamodelEditPlugin.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/MetamodelEditPlugin.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/MetamodelItemProviderAdapterFactory.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/MetamodelItemProviderAdapterFactory.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/ModelGenSettingsItemProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/ModelGenSettingsItemProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/ModelItemProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/ModelItemProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/ModelParamConstraintItemProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/ModelParamConstraintItemProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/ModelParamItemProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/ModelParamItemProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/PackageGenSettingsItemProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/PackageGenSettingsItemProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/PackageItemProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/PackageItemProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/TransitionItemProvider.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/provider/TransitionItemProvider.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/util/MetamodelAdapterFactory.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/util/MetamodelAdapterFactory.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/util/MetamodelSwitch.java b/org.eclipse.stem/modelgen/org.eclipse.stem.model/src/org/eclipse/stem/model/metamodel/util/MetamodelSwitch.java
old mode 100644
new mode 100755


diff --git a/org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/STEM-Eclipse37.target b/org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/STEM-Eclipse37.target
deleted file mode 100644
index 96e69b5..0000000
--- a/org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/STEM-Eclipse37.target
+++ /dev/null

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<?pde version="3.6"?>

-

-<target name="STEM - Eclipse Platform 3.7 (Preferred)" sequenceNumber="18">

-<locations>

-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

-<unit id="org.apache.commons.collections" version="3.2.0.v201005080500"/>

-<unit id="org.apache.commons.math" version="2.1.0.v201105210652"/>

-<unit id="org.apache.commons.math.source" version="2.1.0.v201105210652"/>

-<unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>

-<unit id="org.apache.batik.dom" version="1.6.0.v201011041432"/>

-<unit id="org.apache.batik.ext.awt" version="1.6.0.v201011041432"/>

-<unit id="org.apache.batik.svggen" version="1.6.0.v201011041432"/>

-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120119162704/repository/"/>

-</location>

-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

-<unit id="org.eclipse.platform.ide" version="3.7.2.M20120208-0800"/>

-<repository location="http://download.eclipse.org/eclipse/updates/3.7"/>

-</location>

-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

-<unit id="org.eclipse.birt.feature.group" version="3.7.2.v20120213-BDF9E9bGTzuHh03p2c0AWvmC3Ltk"/>

-<unit id="org.eclipse.emf.sdk.feature.group" version="2.7.2.v20120130-0943"/>

-<unit id="org.eclipse.zest.sdk.feature.group" version="1.3.0.v20110425-2050-67C18COMPIAKSVKGQaRTQTiSN8WP"/>

-<repository location="http://download.eclipse.org/releases/indigo"/>

-</location>

-</locations>

-</target>


diff --git a/org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/STEM2.target b/org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/STEM2.target
deleted file mode 100644
index 16cfaae..0000000
--- a/org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/STEM2.target
+++ /dev/null

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?>
-
-<target name="STEM2" sequenceNumber="9">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.birt.feature.group" version="4.2.2.v201301281649-ClBI9nGZcVSofEz-Xuz0n-ruJtUm"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.8.3.v20130125-0826"/>
-<unit id="org.eclipse.xtext.sdk.feature.group" version="2.3.1.v201208210947"/>
-<unit id="org.eclipse.zest.sdk.feature.group" version="1.5.0.201212170307"/>
-<unit id="org.eclipse.xtend.sdk.feature.group" version="2.3.1.v201208210947"/>
-<repository location="http://download.eclipse.org/releases/juno"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.collections" version="3.2.0.v201005080500"/>
-<unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
-<unit id="org.apache.commons.io.source" version="2.0.1.v201105210651"/>
-<unit id="org.apache.commons.lang" version="2.6.0.v201205030909"/>
-<unit id="org.apache.commons.lang.source" version="2.6.0.v201205030909"/>
-<unit id="org.apache.commons.math" version="2.1.0.v201105210652"/>
-<unit id="org.apache.commons.math.source" version="2.1.0.v201105210652"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="3.8.2.M20130131-0800"/>
-<repository location="http://download.eclipse.org/eclipse/updates/3.8"/>
-</location>
-</locations>
-</target>

diff --git a/org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/STEM3.target b/org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/STEM3.target
deleted file mode 100644
index ec32a55..0000000
--- a/org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/STEM3.target
+++ /dev/null

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="STEM3" sequenceNumber="24">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.xtext.sdk.feature.group" version="2.7.3.v201411190455"/>
-<unit id="org.eclipse.birt.feature.group" version="4.4.2.v201410272105-DPEqA5GixAot9yUGgiE15dZgVpeZ"/>
-<unit id="org.eclipse.zest.sdk.feature.group" version="1.5.101.201408150207"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.10.2.v20150123-0452"/>
-<repository location="http://download.eclipse.org/releases/luna"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="4.4.2.M20150204-1700"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.4"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.batik.dom.svg" version="1.7.0.v201011041433"/>
-<unit id="org.apache.commons.collections" version="3.2.0.v2013030210310"/>
-<unit id="org.apache.batik.svggen" version="1.7.0.v201011041433"/>
-<unit id="org.apache.batik.dom" version="1.7.0.v201011041433"/>
-<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
-</location>
-</locations>
-<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Java8"/>
-</target>

diff --git a/org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/buckminster.cspec b/org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/buckminster.cspec
deleted file mode 100644
index ac62119..0000000
--- a/org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/buckminster.cspec
+++ /dev/null

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.stem.releng.targetplatforms" componentType="buckminster" version="1.0.0"/>
\ No newline at end of file

diff --git a/workspace/.metadata/.log b/workspace/.metadata/.log
new file mode 100644
index 0000000..082f2ae
--- /dev/null
+++ b/workspace/.metadata/.log

@@ -0,0 +1,298 @@
+!SESSION 2018-12-20 20:21:16.266 -----------------------------------------------
+eclipse.buildId=unknown
+java.version=1.8.0_144
+java.vendor=Oracle Corporation
+BootLoader constants: OS=macosx, ARCH=x86_64, WS=cocoa, NL=en_US
+Framework arguments:  -eclipse.keyring /var/folders/jf/91nyxlgj7153brj7p1qwsp2h0000gn/T/tycho1454122211137577957secure_storage
+Command-line arguments:  -eclipse.keyring /var/folders/jf/91nyxlgj7153brj7p1qwsp2h0000gn/T/tycho1454122211137577957secure_storage
+
+!ENTRY org.eclipse.core.net 1 0 2018-12-20 20:21:16.266
+!MESSAGE System property http.nonProxyHosts has been set to local|*.local|169.254/16|*.169.254/16 by an external source. This value will be overwritten using the values from the preferences
+
+!ENTRY org.eclipse.equinox.p2.artifact.repository 4 0 2018-12-20 20:22:28.621
+!MESSAGE Unexpected error loading extension: org.eclipse.equinox.p2.artifact.repository.XZedRepository
+!STACK 0
+java.lang.NullPointerException
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository.isLocal(SimpleArtifactRepository.java:1058)
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository.isModifiable(SimpleArtifactRepository.java:1062)
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.XZedSimpleArtifactRepositoryFactory.load(XZedSimpleArtifactRepositoryFactory.java:89)
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.XZedSimpleArtifactRepositoryFactory.load(XZedSimpleArtifactRepositoryFactory.java:37)
+	at org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRepositoryManager.factoryLoad(ArtifactRepositoryManager.java:73)
+	at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.loadRepository(AbstractRepositoryManager.java:768)
+	at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.loadRepository(AbstractRepositoryManager.java:668)
+	at org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRepositoryManager.loadRepository(ArtifactRepositoryManager.java:104)
+	at org.eclipse.equinox.p2.internal.repository.tools.RecreateRepositoryApplication.initialize(RecreateRepositoryApplication.java:61)
+	at org.eclipse.equinox.p2.internal.repository.tools.RecreateRepositoryApplication.run(RecreateRepositoryApplication.java:40)
+	at org.eclipse.tycho.p2.tools.mirroring.MirrorApplicationServiceImpl.mirrorReactor(MirrorApplicationServiceImpl.java:171)
+	at org.eclipse.tycho.plugins.p2.repository.AssembleRepositoryMojo.execute(AssembleRepositoryMojo.java:144)
+	at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:137)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:154)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:146)
+	at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:117)
+	at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:81)
+	at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:56)
+	at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:128)
+	at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:305)
+	at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:192)
+	at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:105)
+	at org.apache.maven.cli.MavenCli.execute(MavenCli.java:954)
+	at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:288)
+	at org.apache.maven.cli.MavenCli.main(MavenCli.java:192)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:289)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:229)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:415)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:356)
+
+!ENTRY org.eclipse.equinox.p2.artifact.repository 4 0 2018-12-20 20:22:28.962
+!MESSAGE Unexpected error loading extension: org.eclipse.equinox.p2.artifact.repository.XZedRepository
+!STACK 0
+java.lang.NullPointerException
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository.isLocal(SimpleArtifactRepository.java:1058)
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository.isModifiable(SimpleArtifactRepository.java:1062)
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.XZedSimpleArtifactRepositoryFactory.load(XZedSimpleArtifactRepositoryFactory.java:89)
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.XZedSimpleArtifactRepositoryFactory.load(XZedSimpleArtifactRepositoryFactory.java:37)
+	at org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRepositoryManager.factoryLoad(ArtifactRepositoryManager.java:73)
+	at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.loadRepository(AbstractRepositoryManager.java:768)
+	at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.loadRepository(AbstractRepositoryManager.java:668)
+	at org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRepositoryManager.loadRepository(ArtifactRepositoryManager.java:104)
+	at org.eclipse.equinox.p2.internal.repository.tools.RecreateRepositoryApplication.initialize(RecreateRepositoryApplication.java:61)
+	at org.eclipse.equinox.p2.internal.repository.tools.RecreateRepositoryApplication.run(RecreateRepositoryApplication.java:40)
+	at org.eclipse.tycho.p2.tools.mirroring.MirrorApplicationServiceImpl.mirrorReactor(MirrorApplicationServiceImpl.java:171)
+	at org.eclipse.tycho.plugins.p2.repository.AssembleRepositoryMojo.execute(AssembleRepositoryMojo.java:144)
+	at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:137)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:154)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:146)
+	at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:117)
+	at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:81)
+	at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:56)
+	at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:128)
+	at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:305)
+	at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:192)
+	at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:105)
+	at org.apache.maven.cli.MavenCli.execute(MavenCli.java:954)
+	at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:288)
+	at org.apache.maven.cli.MavenCli.main(MavenCli.java:192)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:289)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:229)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:415)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:356)
+
+!ENTRY org.eclipse.equinox.p2.artifact.repository 4 0 2018-12-20 20:22:29.290
+!MESSAGE Unexpected error loading extension: org.eclipse.equinox.p2.artifact.repository.XZedRepository
+!STACK 0
+java.lang.NullPointerException
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository.isLocal(SimpleArtifactRepository.java:1058)
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository.isModifiable(SimpleArtifactRepository.java:1062)
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.XZedSimpleArtifactRepositoryFactory.load(XZedSimpleArtifactRepositoryFactory.java:89)
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.XZedSimpleArtifactRepositoryFactory.load(XZedSimpleArtifactRepositoryFactory.java:37)
+	at org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRepositoryManager.factoryLoad(ArtifactRepositoryManager.java:73)
+	at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.loadRepository(AbstractRepositoryManager.java:768)
+	at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.loadRepository(AbstractRepositoryManager.java:668)
+	at org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRepositoryManager.loadRepository(ArtifactRepositoryManager.java:104)
+	at org.eclipse.equinox.p2.internal.repository.tools.RecreateRepositoryApplication.initialize(RecreateRepositoryApplication.java:61)
+	at org.eclipse.equinox.p2.internal.repository.tools.RecreateRepositoryApplication.run(RecreateRepositoryApplication.java:40)
+	at org.eclipse.tycho.p2.tools.mirroring.MirrorApplicationServiceImpl.mirrorReactor(MirrorApplicationServiceImpl.java:171)
+	at org.eclipse.tycho.plugins.p2.repository.AssembleRepositoryMojo.execute(AssembleRepositoryMojo.java:144)
+	at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:137)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:154)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:146)
+	at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:117)
+	at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:81)
+	at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:56)
+	at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:128)
+	at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:305)
+	at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:192)
+	at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:105)
+	at org.apache.maven.cli.MavenCli.execute(MavenCli.java:954)
+	at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:288)
+	at org.apache.maven.cli.MavenCli.main(MavenCli.java:192)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:289)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:229)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:415)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:356)
+
+!ENTRY org.eclipse.equinox.p2.artifact.repository 4 0 2018-12-20 20:22:29.616
+!MESSAGE Unexpected error loading extension: org.eclipse.equinox.p2.artifact.repository.XZedRepository
+!STACK 0
+java.lang.NullPointerException
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository.isLocal(SimpleArtifactRepository.java:1058)
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository.isModifiable(SimpleArtifactRepository.java:1062)
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.XZedSimpleArtifactRepositoryFactory.load(XZedSimpleArtifactRepositoryFactory.java:89)
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.XZedSimpleArtifactRepositoryFactory.load(XZedSimpleArtifactRepositoryFactory.java:37)
+	at org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRepositoryManager.factoryLoad(ArtifactRepositoryManager.java:73)
+	at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.loadRepository(AbstractRepositoryManager.java:768)
+	at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.loadRepository(AbstractRepositoryManager.java:668)
+	at org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRepositoryManager.loadRepository(ArtifactRepositoryManager.java:104)
+	at org.eclipse.equinox.p2.internal.repository.tools.RecreateRepositoryApplication.initialize(RecreateRepositoryApplication.java:61)
+	at org.eclipse.equinox.p2.internal.repository.tools.RecreateRepositoryApplication.run(RecreateRepositoryApplication.java:40)
+	at org.eclipse.tycho.p2.tools.mirroring.MirrorApplicationServiceImpl.mirrorReactor(MirrorApplicationServiceImpl.java:171)
+	at org.eclipse.tycho.plugins.p2.repository.AssembleRepositoryMojo.execute(AssembleRepositoryMojo.java:144)
+	at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:137)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:154)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:146)
+	at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:117)
+	at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:81)
+	at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:56)
+	at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:128)
+	at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:305)
+	at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:192)
+	at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:105)
+	at org.apache.maven.cli.MavenCli.execute(MavenCli.java:954)
+	at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:288)
+	at org.apache.maven.cli.MavenCli.main(MavenCli.java:192)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:289)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:229)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:415)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:356)
+
+!ENTRY org.eclipse.equinox.p2.artifact.repository 4 0 2018-12-20 20:22:41.887
+!MESSAGE Unexpected error loading extension: org.eclipse.equinox.p2.artifact.repository.XZedRepository
+!STACK 0
+java.lang.NullPointerException
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository.isLocal(SimpleArtifactRepository.java:1058)
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository.isModifiable(SimpleArtifactRepository.java:1062)
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.XZedSimpleArtifactRepositoryFactory.load(XZedSimpleArtifactRepositoryFactory.java:89)
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.XZedSimpleArtifactRepositoryFactory.load(XZedSimpleArtifactRepositoryFactory.java:37)
+	at org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRepositoryManager.factoryLoad(ArtifactRepositoryManager.java:73)
+	at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.loadRepository(AbstractRepositoryManager.java:768)
+	at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.loadRepository(AbstractRepositoryManager.java:668)
+	at org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRepositoryManager.loadRepository(ArtifactRepositoryManager.java:104)
+	at org.eclipse.equinox.p2.internal.repository.tools.RecreateRepositoryApplication.initialize(RecreateRepositoryApplication.java:61)
+	at org.eclipse.equinox.p2.internal.repository.tools.RecreateRepositoryApplication.run(RecreateRepositoryApplication.java:40)
+	at org.eclipse.tycho.p2.tools.mirroring.MirrorApplicationServiceImpl.mirrorReactor(MirrorApplicationServiceImpl.java:171)
+	at org.eclipse.tycho.plugins.p2.repository.AssembleRepositoryMojo.execute(AssembleRepositoryMojo.java:144)
+	at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:137)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:154)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:146)
+	at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:117)
+	at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:81)
+	at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:56)
+	at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:128)
+	at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:305)
+	at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:192)
+	at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:105)
+	at org.apache.maven.cli.MavenCli.execute(MavenCli.java:954)
+	at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:288)
+	at org.apache.maven.cli.MavenCli.main(MavenCli.java:192)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:289)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:229)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:415)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:356)
+
+!ENTRY org.eclipse.equinox.p2.artifact.repository 4 0 2018-12-20 20:22:46.548
+!MESSAGE Unexpected error loading extension: org.eclipse.equinox.p2.artifact.repository.XZedRepository
+!STACK 0
+java.lang.NullPointerException
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository.isLocal(SimpleArtifactRepository.java:1058)
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository.isModifiable(SimpleArtifactRepository.java:1062)
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.XZedSimpleArtifactRepositoryFactory.load(XZedSimpleArtifactRepositoryFactory.java:89)
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.XZedSimpleArtifactRepositoryFactory.load(XZedSimpleArtifactRepositoryFactory.java:37)
+	at org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRepositoryManager.factoryLoad(ArtifactRepositoryManager.java:73)
+	at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.loadRepository(AbstractRepositoryManager.java:768)
+	at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.loadRepository(AbstractRepositoryManager.java:668)
+	at org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRepositoryManager.loadRepository(ArtifactRepositoryManager.java:104)
+	at org.eclipse.equinox.p2.internal.repository.tools.RecreateRepositoryApplication.initialize(RecreateRepositoryApplication.java:61)
+	at org.eclipse.equinox.p2.internal.repository.tools.RecreateRepositoryApplication.run(RecreateRepositoryApplication.java:40)
+	at org.eclipse.tycho.p2.tools.mirroring.MirrorApplicationServiceImpl.mirrorReactor(MirrorApplicationServiceImpl.java:171)
+	at org.eclipse.tycho.plugins.p2.repository.AssembleRepositoryMojo.execute(AssembleRepositoryMojo.java:144)
+	at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:137)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:154)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:146)
+	at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:117)
+	at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:81)
+	at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:56)
+	at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:128)
+	at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:305)
+	at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:192)
+	at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:105)
+	at org.apache.maven.cli.MavenCli.execute(MavenCli.java:954)
+	at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:288)
+	at org.apache.maven.cli.MavenCli.main(MavenCli.java:192)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:289)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:229)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:415)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:356)
+
+!ENTRY org.eclipse.equinox.p2.artifact.repository 4 0 2018-12-20 20:22:51.617
+!MESSAGE Unexpected error loading extension: org.eclipse.equinox.p2.artifact.repository.XZedRepository
+!STACK 0
+java.lang.NullPointerException
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository.isLocal(SimpleArtifactRepository.java:1058)
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository.isModifiable(SimpleArtifactRepository.java:1062)
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.XZedSimpleArtifactRepositoryFactory.load(XZedSimpleArtifactRepositoryFactory.java:89)
+	at org.eclipse.equinox.internal.p2.artifact.repository.simple.XZedSimpleArtifactRepositoryFactory.load(XZedSimpleArtifactRepositoryFactory.java:37)
+	at org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRepositoryManager.factoryLoad(ArtifactRepositoryManager.java:73)
+	at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.loadRepository(AbstractRepositoryManager.java:768)
+	at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.loadRepository(AbstractRepositoryManager.java:668)
+	at org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRepositoryManager.loadRepository(ArtifactRepositoryManager.java:104)
+	at org.eclipse.equinox.p2.internal.repository.tools.RecreateRepositoryApplication.initialize(RecreateRepositoryApplication.java:61)
+	at org.eclipse.equinox.p2.internal.repository.tools.RecreateRepositoryApplication.run(RecreateRepositoryApplication.java:40)
+	at org.eclipse.tycho.p2.tools.mirroring.MirrorApplicationServiceImpl.mirrorReactor(MirrorApplicationServiceImpl.java:171)
+	at org.eclipse.tycho.plugins.p2.repository.AssembleRepositoryMojo.execute(AssembleRepositoryMojo.java:144)
+	at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:137)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:154)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:146)
+	at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:117)
+	at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:81)
+	at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:56)
+	at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:128)
+	at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:305)
+	at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:192)
+	at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:105)
+	at org.apache.maven.cli.MavenCli.execute(MavenCli.java:954)
+	at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:288)
+	at org.apache.maven.cli.MavenCli.main(MavenCli.java:192)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:289)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:229)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:415)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:356)
+
+!ENTRY org.eclipse.equinox.p2.artifact.repository 4 0 2018-12-20 20:22:56.654
+!MESSAGE Unexpected error loading extension: org.eclipse.equinox.p2.artifact.repository.XZedRepository
+!STACK 0
+java.lang.NullPointerException
+!SESSION 2018-12-20 20:26:18.565 -----------------------------------------------
+eclipse.buildId=unknown
+java.version=1.8.0_144
+java.vendor=Oracle Corporation
+BootLoader constants: OS=macosx, ARCH=x86_64, WS=cocoa, NL=en_US
+Framework arguments:  -eclipse.keyring /var/folders/jf/91nyxlgj7153brj7p1qwsp2h0000gn/T/tycho8415701176386513316secure_storage
+Command-line arguments:  -eclipse.keyring /var/folders/jf/91nyxlgj7153brj7p1qwsp2h0000gn/T/tycho8415701176386513316secure_storage
+
+!ENTRY org.eclipse.core.net 1 0 2018-12-20 20:26:18.565
+!MESSAGE System property http.nonProxyHosts has been set to local|*.local|169.254/16|*.169.254/16 by an external source. This value will be overwritten using the values from the preferences