Merged Branch 0.8.X changes 5548::5550 for oep.uml.import

358538: [Model Explorer] [Import] the Import actions in the Model Explorer should be regrouped in the same sub-menu
https://bugs.eclipse.org/bugs/show_bug.cgi?id=358538

Minor changes

5 files changed, 55 insertions, 54 deletions

diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.import/plugin.properties
index 58a8bf070cf..cc2d41f98eb 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.import/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.import/plugin.properties
@@ -1,12 +1,3 @@
 #Properties file for org.eclipse.papyrus.import

 providerName = Eclipse Modeling Project

-pluginName = Papyrus Import plugin (Incubation)

-command.description = Import Profile From Registered Profile

-command.name = Import Profile From Registered Profile

-command.description.0 = Import Package From File

-command.name.0 = Import Package From File

-command.description.1 = Import Package From Registered Library

-command.name.1 = Import Package From Registered Library

-menu.label = Import

-menu.mnemonic = &I

-menu.tooltip = Papyrus Import Menu
\ No newline at end of file
+pluginName = Papyrus Import plugin (Incubation)
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.import/plugin.xml
index 59ea20883e6..eaa0ed33004 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.import/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.import/plugin.xml
@@ -5,21 +5,21 @@
          point="org.eclipse.ui.commands">

       <command

             categoryId="org.eclipse.papyrus.editor.category"

-            description="%command.description"

-            id="org.eclipse.papyrus.import.profile.from.registred.profile"

-            name="%command.name">

+            description="Import Registered Profile"

+            id="org.eclipse.papyrus.import.registered.profile"

+            name="Import Registered Profile">

       </command>

       <command

             categoryId="org.eclipse.papyrus.editor.category"

-            description="%command.description.0"

-            id="org.eclipse.papyrus.import.package.from.file"

-            name="%command.name.0">

+            description="Import Registered Package"

+            id="org.eclipse.papyrus.import.registered.package"

+            name="Import Registered Package">

       </command>

       <command

             categoryId="org.eclipse.papyrus.editor.category"

-            description="%command.description.1"

-            id="org.eclipse.papyrus.import.package.from.registered.library"

-            name="%command.name.1">

+            description="Import Package From Workspace"

+            id="org.eclipse.papyrus.import.package.from.workspace"

+            name="Import Package From Workspace">

       </command>

    </extension>

    <extension

@@ -29,22 +29,24 @@
          <menu

                icon="icons/import_wiz_16x16-papyrusColor.gif"

                id="org.eclipse.papyrus.uml.import.menu"

-               label="%menu.label"

-               mnemonic="%menu.mnemonic"

-               tooltip="%menu.tooltip">

+               label="&amp;Import"

+               tooltip="Papyrus Import Menu">

             <command

-                  commandId="org.eclipse.papyrus.import.profile.from.registred.profile"

+                  commandId="org.eclipse.papyrus.import.registered.profile"

                   icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Profile.gif"

+                  label="Import &amp;Registered Profile"

                   style="push">

             </command>

             <command

-                  commandId="org.eclipse.papyrus.import.package.from.file"

+                  commandId="org.eclipse.papyrus.import.registered.package"

                   icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"

+                  label="Import Registered &amp;Package"

                   style="push">

             </command>

             <command

-                  commandId="org.eclipse.papyrus.import.package.from.registered.library"

+                  commandId="org.eclipse.papyrus.import.package.from.workspace"

                   icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"

+                  label="Import Package From &amp;Workspace"

                   style="push">

             </command>

          </menu>

@@ -53,8 +55,8 @@
    <extension

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

       <handler

-            class="org.eclipse.papyrus.importt.handlers.ImportProfileFromRegisteredLibraryHandler"

-            commandId="org.eclipse.papyrus.import.profile.from.registred.profile">

+            class="org.eclipse.papyrus.importt.handlers.ImportRegisteredProfileHandler"

+            commandId="org.eclipse.papyrus.import.registered.profile">

          <activeWhen>

             <and>

                <with

@@ -75,30 +77,8 @@
          </activeWhen>

       </handler>

       <handler

