Adding Humanoid concepts to the palette

6 files changed, 29 insertions, 34 deletions

diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/palettes/componentdef.palette.xml b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/palettes/componentdef.palette.xml
index c8cd6b7333e..d85152667e3 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/palettes/componentdef.palette.xml
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/palettes/componentdef.palette.xml
@@ -116,46 +116,41 @@
 			</drawer>
 			<drawer
 			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-			id="org.eclipse.papyrus.robotml.diagram.componentdef.ROBOTML_Componentdef__Actuators"
-			name="Actuators">
-			<aspectTool description="Create a new ActuatorSystem"
-				id="componentdef.tool.actuator" name="Actuator"
+			id="org.eclipse.papyrus.robotml.diagram.componentdef.ROBOTML_Componentdef__Humanoid"
+			name="Humanoid Components">
+			<aspectTool description="Create a new LegSystem"
+				id="componentdef.tool.leg" name="Leg"
 				refToolId="composite.tool.class"
 				iconpath="platform:/plugin/org.eclipse.papyrus.robotml/icons/16x16/13_action.png">
 				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
 					<stereotypesToApply>
-						<stereotype stereotypeName="RobotML::ActuatorSystem"></stereotype>
+						<stereotype stereotypeName="RobotML::LegSystem"></stereotype>
 					</stereotypesToApply>
 				</postAction>
 				<postAction
 					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"
 					displayKind="IconStereotype" displayPlace="Compartment"></postAction>
-			</aspectTool>
-			
-			<aspectTool description="Create a new WheelSystem"
-				id="componentdef.tool.WheelSystem" name="WheelSystem"
+			</aspectTool>	
+			<aspectTool description="Create a new RoboticHead"
+				id="componentdef.tool.head" name="Head"
 				refToolId="composite.tool.class"
-				iconpath="platform:/plugin/org.eclipse.papyrus.robotml/icons/16x16/15_wheel_system.png">
+				iconpath="platform:/plugin/org.eclipse.papyrus.robotml/icons/16x16/13_action.png">
 				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
 					<stereotypesToApply>
-						<stereotype stereotypeName="RobotML::WheelSystem"></stereotype>
+						<stereotype stereotypeName="RobotML::RoboticHead"></stereotype>
 					</stereotypesToApply>
 				</postAction>
 				<postAction
 					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"
 					displayKind="IconStereotype" displayPlace="Compartment"></postAction>
 			</aspectTool>
-			<aspectTool description="Create a new EngineSystem"
-				id="componentdef.tool.EngineSystem" name="EngineSystem"
+		<aspectTool description="Create a new GraspingSystem"
+				id="componentdef.tool.head" name="Grasping System"
 				refToolId="composite.tool.class"
-				iconpath="platform:/plugin/org.eclipse.papyrus.robotml/icons/16x16/14_engine_system.png">
+				iconpath="platform:/plugin/org.eclipse.papyrus.robotml/icons/16x16/13_action.png">
 				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
 					<stereotypesToApply>
-						<stereotype stereotypeName="RobotML::EngineSystem">
-						<property propertyName="RobotML::EngineSystem::maxEngineForce">
-						<value>1.5</value>
-						</property>
-						</stereotype>
+						<stereotype stereotypeName="RobotML::GraspingSystem"></stereotype>
 					</stereotypesToApply>
 				</postAction>
 				<postAction
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ClassPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ClassPreferencePage.java
index 068bf2349a2..8971a69387a 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ClassPreferencePage.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ClassPreferencePage.java
@@ -16,7 +16,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;
 
 public class ClassPreferencePage extends ComponentdefDiagramNodePreferencePage {
@@ -59,13 +59,13 @@ public class ClassPreferencePage extends ComponentdefDiagramNodePreferencePage {
 		// set the true value for the compartment visibility
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
 		}
 
 		// Initialize default title visibility for compartments in preference page.
 		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentPreferencePage.java
index 9f133047ced..ab4dac5b8ee 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentPreferencePage.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentPreferencePage.java
@@ -16,7 +16,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;
 
 
@@ -59,13 +59,13 @@ public class ComponentPreferencePage extends ComponentdefDiagramNodePreferencePa
 
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
 		}
 
 		// Initialize default title visibility for compartments in preference page.
 		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PackagePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PackagePreferencePage.java
index 9bf364bed4b..cf7a560c739 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PackagePreferencePage.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PackagePreferencePage.java
@@ -12,7 +12,7 @@
 package org.eclipse.papyrus.robotml.diagram.componentdef.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;
 
 public class PackagePreferencePage extends ComponentdefDiagramNodePreferencePage {
@@ -30,11 +30,11 @@ public class PackagePreferencePage extends ComponentdefDiagramNodePreferencePage
 	}
 
 	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 200);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		// set the true value for the compartment visibility
 		for(String name : compartments) {
-			String preferenceName = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(preferenceName, true);
 		}
 	}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PortPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PortPreferencePage.java
index 54e9c630c08..1b690d02dfe 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PortPreferencePage.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PortPreferencePage.java
@@ -12,7 +12,7 @@
 package org.eclipse.papyrus.robotml.diagram.componentdef.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;
 
 public class PortPreferencePage extends ComponentdefDiagramNodePreferencePage {
@@ -26,8 +26,8 @@ public class PortPreferencePage extends ComponentdefDiagramNodePreferencePage {
 	}
 
 	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 20);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 20);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 20);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 20);
 	}
 
 }
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PropertyPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PropertyPreferencePage.java
index 007277ea548..2394468a886 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PropertyPreferencePage.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PropertyPreferencePage.java
@@ -12,7 +12,7 @@
 package org.eclipse.papyrus.robotml.diagram.componentdef.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart;
 
 public class PropertyPreferencePage extends ComponentdefDiagramNodePreferencePage {
@@ -32,7 +32,7 @@ public class PropertyPreferencePage extends ComponentdefDiagramNodePreferencePag
 	public static void initDefaults(IPreferenceStore store) {
 		// set the true value for the compartment visibility
 		for(String name : compartments) {
-			String preferenceName = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(preferenceName, true);
 		}
 	}