[338859] exception right-clicking attribute in JPA structure view
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/plugin.xml b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/plugin.xml
index 893417d..aed3594 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/plugin.xml
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/plugin.xml
@@ -36,7 +36,7 @@
objectClass="org.eclipse.jpt.jpa.core.JpaNode">
<enablement>
- <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jpt.jpa"/>
+ <test property="org.eclipse.jpt.jpadiagrameditor.ui.jpaProjectFacet" value="jpt.jpa"/>
</enablement>
<menu
id="org.eclipse.jpt.jpadiagrameditor.ui.openDiagramJpaMenu"
@@ -139,7 +139,7 @@
<extension point="org.eclipse.core.expressions.propertyTesters">
<propertyTester
id="org.eclipse.jpt.jpadiagrameditor.ui.propertytester.JpaProjectFacetVersionPropertyTester"
- type="org.eclipse.jpt.core.JpaNode"
+ type="org.eclipse.jpt.jpa.core.JpaNode"
namespace="org.eclipse.jpt.jpadiagrameditor.ui"
properties="jpaProjectFacet"
class="org.eclipse.jpt.jpadiagrameditor.ui.internal.propertytester.JpaProjectFacetVersionPropertyTester">
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/propertytester/JpaProjectFacetVersionPropertyTester.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/propertytester/JpaProjectFacetVersionPropertyTester.java
index 26936ab..86a00f2 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/propertytester/JpaProjectFacetVersionPropertyTester.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/propertytester/JpaProjectFacetVersionPropertyTester.java
@@ -1,10 +1,7 @@
package org.eclipse.jpt.jpadiagrameditor.ui.internal.propertytester;
import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.jpt.jpa.core.JpaNode;
-import org.eclipse.jpt.jpa.core.JpaProject;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
@@ -18,21 +15,12 @@
String[] subValues = ((String) value).split(":"); //$NON-NLS-1$
String receiverId = subValues[0];
- String receiverVersion = subValues[1];
if (receiver instanceof JpaNode) {
- JpaProject project = ((JpaNode)receiver).getJpaProject();
- try {
- IFacetedProject fproj = ProjectFacetsManager.create(project.getProject());
- if(receiverId.equals(ID) && receiverVersion.equals(fproj.getProjectFacetVersion(FACET).getVersionString())){
- return true;
- }
- } catch (CoreException e) {
- e.printStackTrace();
- }
+ if(receiverId.equals(ID)){
+ return true;
+ }
}
-
return false;
- }
-
+ }
}
