summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaren Butzke2013-01-14 07:58:47 (EST)
committerKaren Butzke2013-01-14 07:58:47 (EST)
commit043607eb696bea1f9580cfadf113ed9438d3aa9a (patch)
tree0036f2a975095ccad3136972e91f45184f452310
parent4618c40bf1d2e0a440c63f86667e4c0288f51614 (diff)
downloadwebtools.dali-043607eb696bea1f9580cfadf113ed9438d3aa9a.zip
webtools.dali-043607eb696bea1f9580cfadf113ed9438d3aa9a.tar.gz
webtools.dali-043607eb696bea1f9580cfadf113ed9438d3aa9a.tar.bz2
my facetedReferencingProjects property tester was not checking *this* project for the given facet
-rw-r--r--common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/bundleexclude/FacetedReferencingProjectsPropertyTester.java3
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/plugin.xml2
2 files changed, 4 insertions, 1 deletions
diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/bundleexclude/FacetedReferencingProjectsPropertyTester.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/bundleexclude/FacetedReferencingProjectsPropertyTester.java
index c2c5cba..b20239d 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/bundleexclude/FacetedReferencingProjectsPropertyTester.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/bundleexclude/FacetedReferencingProjectsPropertyTester.java
@@ -38,6 +38,9 @@ public final class FacetedReferencingProjectsPropertyTester
}
if (receiver instanceof IResource) {
try {
+ if (FacetedProjectFramework.hasProjectFacet(((IResource) receiver).getProject() , facetId, versionExpression)) {
+ return true;
+ }
for (IProject project : ((IResource) receiver).getProject().getReferencingProjects()) {
if (FacetedProjectFramework.hasProjectFacet(project, facetId, versionExpression)) {
return true;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/plugin.xml b/jpa/plugins/org.eclipse.jpt.jpa.core/plugin.xml
index 666ed16..f3185b6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/plugin.xml
@@ -35,7 +35,7 @@
value="jpt.jpa"
forcePluginActivation="true"/>
</definition>
- <!-- A test for determining whether an IResource has any referencing projects with the JPA facet.
+ <!-- A test for determining whether an IResource's project or any referencing projects has the JPA facet.
Force activation of the org.eclipse.jpt.common.core plug-in containing the property tester.
Though in this case the property tester class is in a package that does not cause the plug-in to load.
So the class will be loaded, but the plug-in will not.