[482528] Organize menu items in VSM editor

Tweak the items' priorities and organize them in more meaningful
categories.

Bug: 482528
Change-Id: Ie312c82d3fd2a3f1832d74d3b45d6d3938acd770
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

6 files changed, 163 insertions, 0 deletions

diff --git a/incubation/org.eclipse.sirius.editor.properties/.classpath b/incubation/org.eclipse.sirius.editor.properties/.classpath
index 6db874af86..1aef1409b2 100644
--- a/incubation/org.eclipse.sirius.editor.properties/.classpath
+++ b/incubation/org.eclipse.sirius.editor.properties/.classpath
@@ -6,6 +6,7 @@
 		</accessrules>
 	</classpathentry>
 	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/incubation/org.eclipse.sirius.editor.properties/plugin.xml b/incubation/org.eclipse.sirius.editor.properties/plugin.xml
index 8d5ad1159d..cac5aea39d 100644
--- a/incubation/org.eclipse.sirius.editor.properties/plugin.xml
+++ b/incubation/org.eclipse.sirius.editor.properties/plugin.xml
@@ -564,6 +564,12 @@
 
 <!-- Start of user code plugin.xml end specifics  -->
 
+  <extension point="org.eclipse.sirius.editor.menuBuilder">
+     <builder class="org.eclipse.sirius.editor.properties.tools.internal.menu.WidgetsMenuBuilder" />
+     <builder class="org.eclipse.sirius.editor.properties.tools.internal.menu.StyleMenuBuilder" />
+     <builder class="org.eclipse.sirius.editor.properties.tools.internal.menu.LayoutMenuBuilder" />
+  </extension>
+  
   <extension point="org.eclipse.help.contexts">
      <contexts file="help/contexts.xml" plugin="org.eclipse.sirius.properties">
      </contexts>
