diff options
author | Florian Noyrit | 2016-08-09 10:25:50 +0000 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org | 2016-08-28 15:46:41 +0000 |
commit | 7310db0b3b2e8ee805fedf4bfd16baf438c89332 (patch) | |
tree | 3dadff6a067e8d8bcbf837d8277dfac7749aef27 /plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer | |
parent | 7851474fe5f33de156c797942945a3e9c97cb0a8 (diff) | |
download | org.eclipse.papyrus-7310db0b3b2e8ee805fedf4bfd16baf438c89332.tar.gz org.eclipse.papyrus-7310db0b3b2e8ee805fedf4bfd16baf438c89332.tar.xz org.eclipse.papyrus-7310db0b3b2e8ee805fedf4bfd16baf438c89332.zip |
Bug 443799 - Fix potential bugs identified by FindBugs in oep.infra.*
Bug 499554 - Oxygen release version number moved to 3.0.0.
Change-Id: I8e112db7175a5b89eb9b37973639627a6c29e007
Diffstat (limited to 'plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer')
2 files changed, 5 insertions, 4 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF index ed6b314cd4a..60578c27e04 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[2.0.0,3.0.0)", +Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.views.modelexplorer;bundle-version="[2.0.0,3.0.0)" + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/RenameDiagramHandler.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/RenameDiagramHandler.java index 9f6e58a705e..c8b292288bb 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/RenameDiagramHandler.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/RenameDiagramHandler.java @@ -32,6 +32,7 @@ import org.eclipse.jface.window.Window; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; import org.eclipse.papyrus.infra.gmfdiag.modelexplorer.messages.Messages; import org.eclipse.papyrus.views.modelexplorer.DirectEditorEditingSupport; +import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper; import org.eclipse.swt.widgets.Display; /** @@ -69,7 +70,7 @@ public class RenameDiagramHandler extends AbstractDiagramCommandHandler { } } }; - return new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(cmd); + return new GMFtoEMFCommandWrapper(cmd); } } return UnexecutableCommand.INSTANCE; |