diff options
7 files changed, 5 insertions, 22 deletions
diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/META-INF/MANIFEST.MF b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/META-INF/MANIFEST.MF index 78750b4d6d1..5aab2e7143e 100644..100755 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/META-INF/MANIFEST.MF +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/META-INF/MANIFEST.MF @@ -22,8 +22,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.uml2.uml.resources;bundle-version="5.2.0", org.eclipse.gmf.runtime.notation;bundle-version="1.7.0", org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0", - org.eclipse.papyrus.uml.documentation.profile;bundle-version="1.2.0", - org.eclipse.team.core, org.eclipse.swt, org.eclipse.ui.workbench, org.eclipse.ui.navigator;bundle-version="3.5.500", @@ -36,9 +34,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="3.0.0", org.eclipse.papyrus.infra.core;bundle-version="2.3.0", org.eclipse.papyrus.infra.tools;bundle-version="2.0.100", - org.eclipse.papyrus.uml.tools;bundle-version="3.0.0", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.1", - org.eclipse.papyrus.uml.modelrepair;bundle-version="2.0.0", org.eclipse.papyrus.infra.widgets;bundle-version="3.0.0", org.eclipse.papyrus.views.properties;bundle-version="3.0.0", org.eclipse.papyrus.migration.common;bundle-version="0.7.0", diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/importer/SelectedRhapsodyFilesImporter.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/importer/SelectedRhapsodyFilesImporter.java index 9b6bbf86383..749c1d36470 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/importer/SelectedRhapsodyFilesImporter.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/importer/SelectedRhapsodyFilesImporter.java @@ -20,24 +20,15 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import javax.annotation.Resource; - -import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.papyrus.infra.widgets.util.FileUtil; import org.eclipse.papyrus.migration.rhapsody.Activator; import org.eclipse.papyrus.migration.rhapsody.importer.utils.RhapsodyFileUtils; -import org.eclipse.swt.widgets.Display; /** * This class allows us to convert easily the rpy file into the Papyrus EMF Rhapsody metamodel. @@ -56,7 +47,7 @@ public class SelectedRhapsodyFilesImporter { // TODO : warning, it is used by JUnit tests too! // TODO : not common with RSA import // TODO : must be removed - public static final String OUTPUT_FOLDER = "output"; + public static final String OUTPUT_FOLDER = "output"; //$NON-NLS-1$ /** * diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/importer/utils/RpyProjectHandler.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/importer/utils/RpyProjectHandler.java index 18deb9a2a4f..d0d1d4461b0 100755 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/importer/utils/RpyProjectHandler.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/importer/utils/RpyProjectHandler.java @@ -22,15 +22,11 @@ import java.util.List; import java.util.Map; import org.apache.commons.io.FileUtils; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.Path; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.osgi.util.NLS; -import org.eclipse.papyrus.infra.widgets.util.FileUtil; import org.eclipse.papyrus.migration.rhapsody.Activator; import org.eclipse.papyrus.migration.rhapsody.parser.rpySyntax.RpyFeature; import org.eclipse.papyrus.migration.rhapsody.parser.rpySyntax.RpyFeatureValue; @@ -41,7 +37,6 @@ import org.eclipse.papyrus.migration.rhapsody.parser.rpySyntax.RpyStringMap; import org.eclipse.papyrus.migration.rhapsody.parser.rpySyntax.RpyStringMapEntry; import org.eclipse.papyrus.migration.rhapsody.parser.rpySyntax.SimpleValueList; import org.eclipse.papyrus.migration.rhapsody.utils.RhapsodyShareFolderUtils; -import org.eclipse.papyrus.views.properties.storage.IContextStorageProvider.Null; /** * @author sr246418 diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/messages/Messages.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/messages/Messages.java index c1ea901abd6..e8e0f6a0a0e 100755 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/messages/Messages.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/messages/Messages.java @@ -33,6 +33,7 @@ public class Messages extends NLS { public static String ImportRhapsodyPreferencesPage_SelectTheLocation_DialogMessage; public static String ImportRhapsodyPreferencesPage_SelectTheShareRhapsodyFolder; public static String ImportRhapsodyPreferencesPage_Worskspace; + public static String TransformationRhapsodyWizard_WizardTitle; static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/messages/messages.properties b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/messages/messages.properties index 3081c0ad4b5..e86612101cb 100755 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/messages/messages.properties +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/messages/messages.properties @@ -9,3 +9,4 @@ RhapsodyShareFolderUtils_TheGivenPathIsNotTheGoodOne=The given path is not the g ImportRhapsodyPreferencesPage_SelectTheLocation_DialogMessage=Select the location of the Rhapsody folder called "Share". ImportRhapsodyPreferencesPage_SelectTheShareRhapsodyFolder=Select the shared Rhapsody folder ImportRhapsodyPreferencesPage_Worskspace=Workspace... +TransformationRhapsodyWizard_WizardTitle=Rhapsody Transformation Wizard diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/transformations/notation/DiagramCreateUtils.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/transformations/notation/DiagramCreateUtils.java index a0648629a21..b60fe019be4 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/transformations/notation/DiagramCreateUtils.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/transformations/notation/DiagramCreateUtils.java @@ -25,7 +25,6 @@ import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.gmfdiag.common.commands.SemanticElementAdapter; import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes; -import org.eclipse.uml2.uml.Transition; public class DiagramCreateUtils { diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/wizard/TransformationRhapsodyWizard.java b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/wizard/TransformationRhapsodyWizard.java index 6cdc194c5fe..f29e88da697 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/wizard/TransformationRhapsodyWizard.java +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/src/org/eclipse/papyrus/migration/rhapsody/wizard/TransformationRhapsodyWizard.java @@ -16,6 +16,7 @@ package org.eclipse.papyrus.migration.rhapsody.wizard; import org.eclipse.papyrus.migration.common.MigrationParameters.ThreadConfig; import org.eclipse.papyrus.migration.common.transformation.AbstractImportTransformationLauncher; import org.eclipse.papyrus.migration.common.wizard.AbstractTransformationWizard; +import org.eclipse.papyrus.migration.rhapsody.messages.Messages; import org.eclipse.papyrus.migration.rhapsody.transformations.RhapsodyImportTransformationLauncher; import org.eclipse.swt.widgets.Control; @@ -27,7 +28,7 @@ import org.eclipse.swt.widgets.Control; public class TransformationRhapsodyWizard extends AbstractTransformationWizard { public TransformationRhapsodyWizard() { - super("Rhapsody Transformation Wizard", new RhapsodyDialogData()); + super(Messages.TransformationRhapsodyWizard_WizardTitle, new RhapsodyDialogData()); } /** |