Bug 516177 - [Toolsmiths][userxp] group new File under two new folders

Actions
-declaration of secundary category
-migration of new element into category

Tests
-start runtime and check the presence of menu

Change-Id: I17b94d34b2a6b105c907aea3a83b06b10a947a15
Signed-off-by: Francois Le Fevre <francois.le-fevre@cea.fr>

5 files changed, 24 insertions, 26 deletions

diff --git a/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/plugin.properties b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/plugin.properties
index bc7f204d90b..948f551122d 100644
--- a/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/plugin.properties
+++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/plugin.properties
@@ -10,3 +10,5 @@
 ##################################################################################

 pluginName=Papyrus sashwindows full editor example 

 providerName=Cedric Dumoulin

+

+wizardSash= Papyrus Sash Windows Full Editor

diff --git a/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/plugin.xml b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/plugin.xml
index c019e9ef449..e547bc1f9dd 100644
--- a/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/plugin.xml
+++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/plugin.xml
@@ -23,14 +23,11 @@
    </extension>

    <extension

          point="org.eclipse.ui.newWizards">

-      <category

-            id="org.eclipse.papyrus.example.sashwindows"

-            name="Sash Windows Examples">

-      </category>

+          <!-- @generated NOT -->

       <wizard

-            name="Sash Windows Full Editor"

+            name="%wizardSash"

             icon="icons/sample.gif"

-            category="org.eclipse.papyrus.example.sashwindows"

+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.examples"

             class="org.eclipse.papyrus.example.core.sashwindows.fulleditor.wizards.MultiTextNewWizard"

             id="org.eclipse.papyrus.example.sashwindows.wizards.FullEditor">

       </wizard>

diff --git a/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/plugin.properties b/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/plugin.properties
index 8c92069cf64..fb22c992bf0 100644
--- a/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/plugin.properties
+++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/plugin.properties
@@ -1,12 +1,14 @@
-#################################################################################

-# Copyright (c) 2008 CEA LIST.

-# 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:

-#     Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

-##################################################################################

-pluginName=Papyrus sashwindows simple editor example  

-providerName=Cedric Dumoulin

+#################################################################################
+# Copyright (c) 2008 CEA LIST.
+# 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:
+#     Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+##################################################################################
+pluginName=Papyrus sashwindows simple editor example  
+providerName=Eclipse Modeling Project
+
+wizardSash=Sash Windows Simple Editor
diff --git a/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/plugin.xml b/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/plugin.xml
index 2ac9da5a09f..6005740a446 100644
--- a/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/plugin.xml
+++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/plugin.xml
@@ -15,14 +15,11 @@
    </extension>

    <extension

          point="org.eclipse.ui.newWizards">

-      <category

-            name="Sash Windows Examples"

-            id="org.eclipse.papyrus.example.sashwindows">

-      </category>

+          <!-- @generated NOT -->

       <wizard

-            name="Sash Windows Simple Editor"

+            name="%wizardSash"

             icon="icons/sample.gif"

-            category="org.eclipse.papyrus.example.sashwindows"

+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.examples"

             class="org.eclipse.papyrus.example.core.sashwindows.simpleeditor.wizards.MultiPageEditorNewWizard"

             id="org.eclipse.papyrus.example.sashwindows.wizards.SimpleEditor">

       </wizard>

diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/plugin.xml b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/plugin.xml
index 15ab7bdf033..d0461bb76ac 100644
--- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/plugin.xml
+++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/plugin.xml
@@ -560,11 +560,11 @@
    </extension>
 
 <extension point="org.eclipse.ui.newWizards" id="creation-wizard">
-      <?gmfgen generated="true"?>
+      <?gmfgen generated="false"?>
       <wizard
          name="%newWizardName"
          icon="icons/obj16/UMLDiagramFile.gif"
-         category="org.eclipse.ui.Examples"
+         category="org.eclipse.papyrus.examples"
          class="org.eclipse.papyrus.example.diagram.simplediagram.part.UMLCreationWizard"
          id="org.eclipse.papyrus.example.diagram.simplediagram.part.UMLCreationWizardID">
          <description>%newWizardDesc</description>