Updated to support new AAL Studio core menu system and feature now uses the common branding plugin

transformations/org.universaal.tools.transformationcommand/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Transformation Command
 Bundle-SymbolicName: org.universaal.tools.transformationcommand;singleton:=true
-Bundle-Version: 0.2.1
+Bundle-Version: 0.2.2
 Bundle-Vendor: universAAL
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.resources;bundle-version="3.0.0",

transformations/org.universaal.tools.transformationcommand/plugin.xml

@@ -71,17 +71,12 @@
    <extension
          point="org.eclipse.ui.menus">
       <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu?after=additions">
-         <menu
-               label="AAL Studio"
-               mnemonic="U"
-               id="org.universaal.tools.AALStudio.menu">
-            <command
-                  commandId="org.universaal.tools.transformationcommand.commands.ontUML2Java"
-                  id="org.universaal.tools.transformationcommand.menu.ontUML2Java"
-                  style="push">
-            </command>
-         </menu>
+            locationURI="menu:org.universaal.tools.AALStudio.menu?after=transform">
+         <command
+               commandId="org.universaal.tools.transformationcommand.commands.ontUML2Java"
+               id="org.universaal.tools.transformationcommand.menu.ontUML2Java"
+               style="push">
+         </command>
       </menuContribution>
       <menuContribution
             locationURI="popup:org.eclipse.ui.popup.any?after=additions">
@@ -120,15 +115,16 @@
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
-            category="org.universaal.tools.AALStudio"
+            category="org.universaal.tools.transformationcommand.transformations"
             class="org.universaal.tools.transformationcommand.preferences.Uml2JavaPreferencePage"
             id="org.universaal.tools.transformationcommand.uml2java"
             name="Transform UML2Java">
       </page>
       <page
-            class="org.universaal.tools.transformationcommand.preferences.PreferencePageRoot"
-            id="org.universaal.tools.AALStudio"
-            name="AAL Studio">
+            category="org.universaal.tools.AALStudio"
+            class="org.universaal.tools.transformationcommand.preferences.TransformationsPreferencePage"
+            id="org.universaal.tools.transformationcommand.transformations"
+            name="Transformations">
       </page>
    </extension>
    <extension

transformations/org.universaal.tools.transformationcommand/src/org/universaal/tools/transformationcommand/preferences/PreferencePageRoot.java → transformations/org.universaal.tools.transformationcommand/src/org/universaal/tools/transformationcommand/preferences/TransformationsPreferencePage.java

-package org.universaal.tools.transformationcommand.preferences;
-
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.universaal.tools.transformationcommand.activator.Activator;
-
-public class PreferencePageRoot
-		extends FieldEditorPreferencePage
-		implements IWorkbenchPreferencePage {
-	
-	public PreferencePageRoot() {
-		super(GRID);
-		setPreferenceStore(Activator.getDefault().getPreferenceStore());
-		setDescription("Please see subcategories for options related to different " +
-				"kinds of transformation commands.");
-	}
-
-	@Override
-	public void init(IWorkbench workbench) {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	protected void createFieldEditors() {
-		// TODO Auto-generated method stub
-
+package org.universaal.tools.transformationcommand.preferences;
+
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.universaal.tools.transformationcommand.activator.Activator;
+
+public class TransformationsPreferencePage extends FieldEditorPreferencePage
+		implements IWorkbenchPreferencePage {
+
+	public TransformationsPreferencePage() {
+		super(GRID);
+		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setDescription("Please see subcategories for options related to each transformation");
+	}
+
+	@Override
+	public void init(IWorkbench workbench) {
+		// Intentionally left blank
+	}
+
+	@Override
+	protected void createFieldEditors() {
+		// Intentionally left blank
+	}
+
+}
\ No newline at end of file
-	}
-
-}

transformations/org.universaal.tools.transformationcommand/src/org/universaal/tools/transformationcommand/preferences/Uml2JavaPreferencePage.java

@@ -13,15 +13,15 @@ public class Uml2JavaPreferencePage
 extends FieldEditorPreferencePage
 implements IWorkbenchPreferencePage {
 
-	StringFieldEditor absolutePath;
+	StringFieldEditor pathName;
 	BooleanFieldEditor absoluteBoolean;
 
 	public Uml2JavaPreferencePage() {
 		super(GRID);
 		setPreferenceStore(Activator.getDefault().getPreferenceStore());
 		setDescription("Please enter a path for the files to be saved to. " +
-				"If \" Use absolute path\" is not checked, the files will be put in " +
-				"the project folder.");
+				"If \" Use absolute path\" is not checked, the path refers to a folder " +
+				"relative to the project folder.");
 	}
 
 	@Override
@@ -31,10 +31,10 @@ implements IWorkbenchPreferencePage {
 	@Override
 	protected void createFieldEditors() {
 		absoluteBoolean = new BooleanFieldEditor(PreferenceConstants.P_UML2JAVA_ABSOLUTE_BOOLEAN, "Use absolute path.", getFieldEditorParent());
-		absolutePath = new StringFieldEditor(PreferenceConstants.P_UML2JAVA_PATH, "Please enter the desired path.", getFieldEditorParent());
+		pathName = new StringFieldEditor(PreferenceConstants.P_UML2JAVA_PATH, "Please enter the desired path.", getFieldEditorParent());
 
 		addField(absoluteBoolean);
-		addField(absolutePath);
+		addField(pathName);
 
 
 	}

transformations/org.universaal.tools.transformationcommand/transformations/ontUML2Java.m2t

@@ -203,6 +203,7 @@ public interface ' ontologyName 'Namespace {
     // Import universAAL packages. 
     // Note that generator currently imports a fixed set of classes. This will be improved in the future 
     'import org.universAAL.middleware.owl.Restriction;\n'
+	'import org.universAAL.middleware.rdf.TypeMapper;\n'
     'import org.universAAL.middleware.service.owl.Service;\n'    
     'import org.universAAL.ontology.phThing.Device;\n\n'
   }

transformations/org.universaal.tools.transformationfeature/feature.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.universaal.tools.transformationfeature"
-      label="universAAL Transformations"
-      version="0.2.1"
-      provider-name="universAAL">
+      label="AAL Studio Transformations"
+      version="0.2.2"
+      provider-name="universAAL"
+      plugin="org.universaal.tools.aalstudio.core">
 
    <description url="http://www.universaal.org/">
       This feature contains transformations supporting modelling based
@@ -236,7 +237,8 @@ development for the universAAL platform.
    </url>
 
    <requires>
-      <import feature="org.eclipse.mofscript" version="1.3" match="greaterOrEqual"/>
+      <import feature="org.eclipse.mofscript" version="1.4.0" match="greaterOrEqual"/>
+      <import feature="org.universaal.tools.aalstudio.feature" version="0.3.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin