Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lorenzo2022-01-26 16:28:25 +0000
committerPatrick Tessier2022-01-28 17:56:04 +0000
commit13eae9635eec680ec415ef66dd3b3752766c04f9 (patch)
tree9573dea897fb5769a4d7d11906ca572b1d089837 /plugins/uml/diagram
parentb34cdd3ffb5fe1dfda19365d9dac80e5ef01ac01 (diff)
downloadorg.eclipse.papyrus-13eae9635eec680ec415ef66dd3b3752766c04f9.tar.gz
org.eclipse.papyrus-13eae9635eec680ec415ef66dd3b3752766c04f9.tar.xz
org.eclipse.papyrus-13eae9635eec680ec415ef66dd3b3752766c04f9.zip
Bug 577822 - [Diagram][Menu] The menu declared for Papyrus GMF Diagram
are also visible/active on Sirius Diagram and it should not - Hide the menu - Hide the toolbar - the visibleWhen condition is done on selection in order to be properly refreshed Change-Id: Ibf6fc1561c47d98bcd90941d4a61b62285d47b41 Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
Diffstat (limited to 'plugins/uml/diagram')
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF2
-rwxr-xr-xplugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.xml195
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/pom.xml2
3 files changed, 117 insertions, 82 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
index b566df1ad9f..c1f7c2bda2c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)",
org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.0.100.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.uml.diagram.menu.Activator
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.xml
index f5322b31ed9..e82ea048453 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.xml
@@ -32,12 +32,16 @@
label="&amp;Diagram"
tooltip="Diagram Menu">
<visibleWhen>
- <with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ <and>
+ <with
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
+ </and>
</visibleWhen>
</menu>
</menuContribution>
@@ -207,12 +211,14 @@
tooltip="Line Style Action">
<visibleWhen>
<and>
- <with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ <with
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</command>
@@ -229,11 +235,13 @@
<visibleWhen>
<and>
<with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</command>
@@ -250,11 +258,13 @@
<visibleWhen>
<and>
<with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</command>
@@ -267,11 +277,13 @@
<visibleWhen>
<and>
<with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</command>
@@ -284,11 +296,13 @@
<visibleWhen>
<and>
<with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</command>
@@ -301,11 +315,13 @@
<visibleWhen>
<and>
<with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</command>
@@ -318,11 +334,13 @@
<visibleWhen>
<and>
<with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</command>
@@ -335,11 +353,13 @@
<visibleWhen>
<and>
<with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</command>
@@ -352,11 +372,13 @@
<visibleWhen>
<and>
<with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</command>
@@ -373,10 +395,12 @@
<visibleWhen
checkEnabled="false">
<with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
</with>
</visibleWhen>
</command>
@@ -387,12 +411,14 @@
tooltip="Auto Size">
<visibleWhen>
<and>
- <with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ <with
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</command>
@@ -405,11 +431,13 @@
<visibleWhen>
<and>
<with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</command>
@@ -419,22 +447,29 @@
<visibleWhen
checkEnabled="false">
<and>
- <with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ <with
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</dynamic>
- <visibleWhen>
- <with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ <visibleWhen
+ checkEnabled="false">
+ <and>
+ <with
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
+ </and>
</visibleWhen>
</toolbar>
</menuContribution>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/pom.xml
index d2ca70dad93..287d17915b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/pom.xml
@@ -7,6 +7,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.uml.diagram.menu</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file

Back to the top