diff options
35 files changed, 103 insertions, 140 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> diff --git a/extraplugins/soaml/org.eclipse.papyrus.soaml.diagram.ui/plugin.properties b/extraplugins/soaml/org.eclipse.papyrus.soaml.diagram.ui/plugin.properties index e2fa2b2c4c5..f15defc9fd9 100644 --- a/extraplugins/soaml/org.eclipse.papyrus.soaml.diagram.ui/plugin.properties +++ b/extraplugins/soaml/org.eclipse.papyrus.soaml.diagram.ui/plugin.properties @@ -1,5 +1,5 @@ #Properties file for org.eclipse.papyrus.soaml.diagram.ui
Bundle-Provider = Eclipse Modeling Project
Bundle-Name = SoaML wizard
-wizardModel=papyrus SoaML Model
-wizardProject=papyrus SoaML Project
\ No newline at end of file +wizardModel=Papyrus SoaML Model
+wizardProject=Papyrus SoaML Project
\ No newline at end of file diff --git a/extraplugins/soaml/org.eclipse.papyrus.soaml.diagram.ui/plugin.xml b/extraplugins/soaml/org.eclipse.papyrus.soaml.diagram.ui/plugin.xml index 144980f4311..75e221a15f0 100644 --- a/extraplugins/soaml/org.eclipse.papyrus.soaml.diagram.ui/plugin.xml +++ b/extraplugins/soaml/org.eclipse.papyrus.soaml.diagram.ui/plugin.xml @@ -3,9 +3,10 @@ <plugin> <extension point="org.eclipse.ui.newWizards"> + <!-- @generated NOT --> <wizard canFinishEarly="false" - category="org.eclipse.papyrus.wizards.category" + category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.components.category" class="org.eclipse.papyrus.soaml.diagram.ui.NewSoamlModelWizard" finalPerspective="org.eclipse.papyrus.infra.core.perspective" icon="icons/soaml16x16.png" diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/plugin.properties b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/plugin.properties index bf9d9a9c84f..87822b3d1d6 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/plugin.properties +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/plugin.properties @@ -36,8 +36,6 @@ _UI_MultiObjectSelected = Selected {0} Objects _UI_OpenEditorError_label = Open Editor
-_UI_Wizard_category = Example EMF Model Creation Wizards
-
_UI_CreateModelError_message = Problems encountered in file "{0}"
_UI_CustomModelWizard_label = Custom Model
diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/plugin.xml b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/plugin.xml index ed9a7acb236..5c257f1ff98 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/plugin.xml +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/plugin.xml @@ -18,14 +18,12 @@ <plugin>
<extension point="org.eclipse.ui.newWizards">
- <category
- id="org.eclipse.emf.ecore.Wizard.category.ID"
- name="%_UI_Wizard_category"/>
+ <!-- @generated NOT -->
<wizard
id="org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.presentation.CustomModelWizardID"
name="%_UI_CustomModelWizard_label"
class="org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.presentation.CustomModelWizard"
- category="org.eclipse.emf.ecore.Wizard.category.ID"
+ category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.addons.category"
icon="icons/full/obj16/CustomModelFile.gif">
<description>%_UI_CustomModelWizard_description</description>
<selection class="org.eclipse.core.resources.IResource"/>
diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/plugin.properties b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/plugin.properties index b443b6befd6..1e6cea384d2 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/plugin.properties +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/plugin.properties @@ -31,8 +31,6 @@ _UI_MultiObjectSelected = Selected {0} Objects _UI_OpenEditorError_label = Open Editor -_UI_Wizard_category = Example EMF Model Creation Wizards - _UI_CreateModelError_message = Problems encountered in file "{0}" _UI_ConstraintsModelWizard_label = Constraints Model diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/plugin.xml b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/plugin.xml index 167adc4e8d8..5d5a73d154f 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/plugin.xml +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/plugin.xml @@ -11,18 +11,25 @@ <plugin> <extension point="org.eclipse.ui.newWizards"> - <category - id="org.eclipse.emf.ecore.Wizard.category.ID" - name="%_UI_Wizard_category"/> + <!-- @generated NOT --> <wizard id="org.eclipse.papyrus.infra.constraints.presentation.ConstraintsModelWizardID" name="%_UI_ConstraintsModelWizard_label" class="org.eclipse.papyrus.infra.constraints.presentation.ConstraintsModelWizard" - category="org.eclipse.emf.ecore.Wizard.category.ID" + category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.addons.category" icon="icons/full/obj16/ConstraintsModelFile.gif"> <description>%_UI_ConstraintsModelWizard_description</description> <selection class="org.eclipse.core.resources.IResource"/> </wizard> + <wizard + id="org.eclipse.papyrus.infra.constraints.environment.presentation.EnvironmentModelWizardID" + name="%_UI_EnvironmentModelWizard_label" + class="org.eclipse.papyrus.infra.constraints.environment.presentation.EnvironmentModelWizard" + category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.addons.category" + icon="icons/full/obj16/EnvironmentModelFile.gif"> + <description>%_UI_EnvironmentModelWizard_description</description> + <selection class="org.eclipse.core.resources.IResource"/> + </wizard> </extension> <extension point="org.eclipse.ui.editors"> @@ -36,21 +43,6 @@ </editor> </extension> - <extension point="org.eclipse.ui.newWizards"> - <category - id="org.eclipse.emf.ecore.Wizard.category.ID" - name="%_UI_Wizard_category"/> - <wizard - id="org.eclipse.papyrus.infra.constraints.environment.presentation.EnvironmentModelWizardID" - name="%_UI_EnvironmentModelWizard_label" - class="org.eclipse.papyrus.infra.constraints.environment.presentation.EnvironmentModelWizard" - category="org.eclipse.emf.ecore.Wizard.category.ID" - icon="icons/full/obj16/EnvironmentModelFile.gif"> - <description>%_UI_EnvironmentModelWizard_description</description> - <selection class="org.eclipse.core.resources.IResource"/> - </wizard> - </extension> - <extension point="org.eclipse.ui.editors"> <editor id="org.eclipse.papyrus.infra.constraints.environment.presentation.EnvironmentEditorID" diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/plugin.properties b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/plugin.properties index 378d8e3e5e7..b465dbeaf93 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/plugin.properties +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/plugin.properties @@ -36,8 +36,6 @@ _UI_MultiObjectSelected = Selected {0} Objects _UI_OpenEditorError_label = Open Editor -_UI_Wizard_category = Example EMF Model Creation Wizards - _UI_CreateModelError_message = Problems encountered in file "{0}" _UI_ExpressionsModelWizard_label = Papyrus Expressions Model diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/plugin.xml b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/plugin.xml index 2843e767534..05634ffb42c 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/plugin.xml +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/plugin.xml @@ -20,14 +20,11 @@ <extension point="org.eclipse.ui.newWizards"> <!-- @generated NOT expressions --> - <category - id="org.eclipse.emf.ecore.Wizard.category.ID" - name="%_UI_Wizard_category"/> <wizard id="org.eclipse.papyrus.infra.emf.expressions.presentation.ExpressionsModelWizardID" name="%_UI_ExpressionsModelWizard_label" class="org.eclipse.papyrus.infra.emf.expressions.presentation.ExpressionsModelWizard" - category="org.eclipse.papyrus.wizards.category" + category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.addons.category" icon="icons/full/obj16/ExpressionsModelFile.gif"> <description>%_UI_ExpressionsModelWizard_description</description> <selection class="org.eclipse.core.resources.IResource"/> diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/plugin.properties b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/plugin.properties index dec547ad9e7..6b999f61a7d 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/plugin.properties +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/plugin.properties @@ -27,8 +27,6 @@ _UI_MultiObjectSelected = Selected {0} Objects _UI_OpenEditorError_label = Open Editor -_UI_Wizard_category = Example EMF Model Creation Wizards - _UI_CreateModelError_message = Problems encountered in file "{0}" _UI_AssistantModelWizard_label = Modeling Assistants Model diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/plugin.xml b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/plugin.xml index 4c7dbc6852e..5002d054dd1 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/plugin.xml +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/plugin.xml @@ -16,15 +16,12 @@ <plugin> <extension point="org.eclipse.ui.newWizards"> - <!-- @generated assistant --> - <category - id="org.eclipse.emf.ecore.Wizard.category.ID" - name="%_UI_Wizard_category"/> + <!-- @generated NOT assistant --> <wizard id="org.eclipse.papyrus.infra.gmfdiag.assistant.presentation.AssistantModelWizardID" name="%_UI_AssistantModelWizard_label" class="org.eclipse.papyrus.infra.gmfdiag.assistant.presentation.AssistantModelWizard" - category="org.eclipse.emf.ecore.Wizard.category.ID" + category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.addons.category" icon="icons/full/obj16/AssistantModelFile.gif"> <description>%_UI_AssistantModelWizard_description</description> <selection class="org.eclipse.core.resources.IResource"/> diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.properties b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.properties index d25f0bfd04a..f41319679a2 100644 --- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.properties +++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.properties @@ -26,8 +26,6 @@ _UI_MultiObjectSelected = Selected {0} Objects _UI_OpenEditorError_label = Open Editor
-_UI_Wizard_category = Example EMF Model Creation Wizards
-
_UI_CreateModelError_message = Problems encountered in file "{0}"
_UI_ExpansionModelModelWizard_label = ExpansionModel Model
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.xml b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.xml index 47aac814884..98c445ab5e2 100644 --- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.xml +++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.xml @@ -6,15 +6,12 @@ <plugin>
<extension point="org.eclipse.ui.newWizards">
- <!-- @generated Expansion -->
- <category
- id="org.eclipse.emf.ecore.Wizard.category.ID"
- name="%_UI_Wizard_category"/>
+ <!-- @generated NOT Expansion -->
<wizard
id="org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpansionModelModelWizardID"
name="%_UI_ExpansionModelModelWizard_label"
class="org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpansionModelModelWizard"
- category="org.eclipse.emf.ecore.Wizard.category.ID"
+ category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.addons.category"
icon="icons/full/obj16/ExpansionModelModelFile.gif">
<description>%_UI_ExpansionModelModelWizard_description</description>
<selection class="org.eclipse.core.resources.IResource"/>
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/plugin.properties b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/plugin.properties index dfb71f09c42..f768a2f0829 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/plugin.properties +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/plugin.properties @@ -26,8 +26,6 @@ _UI_MultiObjectSelected = Selected {0} Objects _UI_OpenEditorError_label = Open Editor -_UI_Wizard_category = Example EMF Model Creation Wizards - _UI_CreateModelError_message = Problems encountered in file "{0}" _UI_PaletteconfigurationModelWizard_label = Palette Configuration Model diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/plugin.xml b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/plugin.xml index 2839e5d3369..33d93f3d20b 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/plugin.xml +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/plugin.xml @@ -9,16 +9,14 @@ --> <plugin> - <!-- @generated NOT PaletteConfiguration --> + <extension point="org.eclipse.ui.newWizards"> - <category - id="org.eclipse.emf.ecore.Wizard.category.ID" - name="%_UI_Wizard_category"/> + <!-- @generated NOT PaletteConfiguration --> <wizard id="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.presentation.PaletteconfigurationModelWizardID" name="%_UI_PaletteconfigurationModelWizard_label" class="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.presentation.CustomPaletteconfigurationModelWizard" - category="org.eclipse.emf.ecore.Wizard.category.ID" + category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.addons.category" icon="icons/full/obj16/PaletteconfigurationModelFile.gif"> <description>%_UI_PaletteconfigurationModelWizard_description</description> <selection class="org.eclipse.core.resources.IResource"/> diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.properties b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.properties index 4e4d7d3ffef..4c19f4f7619 100644 --- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.properties +++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.properties @@ -36,8 +36,6 @@ _UI_MultiObjectSelected = Selected {0} Objects _UI_OpenEditorError_label = Open Editor -_UI_Wizard_category = Example EMF Model Creation Wizards - _UI_CreateModelError_message = Problems encountered in file "{0}" _UI_ElementCreationMenuModelModelWizard_label = ElementCreationMenuModel Model diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.xml b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.xml index 26a89fde080..098e8fb6414 100644 --- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.xml +++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.xml @@ -17,15 +17,12 @@ <plugin> <extension point="org.eclipse.ui.newWizards"> - <!-- @generated elementCreationMenuModel --> - <category - id="org.eclipse.emf.ecore.Wizard.category.ID" - name="%_UI_Wizard_category"/> + <!-- @generated NOT elementCreationMenuModel --> <wizard id="org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.presentation.ElementCreationMenuModelModelWizardID" name="%_UI_ElementCreationMenuModelModelWizard_label" class="org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.presentation.ElementCreationMenuModelModelWizard" - category="org.eclipse.emf.ecore.Wizard.category.ID" + category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.addons.category" icon="icons/full/obj16/ElementCreationMenuModelModelFile.gif"> <description>%_UI_ElementCreationMenuModelModelWizard_description</description> <selection class="org.eclipse.core.resources.IResource"/> diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/plugin.properties b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/plugin.properties index 01fa0b9a111..6c409d0051f 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/plugin.properties +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/plugin.properties @@ -32,8 +32,6 @@ _UI_MultiObjectSelected = Selected {0} Objects _UI_OpenEditorError_label = Open Editor -_UI_Wizard_category = Example EMF Model Creation Wizards - _UI_CreateModelError_message = Problems encountered in file "{0}" _UI_EnvironmentModelWizard_label = Environment Model diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/plugin.xml b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/plugin.xml index 21db40ed094..ad301007599 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/plugin.xml +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/plugin.xml @@ -11,14 +11,12 @@ <plugin> <extension point="org.eclipse.ui.newWizards"> - <category - id="org.eclipse.emf.ecore.Wizard.category.ID" - name="%_UI_Wizard_category"/> + <!-- @generated NOT --> <wizard id="org.eclipse.papyrus.infra.properties.environment.presentation.EnvironmentModelWizardID" name="%_UI_EnvironmentModelWizard_label" class="org.eclipse.papyrus.infra.properties.environment.presentation.EnvironmentModelWizard" - category="org.eclipse.emf.ecore.Wizard.category.ID" + category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.addons.category" icon="icons/full/obj16/EnvironmentModelFile.gif"> <description>%_UI_EnvironmentModelWizard_description</description> <selection class="org.eclipse.core.resources.IResource"/> @@ -37,14 +35,12 @@ </extension> <extension point="org.eclipse.ui.newWizards"> - <category - id="org.eclipse.emf.ecore.Wizard.category.ID" - name="%_UI_Wizard_category"/> + <!-- @generated NOT --> <wizard id="org.eclipse.papyrus.infra.properties.contexts.presentation.ContextsModelWizardID" name="%_UI_ContextsModelWizard_label" class="org.eclipse.papyrus.infra.properties.contexts.presentation.ContextsModelWizard" - category="org.eclipse.emf.ecore.Wizard.category.ID" + category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.addons.category" icon="icons/full/obj16/ContextsModelFile.gif"> <description>%_UI_ContextsModelWizard_description</description> <selection class="org.eclipse.core.resources.IResource"/> @@ -63,14 +59,12 @@ </extension> <extension point="org.eclipse.ui.newWizards"> - <category - id="org.eclipse.emf.ecore.Wizard.category.ID" - name="%_UI_Wizard_category"/> + <!-- @generated NOT --> <wizard id="org.eclipse.papyrus.infra.properties.ui.presentation.UiModelWizardID" name="%_UI_UiModelWizard_label" class="org.eclipse.papyrus.infra.properties.ui.presentation.UiModelWizard" - category="org.eclipse.emf.ecore.Wizard.category.ID" + category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.addons.category" icon="icons/full/obj16/UiModelFile.gif"> <description>%_UI_UiModelWizard_description</description> <selection class="org.eclipse.core.resources.IResource"/> diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.properties index 2cf10f2f34d..f29d39b3149 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.properties +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.properties @@ -37,8 +37,6 @@ _UI_MultiObjectSelected = Selected {0} Objects _UI_OpenEditorError_label = Open Editor
-_UI_Wizard_category = Example EMF Model Creation Wizards
-
_UI_CreateModelError_message = Problems encountered in file "{0}"
_UI_ElementtypesconfigurationsModelWizard_label = Elementtypesconfigurations Model
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.xml index 82101fb8558..c829b48aa2c 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.xml +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.xml @@ -19,15 +19,12 @@ <extension point="org.eclipse.ui.newWizards">
- <!-- @generated ElementTypesConfigurations -->
- <category
- id="org.eclipse.emf.ecore.Wizard.category.ID"
- name="%_UI_Wizard_category"/>
+ <!-- @generated NOT ElementTypesConfigurations -->
<wizard
id="org.eclipse.papyrus.infra.types.presentation.ElementTypesConfigurationsModelWizardID"
name="%_UI_ElementTypesConfigurationsModelWizard_label"
class="org.eclipse.papyrus.infra.types.presentation.ElementTypesConfigurationsModelWizard"
- category="org.eclipse.emf.ecore.Wizard.category.ID"
+ category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.addons.category"
icon="icons/full/obj16/ElementTypesConfigurationsModelFile.gif">
<description>%_UI_ElementTypesConfigurationsModelWizard_description</description>
<selection class="org.eclipse.core.resources.IResource"/>
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.properties index 496c18a25f0..fb3ead1850a 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.properties +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.properties @@ -36,8 +36,6 @@ _UI_MultiObjectSelected = Selected {0} Objects _UI_OpenEditorError_label = Open Editor -_UI_Wizard_category = Example EMF Model Creation Wizards - _UI_CreateModelError_message = Problems encountered in file "{0}" _UI_ArchitectureModelWizard_label = Papyrus Architecture Model diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.xml index 3bfb8f0a3c8..d7ff299c76d 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.xml +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.xml @@ -18,15 +18,12 @@ <plugin> <extension point="org.eclipse.ui.newWizards"> - <!-- @generated Architecture --> - <category - id="org.eclipse.emf.ecore.Wizard.category.ID" - name="%_UI_Wizard_category"/> + <!-- @generated NOT Architecture --> <wizard id="org.eclipse.papyrus.infra.ui.architecture.ArchitectureModelWizardID" name="%_UI_ArchitectureModelWizard_label" class="org.eclipse.papyrus.infra.ui.architecture.editor.ArchitectureModelWizard" - category="org.eclipse.papyrus.wizards.category" + category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.addons.category" icon="icons/full/obj16/ArchitectureModelFile.gif"> <description>%_UI_ArchitectureModelWizard_description</description> <selection class="org.eclipse.core.resources.IResource"/> diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/plugin.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/plugin.properties index 31d899f9131..422941c27b8 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/plugin.properties +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/plugin.properties @@ -11,3 +11,11 @@ # pluginName=Papyrus Infrastructure Base UI providerName=Eclipse Modeling Project + +wizardCategoryExportPapyrus=Papyrus +wizardCategoryImportPapyrus=Papyrus +wizardCategoryPapyrus=Papyrus +wizardCategoryAddons=Papyrus Add-ons +wizardCategoryComponents=Papyrus Components +wizardCategoryToolsmiths=Papyrus Toolsmiths +wizardCategoryExamples=Papyrus Examples
\ No newline at end of file diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/plugin.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/plugin.xml index 7fb7aa2dd3c..ff9af9bae91 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/plugin.xml +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/plugin.xml @@ -489,16 +489,39 @@ point="org.eclipse.ui.exportWizards"> <category id="org.eclipse.papyrus.infra.core.exportcategory" - name="Papyrus"> + name="%wizardCategoryExportPapyrus"> </category> </extension> <extension point="org.eclipse.ui.importWizards"> <category id="org.eclipse.papyrus.infra.core.importcategory" - name="Papyrus"> + name="%wizardCategoryImportPapyrus"> </category> </extension> + <extension point="org.eclipse.ui.newWizards"> + <category + id="org.eclipse.papyrus.wizards.category" + name="%wizardCategoryPapyrus"> + </category> + <category + id="org.eclipse.papyrus.wizards.addons.category" + name="%wizardCategoryAddons" parentCategory="org.eclipse.papyrus.wizards.category"> + </category> + <category + id="org.eclipse.papyrus.wizards.components.category" + name="%wizardCategoryComponents" parentCategory="org.eclipse.papyrus.wizards.category"> + </category> + <category + id="org.eclipse.papyrus.wizards.toolsmiths.category" + name="%wizardCategoryToolsmiths" parentCategory="org.eclipse.papyrus.wizards.category"> + </category> + <category + id="org.eclipse.papyrus.examples" + parentCategory="org.eclipse.ui.Examples" + name="%wizardCategoryExamples"> + </category> + </extension> <extension point="org.eclipse.papyrus.infra.ui.papyrusContentOutline"> diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/plugin.xml index faf9a929172..40a5a9d322e 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/plugin.xml +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.ui/plugin.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?>
<plugin>
<extension point="org.eclipse.ui.newWizards">
+ <!-- @generated NOT -->
<wizard
- category="org.eclipse.papyrus.wizards.category"
+ category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.components.category"
class="org.eclipse.papyrus.sysml.diagram.ui.NewSysMLProjectWizard"
finalPerspective="org.eclipse.papyrus.infra.core.perspective"
icon="icons/papyrus/new_sysml_project.gif"
@@ -14,7 +15,7 @@ </description>
</wizard>
<wizard
- category="org.eclipse.papyrus.wizards.category"
+ category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.components.category"
class="org.eclipse.papyrus.sysml.diagram.ui.NewSysMLModelWizard"
finalPerspective="org.eclipse.papyrus.infra.core.perspective"
icon="icons/papyrus/new_sysml_model.gif"
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/plugin.xml index 57c87fa5346..eec1b042aa3 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/plugin.xml +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/plugin.xml @@ -19,8 +19,9 @@ </extension>
<extension
point="org.eclipse.ui.newWizards">
+ <!-- @generated NOT -->
<wizard
- category="org.eclipse.papyrus.wizards.category"
+ category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.toolsmiths.category"
class="org.eclipse.papyrus.toolsmiths.wizard.CreateNewCustomizationPluginWizard"
icon="icons/16-config.png"
id="org.eclipse.papyrus.toolsmiths.wizard"
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.xml index 05a23171347..68b5be1ddf2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.xml @@ -5,15 +5,6 @@ <extension-point id="newModelStorageProviders" name="New Model Storage Providers" schema="schema/newModelStorageProviders.exsd"/> <extension point="org.eclipse.ui.newWizards"> - <category - id="org.eclipse.papyrus.wizards.category" - name="Papyrus"> - </category> - <category - id="org.eclipse.papyrus.examples" - parentCategory="org.eclipse.ui.Examples" - name="Papyrus Example"> - </category> <wizard category="org.eclipse.papyrus.wizards.category" class="org.eclipse.papyrus.uml.diagram.wizards.wizards.NewPapyrusProjectWizard" diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/plugin.xml b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/plugin.xml index 79fa9226086..9e4538407d0 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/plugin.xml +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/plugin.xml @@ -5,8 +5,9 @@ <extension-point id="org.eclipse.papyrus.customization.properties.generation.layout" name="%extension-point.layoutgenerator" schema="schema/org.eclipse.papyrus.customization.properties.generation.layout.exsd"/> <extension point="org.eclipse.ui.newWizards"> + <!-- @generated NOT --> <wizard - category="org.eclipse.papyrus.wizards.category" + category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.addons.category" class="org.eclipse.papyrus.customization.properties.generation.wizard.CreateContextWizard" icon="icons/new_customization.png" id="org.eclipse.papyrus.customization.properties.generation.wizard" diff --git a/tests/framework/org.eclipse.papyrus.tests.framework.editor/plugin.properties b/tests/framework/org.eclipse.papyrus.tests.framework.editor/plugin.properties index aee0c7056cf..b0e78938b68 100644 --- a/tests/framework/org.eclipse.papyrus.tests.framework.editor/plugin.properties +++ b/tests/framework/org.eclipse.papyrus.tests.framework.editor/plugin.properties @@ -27,8 +27,6 @@ _UI_MultiObjectSelected = Selected {0} Objects _UI_OpenEditorError_label = Open Editor -_UI_Wizard_category = Example EMF Model Creation Wizards - _UI_CreateModelError_message = Problems encountered in file "{0}" _UI_ExceptionsModelWizard_label = Exceptions Model diff --git a/tests/framework/org.eclipse.papyrus.tests.framework.editor/plugin.xml b/tests/framework/org.eclipse.papyrus.tests.framework.editor/plugin.xml index 4dfd9dc2db1..d3b92baea12 100644 --- a/tests/framework/org.eclipse.papyrus.tests.framework.editor/plugin.xml +++ b/tests/framework/org.eclipse.papyrus.tests.framework.editor/plugin.xml @@ -16,15 +16,12 @@ <plugin> <extension point="org.eclipse.ui.newWizards"> - <!-- @generated test-exceptions --> - <category - id="org.eclipse.emf.ecore.Wizard.category.ID" - name="%_UI_Wizard_category"/> + <!-- @generated NOT test-exceptions --> <wizard id="org.eclipse.papyrus.tests.framework.exceptions.presentation.ExceptionsModelWizardID" name="%_UI_ExceptionsModelWizard_label" class="org.eclipse.papyrus.tests.framework.exceptions.presentation.ExceptionsModelWizard" - category="org.eclipse.emf.ecore.Wizard.category.ID" + category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.addons.category" icon="icons/full/obj16/ExceptionsModelFile.gif"> <description>%_UI_ExceptionsModelWizard_description</description> <selection class="org.eclipse.core.resources.IResource"/> |