Bug 553412 - ECP Property testers logging errors
Change-Id: I02540d7dfc8715ada2dc5540a81c6df56ecb0f72
Signed-off-by: Alexandra Buzila <abuzila@eclipsesource.com>
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/plugin.xml b/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/plugin.xml
index c23becd..272576a 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/plugin.xml
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/plugin.xml
@@ -348,22 +348,25 @@
<enabledWhen>
<with
variable="activeMenuSelection">
- <iterate
- ifEmpty="false"
- operator="and">
- <test
- property="org.eclipse.emf.ecp.core.project.open"
- value="true">
- </test>
- <test
- property="org.eclipse.emf.ecp.emfstore.ui.testers.elementShared"
- value="true">
- </test>
- <test
- property="org.eclipse.emf.ecp.emfstore.ui.testers.isDirty"
- value="true">
- </test>
- </iterate>
+ <iterate
+ ifEmpty="false"
+ operator="and">
+ <instanceof
+ value="org.eclipse.emf.ecp.core.ECPProject">
+ </instanceof>
+ <test
+ property="org.eclipse.emf.ecp.core.project.open"
+ value="true">
+ </test>
+ <test
+ property="org.eclipse.emf.ecp.emfstore.ui.testers.elementShared"
+ value="true">
+ </test>
+ <test
+ property="org.eclipse.emf.ecp.emfstore.ui.testers.isDirty"
+ value="true">
+ </test>
+ </iterate>
</with>
</enabledWhen>
</handler>
@@ -373,18 +376,21 @@
<enabledWhen>
<with
variable="activeMenuSelection">
- <iterate
- ifEmpty="false"
- operator="and">
- <test
- property="org.eclipse.emf.ecp.core.project.open"
- value="true">
- </test>
- <test
- property="org.eclipse.emf.ecp.emfstore.ui.testers.elementShared"
- value="false">
- </test>
- </iterate>
+ <iterate
+ ifEmpty="false"
+ operator="and">
+ <instanceof
+ value="org.eclipse.emf.ecp.core.ECPProject">
+ </instanceof>
+ <test
+ property="org.eclipse.emf.ecp.core.project.open"
+ value="true">
+ </test>
+ <test
+ property="org.eclipse.emf.ecp.emfstore.ui.testers.elementShared"
+ value="false">
+ </test>
+ </iterate>
</with>
</enabledWhen>
</handler>
@@ -419,18 +425,28 @@
<enabledWhen>
<with
variable="activeMenuSelection">
- <iterate
- ifEmpty="false"
- operator="or">
- <test
- property="org.eclipse.emf.ecp.core.project.open"
- value="true">
- </test>
- <test
- property="org.eclipse.emf.ecp.emfstore.ui.testers.isDirty"
- value="true">
- </test>
- </iterate>
+ <iterate
+ ifEmpty="false"
+ operator="or">
+ <and>
+ <instanceof
+ value="org.eclipse.emf.ecp.core.ECPProject">
+ </instanceof>
+ <test
+ property="org.eclipse.emf.ecp.core.project.open"
+ value="true">
+ </test>
+ </and>
+ <and>
+ <instanceof
+ value="org.eclipse.emf.ecp.core.ECPProject">
+ </instanceof>
+ <test
+ property="org.eclipse.emf.ecp.emfstore.ui.testers.isDirty"
+ value="true">
+ </test>
+ </and>
+ </iterate>
</with>
</enabledWhen>
</handler>
@@ -440,18 +456,28 @@
<enabledWhen>
<with
variable="activeMenuSelection">
- <iterate
- ifEmpty="false"
- operator="or">
- <test
- property="org.eclipse.emf.ecp.core.project.open"
- value="true">
- </test>
- <test
- property="org.eclipse.emf.ecp.emfstore.ui.testers.isDirty"
- value="true">
- </test>
- </iterate>
+ <iterate
+ ifEmpty="false"
+ operator="or">
+ <and>
+ <instanceof
+ value="org.eclipse.emf.ecp.core.ECPProject">
+ </instanceof>
+ <test
+ property="org.eclipse.emf.ecp.core.project.open"
+ value="true">
+ </test>
+ </and>
+ <and>
+ <instanceof
+ value="org.eclipse.emf.ecp.core.ECPProject">
+ </instanceof>
+ <test
+ property="org.eclipse.emf.ecp.emfstore.ui.testers.isDirty"
+ value="true">
+ </test>
+ </and>
+ </iterate>
</with>
</enabledWhen>
</handler>
@@ -549,18 +575,23 @@
<enabledWhen>
<with
variable="activeMenuSelection">
- <iterate
- ifEmpty="false"
- operator="or">
- <test
- property="org.eclipse.emf.ecp.core.repository.providerName"
- value="org.eclipse.emf.ecp.emfstore.provider">
- </test>
- <test
- property="org.eclipse.emf.ecp.emfstore.ui.testers.isLocalAndNotRunning"
- value="true">
- </test>
- </iterate>
+ <iterate
+ ifEmpty="false"
+ operator="or">
+ <and>
+ <instanceof
+ value="org.eclipse.emf.ecp.core.ECPRepository">
+ </instanceof>
+ <test
+ property="org.eclipse.emf.ecp.core.repository.providerName"
+ value="org.eclipse.emf.ecp.emfstore.provider">
+ </test>
+ </and>
+ <test
+ property="org.eclipse.emf.ecp.emfstore.ui.testers.isLocalAndNotRunning"
+ value="true">
+ </test>
+ </iterate>
</with>
</enabledWhen>
</handler>
diff --git a/bundles/org.eclipse.emf.ecp.ui.e3/plugin.xml b/bundles/org.eclipse.emf.ecp.ui.e3/plugin.xml
index dc435a0..7113518 100644
--- a/bundles/org.eclipse.emf.ecp.ui.e3/plugin.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.e3/plugin.xml
@@ -558,9 +558,9 @@
<iterate
ifEmpty="false"
operator="and">
- <instanceof
- value="org.eclipse.emf.ecp.core.ECPProject">
- </instanceof>
+ <instanceof
+ value="org.eclipse.emf.ecp.core.ECPProject">
+ </instanceof>
<test
property="org.eclipse.emf.ecp.core.project.open"
value="true">
@@ -638,6 +638,9 @@
<iterate
ifEmpty="false"
operator="and">
+ <instanceof
+ value="org.eclipse.emf.ecp.core.ECPProject">
+ </instanceof>
<test
property="org.eclipse.emf.ecp.core.project.open"
value="true">
diff --git a/bundles/org.eclipse.emf.ecp.workspace.ui/plugin.xml b/bundles/org.eclipse.emf.ecp.workspace.ui/plugin.xml
index 4823676..0dd977d 100644
--- a/bundles/org.eclipse.emf.ecp.workspace.ui/plugin.xml
+++ b/bundles/org.eclipse.emf.ecp.workspace.ui/plugin.xml
@@ -26,18 +26,28 @@
<enabledWhen>
<with
variable="activeMenuSelection">
- <iterate
- ifEmpty="false"
- operator="or">
- <test
- property="org.eclipse.emf.ecp.core.project.open"
- value="true">
- </test>
- <test
- property="org.eclipse.emf.ecp.workspace.ui.testers.canUndo"
- value="true">
- </test>
- </iterate>
+ <iterate
+ ifEmpty="false"
+ operator="or">
+ <and>
+ <instanceof
+ value="org.eclipse.emf.ecp.core.ECPProject">
+ </instanceof>
+ <test
+ property="org.eclipse.emf.ecp.core.project.open"
+ value="true">
+ </test>
+ </and>
+ <and>
+ <instanceof
+ value="org.eclipse.emf.ecp.core.ECPProject">
+ </instanceof>
+ <test
+ property="org.eclipse.emf.ecp.workspace.ui.testers.canUndo"
+ value="true">
+ </test>
+ </and>
+ </iterate>
</with>
</enabledWhen>
</handler>
