Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2012-04-26 15:40:01 -0400
committerkmoore2012-04-26 15:40:01 -0400
commit7f8aac824a448059ba42a5521ec6f853ad1889e0 (patch)
tree9cbdedc35336d397e814a47638703b80c61d112b
parentf73969ca9309246475b826097890797beeeceb4a (diff)
downloadwebtools.dali-7f8aac824a448059ba42a5521ec6f853ad1889e0.tar.gz
webtools.dali-7f8aac824a448059ba42a5521ec6f853ad1889e0.tar.xz
webtools.dali-7f8aac824a448059ba42a5521ec6f853ad1889e0.zip
Bug 377809 - JAXB menu appears in right-click of a JPA project package
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml14
1 files changed, 12 insertions, 2 deletions
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml
index 4a915d4b66..287d099477 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.2"?> <!--
- Copyright (c) 2010, 2011 Oracle. All rights reserved.
+ Copyright (c) 2010, 2012 Oracle. 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
@@ -169,7 +169,17 @@
<with
variable="selection">
<iterate ifEmpty="false">
- <adapt type="org.eclipse.jpt.jaxb.core.context.JaxbPackage"/>
+ <!-- bug 377809 test for jaxb facet: if o.e.jpt.jaxb.core plug-in not active,
+ the JaxbPackage AdapterFactory will not be called and the expression evaluates to true,
+ that causes the JAXB menu to appear for JPA project packages -->
+ <and>
+ <adapt type="org.eclipse.core.resources.IResource">
+ <test
+ property="org.eclipse.wst.common.project.facet.core.projectFacet"
+ value="jpt.jaxb"/>
+ </adapt>
+ <adapt type="org.eclipse.jpt.jaxb.core.context.JaxbPackage"/>
+ </and>
</iterate>
</with>
</visibleWhen>

Back to the top