-            class="org.eclipse.papyrus.importt.handlers.ImportPackageFromFileHandler"

-            commandId="org.eclipse.papyrus.import.package.from.file">

-         <activeWhen>

-         <and>

-            <with

-                  variable="selection">

-               <iterate>

-                  <adapt

-                        type="org.eclipse.emf.ecore.EObject">

-                     <instanceof

-                           value="org.eclipse.uml2.uml.Package">

-                     </instanceof>

-                  </adapt>

-               </iterate>

-            </with>

-            <count

-                  value="1">

-            </count>

-            </and>

-         </activeWhen>

-      </handler>

-      <handler

-            class="org.eclipse.papyrus.importt.handlers.ImportPackageFromRegisteredLibraryHandler"

-            commandId="org.eclipse.papyrus.import.package.from.registered.library">

+            class="org.eclipse.papyrus.importt.handlers.ImportRegisteredPackageHandler"

+            commandId="org.eclipse.papyrus.import.registered.package">

          <activeWhen>

             <and>

                <with

@@ -118,6 +98,28 @@
             </and>

          </activeWhen>

       </handler>

+      <handler

+            class="org.eclipse.papyrus.importt.handlers.ImportPackageFromWorkspaceHandler"

+            commandId="org.eclipse.papyrus.import.package.from.workspace">

+         <activeWhen>

+         <and>

+            <with

+                  variable="selection">

+               <iterate>

+                  <adapt

+                        type="org.eclipse.emf.ecore.EObject">

+                     <instanceof

+                           value="org.eclipse.uml2.uml.Package">

+                     </instanceof>

+                  </adapt>

+               </iterate>

+            </with>

+            <count

+                  value="1">

+            </count>

+            </and>

+         </activeWhen>

+      </handler>

    </extension>

 

 </plugin>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/handlers/ImportPackageFromFileHandler.java b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/handlers/ImportPackageFromWorkspaceHandler.java
index 1830eb4cdc7..cbc43018993 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/handlers/ImportPackageFromFileHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/handlers/ImportPackageFromWorkspaceHandler.java
@@ -36,8 +36,12 @@ import org.eclipse.uml2.uml.PackageImport;
 import org.eclipse.uml2.uml.UMLFactory;

 

 

-public class ImportPackageFromFileHandler extends AbstractCommandHandler {

+public class ImportPackageFromWorkspaceHandler extends AbstractCommandHandler {

 

+	/**

+	 * 

+	 * {@inheritDoc}

+	 */

 	@Override

 	protected Command getCommand() {

 		return new ImportFromFileCommand(getEditingDomain());

diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/handlers/ImportPackageFromRegisteredLibraryHandler.java b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/handlers/ImportRegisteredPackageHandler.java
index d6141676804..5f8e61db9b2 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/handlers/ImportPackageFromRegisteredLibraryHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/handlers/ImportRegisteredPackageHandler.java
@@ -39,8 +39,12 @@ import org.eclipse.uml2.uml.PackageImport;
 import org.eclipse.uml2.uml.UMLFactory;

 

 

-public class ImportPackageFromRegisteredLibraryHandler extends AbstractCommandHandler {

+public class ImportRegisteredPackageHandler extends AbstractCommandHandler {

 

+	/**

+	 * 

+	 * {@inheritDoc}

+	 */

 	@Override

 	protected Command getCommand() {

 		return new ImportLibraryFromRepositoryCommand(getEditingDomain());

diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/handlers/ImportProfileFromRegisteredLibraryHandler.java b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/handlers/ImportRegisteredProfileHandler.java
index 33333f65a24..bb966373676 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/handlers/ImportProfileFromRegisteredLibraryHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/handlers/ImportRegisteredProfileHandler.java
@@ -40,7 +40,7 @@ import org.eclipse.uml2.uml.UMLFactory;
 

 

 

-public class ImportProfileFromRegisteredLibraryHandler extends AbstractCommandHandler {

+public class ImportRegisteredProfileHandler extends AbstractCommandHandler {

 

 	/**

 	 *