diff --git a/incubation/org.eclipse.sirius.editor.properties/src/org/eclipse/sirius/editor/properties/tools/internal/menu/LayoutMenuBuilder.java b/incubation/org.eclipse.sirius.editor.properties/src/org/eclipse/sirius/editor/properties/tools/internal/menu/LayoutMenuBuilder.java
new file mode 100644
index 0000000000..1a9cb06dbc
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src/org/eclipse/sirius/editor/properties/tools/internal/menu/LayoutMenuBuilder.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * 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:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.editor.properties.tools.internal.menu;
+
+import org.eclipse.sirius.editor.tools.api.menu.AbstractMenuBuilder;
+import org.eclipse.sirius.editor.tools.api.menu.AbstractTypeRestrictingMenuBuilder;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+public class LayoutMenuBuilder extends AbstractTypeRestrictingMenuBuilder {
+    /**
+     * Create the menu.
+     */
+    public LayoutMenuBuilder() {
+        addValidType(PropertiesPackage.eINSTANCE.getLayoutDescription());
+    }
+
+    @Override
+    public String getLabel() {
+        return "New Layout";
+    }
+
+    @Override
+    public int getPriority() {
+        return AbstractMenuBuilder.LAYOUT;
+    }
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src/org/eclipse/sirius/editor/properties/tools/internal/menu/StyleMenuBuilder.java b/incubation/org.eclipse.sirius.editor.properties/src/org/eclipse/sirius/editor/properties/tools/internal/menu/StyleMenuBuilder.java
new file mode 100644
index 0000000000..8e5c0fb2f4
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src/org/eclipse/sirius/editor/properties/tools/internal/menu/StyleMenuBuilder.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * 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:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.editor.properties.tools.internal.menu;
+
+import org.eclipse.sirius.editor.tools.api.menu.AbstractMenuBuilder;
+import org.eclipse.sirius.editor.tools.api.menu.AbstractTypeRestrictingMenuBuilder;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+public class StyleMenuBuilder extends AbstractTypeRestrictingMenuBuilder {
+    /**
+     * Create the menu.
+     */
+    public StyleMenuBuilder() {
+        addValidType(PropertiesPackage.eINSTANCE.getGroupStyle());
+        addValidType(PropertiesPackage.eINSTANCE.getGroupConditionalStyle());
+        addValidType(PropertiesPackage.eINSTANCE.getWidgetStyle());
+        addValidType(PropertiesPackage.eINSTANCE.getWidgetConditionalStyle());
+    }
+
+    @Override
+    public String getLabel() {
+        return "New Style";
+    }
+
+    @Override
+    public int getPriority() {
+        return AbstractMenuBuilder.STYLE;
+    }
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src/org/eclipse/sirius/editor/properties/tools/internal/menu/WidgetsMenuBuilder.java b/incubation/org.eclipse.sirius.editor.properties/src/org/eclipse/sirius/editor/properties/tools/internal/menu/WidgetsMenuBuilder.java
new file mode 100644
index 0000000000..8b097f142d
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src/org/eclipse/sirius/editor/properties/tools/internal/menu/WidgetsMenuBuilder.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * 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:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.editor.properties.tools.internal.menu;
+
+import org.eclipse.sirius.editor.tools.api.menu.AbstractMenuBuilder;
+import org.eclipse.sirius.editor.tools.api.menu.AbstractTypeRestrictingMenuBuilder;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+public class WidgetsMenuBuilder extends AbstractTypeRestrictingMenuBuilder {
+    /**
+     * Create the menu.
+     */
+    public WidgetsMenuBuilder() {
+        super();
+        addValidType(PropertiesPackage.eINSTANCE.getWidgetDescription());
+    }
+
+    @Override
+    public String getLabel() {
+        return "New Widget";
+    }
+
+    @Override
+    public int getPriority() {
+        return AbstractMenuBuilder.DIAGRAM_ELEMENT;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.editor/plugin.properties b/plugins/org.eclipse.sirius.editor/plugin.properties
index b842c72737..9e8a25b83d 100644
--- a/plugins/org.eclipse.sirius.editor/plugin.properties
+++ b/plugins/org.eclipse.sirius.editor/plugin.properties
@@ -310,4 +310,54 @@ viewpoint.description.tool.ExternalJavaActionCall = 14000
 viewpoint.description.tool.Case = 1000
 viewpoint.description.tool.Default = 2000
 
+# On Properties View Description
+properties.PageDescription = 1000
+properties.GroupDescription = 2000
+
+# On Group Description > New Widget...
+properties.TextDescription = 1000
+properties.CheckboxDescription = 2000
+properties.RadioDescription = 3000
+properties.SelectDescription = 4000
+properties.TextAreaDescription = 5000
+properties.LabelDescription = 6000
+properties.ReferenceDescription = 7000
+properties.HyperlinkDescription = 8000
+properties.ButtonDescription = 9000
+properties.CustomDescription = 10000
+
+# On New...
+properties.ContainerDescription = 11000
+properties.DynamicMappingFor = 11000
+properties.GroupValidationSetDescription = 14000
+
+# On Custom Description > New...
+properties.CustomExpression = 1000
+properties.CustomOperation = 2000
+
+# Put all conditional styles after plain styles
+properties.GroupConditionalStyle = 2000
+properties.GroupStyle = 1000
+properties.ButtonWidgetConditionalStyle = 2000
+properties.ButtonWidgetStyle = 1000
+properties.CheckboxWidgetConditionalStyle = 2000
+properties.CheckboxWidgetStyle = 1000
+properties.CustomWidgetConditionalStyle = 2000
+properties.CustomWidgetStyle = 1000
+properties.GroupConditionalStyle = 2000
+properties.GroupStyle = 1000
+properties.HyperlinkWidgetConditionalStyle = 2000
+properties.HyperlinkWidgetStyle = 1000
+properties.LabelWidgetConditionalStyle = 2000
+properties.LabelWidgetStyle = 1000
+properties.RadioWidgetConditionalStyle = 2000
+properties.RadioWidgetStyle = 1000
+properties.ReferenceWidgetConditionalStyle = 2000
+properties.ReferenceWidgetStyle = 1000
+properties.SelectWidgetConditionalStyle = 2000
+properties.SelectWidgetStyle = 1000
+properties.TextWidgetConditionalStyle = 2000
+properties.TextWidgetStyle = 1000
+properties.WidgetStyle = 1000
+
 #End of user code specific keys