Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcletavernie2011-11-10 08:56:28 +0000
committercletavernie2011-11-10 08:56:28 +0000
commit0090023b60314283a7d6b6039088d73c2af57740 (patch)
treef21206aad34d6f7dba55974f7476465a8f83fd4b /plugins/uml/org.eclipse.papyrus.uml.import
parentc433c0eefb4f34523985881b512af8d972f29dde (diff)
downloadorg.eclipse.papyrus-0090023b60314283a7d6b6039088d73c2af57740.tar.gz
org.eclipse.papyrus-0090023b60314283a7d6b6039088d73c2af57740.tar.xz
org.eclipse.papyrus-0090023b60314283a7d6b6039088d73c2af57740.zip
362162: [Architecture - Refactoring] The plug-ins should be renamed to match their layer's qualified name
https://bugs.eclipse.org/bugs/show_bug.cgi?id=362162
Diffstat (limited to 'plugins/uml/org.eclipse.papyrus.uml.import')
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.import/.settings/org.eclipse.core.resources.prefs4
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF2
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.import/plugin.xml6
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/Activator.java (renamed from plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/Activator.java)2
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/handlers/ImportPackageFromWorkspaceHandler.java (renamed from plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/handlers/ImportPackageFromWorkspaceHandler.java)8
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/handlers/ImportRegisteredPackageHandler.java (renamed from plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/handlers/ImportRegisteredPackageHandler.java)16
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/handlers/ImportRegisteredProfileHandler.java (renamed from plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/handlers/ImportRegisteredProfileHandler.java)12
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/messages/Messages.java (renamed from plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/messages/Messages.java)4
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/messages/messages.properties (renamed from plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/messages/messages.properties)0
9 files changed, 27 insertions, 27 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/.settings/org.eclipse.core.resources.prefs b/plugins/uml/org.eclipse.papyrus.uml.import/.settings/org.eclipse.core.resources.prefs
index cadfa8d8925..9a8f5427190 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.import/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/uml/org.eclipse.papyrus.uml.import/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,3 @@
-#Thu Sep 22 11:45:39 CEST 2011
+#Mon Nov 07 10:28:12 CET 2011
eclipse.preferences.version=1
-encoding//src/org/eclipse/papyrus/importt/messages/messages.properties=ISO-8859-1
+encoding//src/org/eclipse/papyrus/uml/importt/messages/messages.properties=ISO-8859-1
diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF
index 0970d240ad4..19536d0acff 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Bundle-Version: 0.9.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.importt.Activator
+Bundle-Activator: org.eclipse.papyrus.uml.importt.Activator
Bundle-SymbolicName: org.eclipse.papyrus.uml.import;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.import/plugin.xml
index b5c6caa91af..236a32ee609 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.import/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.import/plugin.xml
@@ -55,7 +55,7 @@
<extension
point="org.eclipse.ui.handlers">
<handler
- class="org.eclipse.papyrus.importt.handlers.ImportRegisteredProfileHandler"
+ class="org.eclipse.papyrus.uml.importt.handlers.ImportRegisteredProfileHandler"
commandId="org.eclipse.papyrus.import.registered.profile">
<activeWhen>
<and>
@@ -77,7 +77,7 @@
</activeWhen>
</handler>
<handler
- class="org.eclipse.papyrus.importt.handlers.ImportRegisteredPackageHandler"
+ class="org.eclipse.papyrus.uml.importt.handlers.ImportRegisteredPackageHandler"
commandId="org.eclipse.papyrus.import.registered.package">
<activeWhen>
<and>
@@ -99,7 +99,7 @@
</activeWhen>
</handler>
<handler
- class="org.eclipse.papyrus.importt.handlers.ImportPackageFromWorkspaceHandler"
+ class="org.eclipse.papyrus.uml.importt.handlers.ImportPackageFromWorkspaceHandler"
commandId="org.eclipse.papyrus.import.package.from.workspace">
<activeWhen>
<and>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/Activator.java b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/Activator.java
index 14d1f36542c..865728e66fa 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/Activator.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/Activator.java
@@ -9,7 +9,7 @@
* Contributors:
* Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.importt;
+package org.eclipse.papyrus.uml.importt;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/handlers/ImportPackageFromWorkspaceHandler.java b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/handlers/ImportPackageFromWorkspaceHandler.java
index 545c50668aa..8760fcdbeec 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/handlers/ImportPackageFromWorkspaceHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/handlers/ImportPackageFromWorkspaceHandler.java
@@ -9,7 +9,7 @@
* Contributors:
* Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.importt.handlers;
+package org.eclipse.papyrus.uml.importt.handlers;
import java.util.ArrayList;
import java.util.Iterator;
@@ -22,9 +22,9 @@ import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.uml2.utils.Util;
-import org.eclipse.papyrus.importt.messages.Messages;
-import org.eclipse.papyrus.profile.ui.dialogs.PackageImportTreeSelectionDialog;
+import org.eclipse.papyrus.uml.extensionpoints.utils.Util;
+import org.eclipse.papyrus.uml.importt.messages.Messages;
+import org.eclipse.papyrus.uml.profile.ui.dialogs.PackageImportTreeSelectionDialog;
import org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/handlers/ImportRegisteredPackageHandler.java b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/handlers/ImportRegisteredPackageHandler.java
index 7c3082213f2..77f18d425c9 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/handlers/ImportRegisteredPackageHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/handlers/ImportRegisteredPackageHandler.java
@@ -9,7 +9,7 @@
* Contributors:
* Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.importt.handlers;
+package org.eclipse.papyrus.uml.importt.handlers;
import java.util.ArrayList;
import java.util.Arrays;
@@ -24,10 +24,10 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.uml2.library.FilteredRegisteredLibrariesSelectionDialog;
-import org.eclipse.papyrus.extensionpoints.uml2.library.RegisteredLibrary;
-import org.eclipse.papyrus.extensionpoints.uml2.utils.Util;
-import org.eclipse.papyrus.profile.ui.dialogs.PackageImportTreeSelectionDialog;
+import org.eclipse.papyrus.uml.extensionpoints.library.FilteredRegisteredLibrariesSelectionDialog;
+import org.eclipse.papyrus.uml.extensionpoints.library.RegisteredLibrary;
+import org.eclipse.papyrus.uml.extensionpoints.utils.Util;
+import org.eclipse.papyrus.uml.profile.ui.dialogs.PackageImportTreeSelectionDialog;
import org.eclipse.papyrus.uml.tools.utils.PackageUtil;
import org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler;
import org.eclipse.swt.widgets.Shell;
@@ -61,7 +61,7 @@ public class ImportRegisteredPackageHandler extends AbstractCommandHandler {
ResourceSet resourceSet = Util.getResourceSet(getSelectedElement());
for(int i = 0; i < librariesToImport.length; i++) {
- RegisteredLibrary currentLibrary = (RegisteredLibrary)(librariesToImport[i]);
+ RegisteredLibrary currentLibrary = (librariesToImport[i]);
URI modelUri = currentLibrary.uri;
Resource modelResource = resourceSet.getResource(modelUri, true);
@@ -99,7 +99,7 @@ public class ImportRegisteredPackageHandler extends AbstractCommandHandler {
libraries.add(registeredLibrary);
}
}
- return (RegisteredLibrary[])libraries.toArray(new RegisteredLibrary[libraries.size()]);
+ return libraries.toArray(new RegisteredLibrary[libraries.size()]);
}
/**
@@ -157,7 +157,7 @@ public class ImportRegisteredPackageHandler extends AbstractCommandHandler {
if(Dialog.OK == dialog.getReturnCode()) {
// get the result, which is the set of libraries to import
List<Object> librariesToImport = Arrays.asList(dialog.getResult());
- importLibraries((RegisteredLibrary[])librariesToImport.toArray(new RegisteredLibrary[librariesToImport.size()]));
+ importLibraries(librariesToImport.toArray(new RegisteredLibrary[librariesToImport.size()]));
}
}
}, "Import Libraries", "Import Libraries from Repository"); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/handlers/ImportRegisteredProfileHandler.java b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/handlers/ImportRegisteredProfileHandler.java
index 6de3cdda96d..1866064f518 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/handlers/ImportRegisteredProfileHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/handlers/ImportRegisteredProfileHandler.java
@@ -9,7 +9,7 @@
* Contributors:
* Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.importt.handlers;
+package org.eclipse.papyrus.uml.importt.handlers;
import java.util.ArrayList;
import java.util.Arrays;
@@ -24,10 +24,10 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.uml2.profile.FilteredRegisteredProfilesAsLibrarySelectionDialog;
-import org.eclipse.papyrus.extensionpoints.uml2.profile.RegisteredProfile;
-import org.eclipse.papyrus.extensionpoints.uml2.utils.Util;
-import org.eclipse.papyrus.profile.ui.dialogs.ProfileTreeSelectionDialog;
+import org.eclipse.papyrus.uml.extensionpoints.profile.FilteredRegisteredProfilesAsLibrarySelectionDialog;
+import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;
+import org.eclipse.papyrus.uml.extensionpoints.utils.Util;
+import org.eclipse.papyrus.uml.profile.ui.dialogs.ProfileTreeSelectionDialog;
import org.eclipse.papyrus.uml.tools.utils.PackageUtil;
import org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler;
import org.eclipse.swt.widgets.Shell;
@@ -131,7 +131,7 @@ public class ImportRegisteredProfileHandler extends AbstractCommandHandler {
PackageImport ei = UMLFactory.eINSTANCE.createPackageImport();
ei.setImportedPackage((Package)element);
- //we import only once an element :
+ //we import only once an element :
List<Package> importedPackages = ((Package)getSelectedElement()).getImportedPackages();
if(!importedPackages.contains(element)) {
((Package)getSelectedElement()).getPackageImports().add(ei);
diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/messages/Messages.java b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/messages/Messages.java
index 170ccb1897b..f0cc107ac04 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/messages/Messages.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/messages/Messages.java
@@ -1,10 +1,10 @@
-package org.eclipse.papyrus.importt.messages;
+package org.eclipse.papyrus.uml.importt.messages;
import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.papyrus.importt.messages.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.papyrus.uml.importt.messages.messages"; //$NON-NLS-1$
public static String ImportPackageFromFileHandler_SelectRegisteredModelLibrary;
static {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/messages/messages.properties b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/messages/messages.properties
index 2a9d009dc55..2a9d009dc55 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/importt/messages/messages.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/messages/messages.properties

Back to the top