Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvlorenzo2012-01-26 16:37:13 +0000
committervlorenzo2012-01-26 16:37:13 +0000
commit61e7cc81e349c534326038039e973c131f074694 (patch)
treea5abe379b2e4600204505e1f93b679adc289bc32
parentd1d7932b5ca30be5ad89edd6674e141b72d3d3df (diff)
downloadorg.eclipse.papyrus-61e7cc81e349c534326038039e973c131f074694.tar.gz
org.eclipse.papyrus-61e7cc81e349c534326038039e973c131f074694.tar.xz
org.eclipse.papyrus-61e7cc81e349c534326038039e973c131f074694.zip
367436: [Refactoring] [ModelExplorer] Remove deprecated classes and move useful classes in the correct plugins
https://bugs.eclipse.org/bugs/show_bug.cgi?id=367436
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/plugin.xml75
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/DeleteDiagramHandler.java (renamed from plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/DeleteDiagramHandler.java)3
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/DuplicateDiagramHandler.java (renamed from plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/DuplicateDiagramHandler.java)8
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/RenameDiagramHandler.java (renamed from plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/RenameDiagramHandler.java)7
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/messages/Messages.java21
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/messages/messages.properties3
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/providers/DiagramPropertyTester.java108
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml44
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/messages/Messages.java34
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/messages/messages.properties3
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/provider/PropertyTester.java36
13 files changed, 224 insertions, 127 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 c9929e50c66..3d8ac6ba0c1 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
@@ -12,7 +12,11 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.emf.facet.infra.query.core,
org.eclipse.emf.facet.infra.browser.custom.core,
org.eclipse.emf.facet.infra.facet.core,
- org.eclipse.gmf.runtime.notation
+ org.eclipse.gmf.runtime.notation,
+ org.eclipse.emf.transaction,
+ org.eclipse.gmf.runtime.common.core,
+ org.eclipse.gmf.runtime.emf.commands.core,
+ org.eclipse.core.expressions
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/plugin.xml
index eeed734d816..fddf8d09aaa 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/plugin.xml
@@ -22,5 +22,80 @@
<facetset
file="resources/PapyrusNotationFacet.facetSet">
</facetset>
+ </extension>
+ <extension
+ point="org.eclipse.ui.handlers">
+ <handler
+ class="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.handlers.RenameDiagramHandler"
+ commandId="org.eclipse.ui.edit.rename">
+ <activeWhen>
+ <with
+ variable="selection">
+ <and>
+ <count
+ value="1">
+ </count>
+ <test
+ forcePluginActivation="true"
+ property="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.diagrampropertytester.isDiagram"
+ value="true">
+ </test>
+ </and>
+ </with>
+ </activeWhen>
+ </handler>
+ <handler
+ class="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.handlers.DuplicateDiagramHandler"
+ commandId="org.eclipse.papyrus.views.modelexplorer.duplicate.command">
+ <activeWhen>
+ <and>
+ <with
+ variable="selection">
+ <and>
+ <count
+ value="1">
+ </count>
+ </and>
+ </with>
+ <with
+ variable="selection">
+ <test
+ forcePluginActivation="true"
+ property="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.diagrampropertytester.isDiagram"
+ value="true">
+ </test>
+ </with>
+ </and>
+ </activeWhen>
+ </handler>
+ <handler
+ class="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.handlers.DeleteDiagramHandler"
+ commandId="org.eclipse.ui.edit.delete">
+ <activeWhen>
+ <and>
+ <with
+ variable="selection">
+ </with>
+ <with
+ variable="selection">
+ <test
+ forcePluginActivation="true"
+ property="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.diagrampropertytester.isDiagram"
+ value="true">
+ </test>
+ </with>
+ </and>
+ </activeWhen>
+ </handler>
+ </extension>
+ <extension
+ point="org.eclipse.core.expressions.propertyTesters">
+ <propertyTester
+ class="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.providers.DiagramPropertyTester"
+ id="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.diagrampropertytester"
+ namespace="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.diagrampropertytester"
+ properties="isDiagram"
+ type="org.eclipse.jface.viewers.IStructuredSelection">
+ </propertyTester>
</extension>
</plugin>
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/DeleteDiagramHandler.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/DeleteDiagramHandler.java
index 456823990b6..4eb13164e26 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/DeleteDiagramHandler.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/DeleteDiagramHandler.java
@@ -11,7 +11,7 @@
* Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.views.modelexplorer.handler;
+package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.handlers;
import java.util.List;
@@ -25,6 +25,7 @@ import org.eclipse.emf.transaction.RecordingCommand;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;
+import org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler;
/**
* Handler for the delete Diagram action
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/DuplicateDiagramHandler.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/DuplicateDiagramHandler.java
index 24d4de5a9f2..ba406d59746 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/DuplicateDiagramHandler.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/DuplicateDiagramHandler.java
@@ -11,7 +11,7 @@
* Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.views.modelexplorer.handler;
+package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.handlers;
import java.util.List;
@@ -23,8 +23,10 @@ import org.eclipse.emf.edit.command.AddCommand;
import org.eclipse.emf.transaction.RecordingCommand;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;
-import org.eclipse.papyrus.views.modelexplorer.messages.Messages;
+import org.eclipse.papyrus.infra.gmfdiag.modelexplorer.messages.Messages;
+import org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler;
/**
* This handler provides the duplicate action for the diagrams
@@ -53,7 +55,7 @@ public class DuplicateDiagramHandler extends AbstractCommandHandler {
// Clone the current diagram
final Diagram newDiagram = EcoreUtil.copy(diagram);
// Give a new name
- newDiagram.setName(Messages.DuplicateDiagramHandler_copy_of + diagram.getName());
+ newDiagram.setName(NLS.bind(Messages.DuplicateDiagramHandler_CopyOf, diagram.getName()));
Command addGmfDiagramCmd = new AddCommand(editingDomain, diagram.eResource().getContents(), newDiagram);
// EMFCommandOperation operation = new
// EMFCommandOperation(editingDomain,
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/RenameDiagramHandler.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/RenameDiagramHandler.java
index ffd8a2fe5de..e7fab13b0de 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/RenameDiagramHandler.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/RenameDiagramHandler.java
@@ -11,7 +11,7 @@
* Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
*
*****************************************************************************/
-package org.eclipse.papyrus.views.modelexplorer.handler;
+package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.handlers;
import java.util.List;
@@ -26,7 +26,8 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCo
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.jface.dialogs.InputDialog;
import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.views.modelexplorer.messages.Messages;
+import org.eclipse.papyrus.infra.gmfdiag.modelexplorer.messages.Messages;
+import org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler;
import org.eclipse.swt.widgets.Display;
/**
@@ -58,7 +59,7 @@ public class RenameDiagramHandler extends AbstractCommandHandler {
@Override
protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- InputDialog dialog = new InputDialog(Display.getCurrent().getActiveShell(), Messages.RenameDiagramHandler_rename_an_existing_diagram, Messages.RenameDiagramHandler_new_name, currentName, null);
+ InputDialog dialog = new InputDialog(Display.getCurrent().getActiveShell(), Messages.RenameDiagramHandler_RenameAnExistingDiagram, Messages.RenameDiagramHandler_NewName, currentName, null);
if(dialog.open() == Window.OK) {
final String name = dialog.getValue();
if(name != null && name.length() > 0) {
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/messages/Messages.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/messages/Messages.java
new file mode 100644
index 00000000000..60dd97996b0
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/messages/Messages.java
@@ -0,0 +1,21 @@
+package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+ private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.gmfdiag.modelexplorer.messages.messages"; //$NON-NLS-1$
+
+ public static String DuplicateDiagramHandler_CopyOf;
+
+ public static String RenameDiagramHandler_NewName;
+
+ public static String RenameDiagramHandler_RenameAnExistingDiagram;
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ }
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/messages/messages.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/messages/messages.properties
new file mode 100644
index 00000000000..696090c9cea
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/messages/messages.properties
@@ -0,0 +1,3 @@
+DuplicateDiagramHandler_CopyOf=Copy Of {0}
+RenameDiagramHandler_NewName=New name:
+RenameDiagramHandler_RenameAnExistingDiagram=Rename an existing diagram
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/providers/DiagramPropertyTester.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/providers/DiagramPropertyTester.java
new file mode 100644
index 00000000000..3e7aeea2b34
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/providers/DiagramPropertyTester.java
@@ -0,0 +1,108 @@
+/*****************************************************************************
+ * Copyright (c) 2011 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:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.providers;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;
+import org.eclipse.core.expressions.PropertyTester;
+
+/**
+ * This class provides test called by the plugin.xml in order to know if handlers should be active or not.
+ *
+ * Sometimes these test can be done directly in the plugin.xml in the activeWhen (with instanceof, adapt, ...),
+ * but in this case, Eclipse doesn't refresh correctly the status of the command in the menu Edit or in other menu.
+ *
+ *
+ * FIXME : i think this class is not yet used
+ */
+public class DiagramPropertyTester extends PropertyTester {
+
+
+ /** property to test if the selected elements is a table */
+ public static final String IS_DIAGRAM = "isDiagram"; //$NON-NLS-1$
+
+
+ /**
+ *
+ * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
+ *
+ * @param receiver
+ * @param property
+ * @param args
+ * @param expectedValue
+ * @return
+ */
+ public boolean test(final Object receiver, final String property, final Object[] args, final Object expectedValue) {
+ if(IS_DIAGRAM.equals(property) && receiver instanceof IStructuredSelection) {
+ boolean answer = isDiagram((IStructuredSelection)receiver);
+ return new Boolean(answer).equals(expectedValue);
+ }
+ return false;
+ }
+
+
+
+// /**
+// * Tests the selection in order to know if it contains only {@link TableInstance}
+// *
+// * @param selection
+// * @return
+// * <code>true</code> if the selection is composed by {@link TableInstance}
+// */
+// private boolean isDiagram(final IStructuredSelection selection) {
+// if(!selection.isEmpty()) {
+// Iterator<?> iter = selection.iterator();
+// while(iter.hasNext()) {
+// if(!(iter.next() instanceof Diagram)) {
+// return false;
+// }
+// }
+// return true;
+// }
+// return false;
+// }
+//
+ /**
+ * Tests the selection in order to know if it contains only {@link Diagram}
+ *
+ * @param selection
+ * @return
+ * <code>true</code> if the selection is composed by {@link Diagram}
+ *
+ * FIXME : this method should be in an upper plugin like oep.infra.gmfdiag.common
+ * FIXME : why use this one and not the other method isDiagram (see upper in this class)
+ */
+ private boolean isDiagram(IStructuredSelection selection) {
+ if(!selection.isEmpty()) {
+ Iterator<?> iter = selection.iterator();
+ while(iter.hasNext()) {
+ /**
+ * Set to use the IAdaptable mechanism
+ * Used for example for facet elements
+ */
+ final Object next = iter.next();
+ EObject diag = NavigatorUtils.getElement(next, EObject.class);
+ if(!(diag instanceof Diagram)) {
+ return false;
+ }
+ }
+ return true;
+ }
+ return false;
+ }
+}
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.settings/org.eclipse.core.resources.prefs b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 9373478f4da..00000000000
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Nov 04 13:28:02 CET 2011
-eclipse.preferences.version=1
-encoding//src/org/eclipse/papyrus/views/modelexplorer/messages/messages.properties=ISO-8859-1
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml
index 36b011b7b95..b13729d5a9a 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml
@@ -280,19 +280,6 @@
</command>
</extension>
<extension point="org.eclipse.ui.handlers">
- <handler class="org.eclipse.papyrus.views.modelexplorer.handler.RenameDiagramHandler" commandId="org.eclipse.ui.edit.rename">
- <activeWhen>
- <with variable="selection">
- <and>
- <count value="1">
- </count>
- <!-- We add this test in order to refresh the Rename action in the menu edit -->
- <test forcePluginActivation="true" property="org.eclipse.papyrus.views.modelexplorer.tester.isDiagram" value="true">
- </test>
- </and>
- </with>
- </activeWhen>
- </handler>
<handler commandId="org.eclipse.papyrus.views.modelexplorer.popup.close.command">
<activeWhen>
<with variable="selection">
@@ -321,19 +308,6 @@
</with>
</activeWhen>
</handler>
- <handler class="org.eclipse.papyrus.views.modelexplorer.handler.DeleteDiagramHandler" commandId="org.eclipse.ui.edit.delete">
- <activeWhen>
- <and>
- <with variable="selection">
- </with>
- <!-- We add this test in order to refresh the Delete action in the menu edit -->
- <with variable="selection">
- <test forcePluginActivation="true" property="org.eclipse.papyrus.views.modelexplorer.tester.isDiagram" value="true">
- </test>
- </with>
- </and>
- </activeWhen>
- </handler>
<handler commandId="org.eclipse.papyrus.views.modelexplorer.popup.open.command">
<activeWhen>
<with variable="selection">
@@ -362,22 +336,6 @@
</parameter>
</class>
</handler>
- <handler class="org.eclipse.papyrus.views.modelexplorer.handler.DuplicateDiagramHandler" commandId="org.eclipse.papyrus.views.modelexplorer.duplicate.command">
- <activeWhen>
- <and>
- <with variable="selection">
- <and>
- <count value="1">
- </count>
- </and>
- </with>
- <with variable="selection">
- <test forcePluginActivation="true" property="org.eclipse.papyrus.views.modelexplorer.tester.isDiagram" value="true">
- </test>
- </with>
- </and>
- </activeWhen>
- </handler>
<handler class="org.eclipse.papyrus.views.modelexplorer.handler.CutHandler" commandId="org.eclipse.ui.edit.cut">
<activeWhen>
<and>
@@ -426,7 +384,7 @@
</extension>
<extension point="org.eclipse.core.expressions.propertyTesters">
<!-- the property tester is used to enabled/disabled handler -->
- <propertyTester class="org.eclipse.papyrus.views.modelexplorer.provider.PropertyTester" id="org.eclipse.papyrus.views.modelexplorer.tester" namespace="org.eclipse.papyrus.views.modelexplorer.tester" properties="isDiagram, isEObject, isPage" type="org.eclipse.jface.viewers.IStructuredSelection">
+ <propertyTester class="org.eclipse.papyrus.views.modelexplorer.provider.PropertyTester" id="org.eclipse.papyrus.views.modelexplorer.tester" namespace="org.eclipse.papyrus.views.modelexplorer.tester" properties="isEObject, isPage" type="org.eclipse.jface.viewers.IStructuredSelection">
</propertyTester>
<propertyTester class="org.eclipse.papyrus.views.modelexplorer.provider.PropertyTester" id="org.eclipse.papyrus.views.modelexplorer.tester.view" namespace="org.eclipse.papyrus.views.modelexplorer.tester.view" properties="isModelExplorer" type="org.eclipse.ui.IWorkbenchPart">
</propertyTester>
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/messages/Messages.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/messages/Messages.java
deleted file mode 100644
index 479ff81f40f..00000000000
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/messages/Messages.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 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:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.views.modelexplorer.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.papyrus.views.modelexplorer.messages.messages"; //$NON-NLS-1$
-
- public static String DuplicateDiagramHandler_copy_of;
-
- public static String RenameDiagramHandler_new_name;
-
- public static String RenameDiagramHandler_rename_an_existing_diagram;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- }
-}
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/messages/messages.properties b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/messages/messages.properties
deleted file mode 100644
index 59481552d33..00000000000
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/messages/messages.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-DuplicateDiagramHandler_copy_of=Copy of
-RenameDiagramHandler_new_name=New name:
-RenameDiagramHandler_rename_an_existing_diagram=Rename an existing diagram
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/provider/PropertyTester.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/provider/PropertyTester.java
index d8f84a5730a..1a73ad89483 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/provider/PropertyTester.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/provider/PropertyTester.java
@@ -37,9 +37,6 @@ import org.eclipse.ui.IWorkbenchPart;
*/
public class PropertyTester extends org.eclipse.core.expressions.PropertyTester {
- /** property to test if the selected element are open in the editor */
- public static final String IS_DIAGRAM = "isDiagram"; //$NON-NLS-1$
-
/** property to test if the selected elements is an eObject */
public static final String IS_EOBJECT = "isEObject"; //$NON-NLS-1$
@@ -60,11 +57,6 @@ public class PropertyTester extends org.eclipse.core.expressions.PropertyTester
* @return
*/
public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
- if(IS_DIAGRAM.equals(property) && receiver instanceof IStructuredSelection) {
- boolean answer = isDiagram((IStructuredSelection)receiver);
- return new Boolean(answer).equals(expectedValue);
- }
-
if(IS_EOBJECT.equals(property) && receiver instanceof IStructuredSelection) {
boolean answer = isObject((IStructuredSelection)receiver);
return new Boolean(answer).equals(expectedValue);
@@ -166,33 +158,5 @@ public class PropertyTester extends org.eclipse.core.expressions.PropertyTester
return false;
}
- /**
- * Tests the selection in order to know if it contains only {@link Diagram}
- *
- * @param selection
- * @return
- * <code>true</code> if the selection is composed by {@link Diagram}
- *
- * FIXME : we should call the method isDiagram in
- * oep.diagram.common#DiagramPropertyTester
- */
- private boolean isDiagram(IStructuredSelection selection) {
- if(!selection.isEmpty()) {
- Iterator<?> iter = selection.iterator();
- while(iter.hasNext()) {
- /**
- * Set to use the IAdaptable mechanism
- * Used for example for facet elements
- */
- final Object next = iter.next();
- EObject diag = NavigatorUtils.getElement(next, EObject.class);
- if(!(diag instanceof Diagram)) {
- return false;
- }
- }
- return true;
- }
- return false;
- }
}

Back to the top