Author: akazakov Date: 2012-04-13 18:57:10 -0400 (Fri, 13 Apr 2012) New Revision: 40188 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml Log: https://issues.jboss.org/browse/JBIDE-11471 Context New Menu does not provide the best options for "java" Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2012-04-13 21:01:21 UTC (rev 40187) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2012-04-13 22:57:10 UTC (rev 40188) @@ -446,89 +446,39 @@ type="new" wizardId="org.jboss.tools.cdi.ui.wizard.NewBeanCreationWizard"> <enablement> - <or> - <instanceof value="org.eclipse.jdt.core.IPackageFragment"/> - <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/> - <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/> - <adapt type="org.eclipse.core.resources.IProject"> - <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/> - </adapt> - </or> + <and> + <or> + <instanceof value="org.eclipse.jdt.core.IPackageFragment"/> + <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/> + <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/> + <adapt type="org.eclipse.core.resources.IProject"> + <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/> + </adapt> + </or> + <adapt type="org.eclipse.core.resources.IResource"> + <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/> + </adapt> + </and> </enablement> </commonWizard> <commonWizard menuGroupId="org.jboss.tools.cdi.ui" type="new" - wizardId="org.jboss.tools.cdi.ui.wizard.NewQualifierCreationWizard"> - <enablement> - <or> - <instanceof value="org.eclipse.jdt.core.IPackageFragment"/> - <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/> - <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/> - <adapt type="org.eclipse.core.resources.IProject"> - <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/> - </adapt> - </or> - </enablement> - </commonWizard> - <commonWizard - menuGroupId="org.jboss.tools.cdi.ui" - type="new" - wizardId="org.jboss.tools.cdi.ui.wizard.NewStereotypeCreationWizard"> - <enablement> - <or> - <instanceof value="org.eclipse.jdt.core.IPackageFragment"/> - <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/> - <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/> - <adapt type="org.eclipse.core.resources.IProject"> - <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/> - </adapt> - </or> - </enablement> - </commonWizard> - <commonWizard - menuGroupId="org.jboss.tools.cdi.ui" - type="new" - wizardId="org.jboss.tools.cdi.ui.wizard.NewScopeCreationWizard"> - <enablement> - <or> - <instanceof value="org.eclipse.jdt.core.IPackageFragment"/> - <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/> - <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/> - <adapt type="org.eclipse.core.resources.IProject"> - <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/> - </adapt> - </or> - </enablement> - </commonWizard> - <commonWizard - menuGroupId="org.jboss.tools.cdi.ui" - type="new" - wizardId="org.jboss.tools.cdi.ui.wizard.NewInterceptorBindingCreationWizard"> - <enablement> - <or> - <instanceof value="org.eclipse.jdt.core.IPackageFragment"/> - <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/> - <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/> - <adapt type="org.eclipse.core.resources.IProject"> - <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/> - </adapt> - </or> - </enablement> - </commonWizard> - <commonWizard - menuGroupId="org.jboss.tools.cdi.ui" - type="new" wizardId="org.jboss.tools.cdi.ui.wizard.NewInterceptorCreationWizard"> <enablement> - <or> - <instanceof value="org.eclipse.jdt.core.IPackageFragment"/> - <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/> - <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/> - <adapt type="org.eclipse.core.resources.IProject"> - <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/> - </adapt> - </or> + <and> + <or> + <instanceof value="org.eclipse.jdt.core.IPackageFragment"/> + <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/> + <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/> + <adapt type="org.eclipse.core.resources.IProject"> + <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/> + </adapt> + </or> + <adapt type="org.eclipse.core.resources.IResource"> + <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/> + </adapt> + </and> </enablement> </commonWizard> <commonWizard @@ -536,41 +486,36 @@ type="new" wizardId="org.jboss.tools.cdi.ui.wizard.NewDecoratorCreationWizard"> <enablement> - <or> - <instanceof value="org.eclipse.jdt.core.IPackageFragment"/> - <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/> - <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/> - <adapt type="org.eclipse.core.resources.IProject"> - <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/> - </adapt> - </or> + <and> + <or> + <instanceof value="org.eclipse.jdt.core.IPackageFragment"/> + <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/> + <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/> + <adapt type="org.eclipse.core.resources.IProject"> + <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/> + </adapt> + </or> + <adapt type="org.eclipse.core.resources.IResource"> + <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/> + </adapt> + </and> </enablement> </commonWizard> <commonWizard menuGroupId="org.jboss.tools.cdi.ui" type="new" - wizardId="org.jboss.tools.cdi.ui.wizard.NewAnnotationLiteralCreationWizard"> - <enablement> - <or> - <instanceof value="org.eclipse.jdt.core.IPackageFragment"/> - <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/> - <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/> - <adapt type="org.eclipse.core.resources.IProject"> - <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/> - </adapt> - </or> - </enablement> - </commonWizard> - <commonWizard - menuGroupId="org.jboss.tools.cdi.ui" - type="new" wizardId="org.jboss.tools.cdi.ui.wizard.NewBeansXMLCreationWizard"> <enablement> - <or> - <adapt type="org.eclipse.core.resources.IFolder" /> - <adapt type="org.eclipse.core.resources.IProject" /> - <adapt type="org.eclipse.core.resources.IWorkspaceRoot" /> - </or> + <and> + <or> + <adapt type="org.eclipse.core.resources.IFolder" /> + <adapt type="org.eclipse.core.resources.IProject" /> + <adapt type="org.eclipse.core.resources.IWorkspaceRoot" /> + </or> + <adapt type="org.eclipse.core.resources.IResource"> + <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.cdi.core.cdinature"/> + </adapt> + </and> </enablement> </commonWizard> </extension> Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2012-04-13 21:01:21 UTC (rev 40187) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2012-04-13 22:57:10 UTC (rev 40188) @@ -269,96 +269,6 @@ </enablement> </actionProvider> - <commonWizard - menuGroupId="org.jboss.tools.seam.ui" - type="new" - wizardId="org.jboss.tools.seam.ui.wizards.SeamProjectWizard"> - <enablement> - <or> - <adapt type="org.eclipse.core.resources.IFile" /> - <adapt type="org.eclipse.core.resources.IFolder" /> - <adapt type="org.eclipse.core.resources.IProject" /> - <adapt type="org.eclipse.core.resources.IWorkspaceRoot" /> - <instanceof value="org.jboss.tools.seam.core.ISeamElement"/> - </or> - </enablement> - </commonWizard> - - <commonWizard - menuGroupId="org.jboss.tools.seam.ui" - type="new" - wizardId="org.jboss.tools.seam.ui.wizard.SeamActionWizard"> - <enablement> - <or> - <adapt type="org.eclipse.core.resources.IFile" /> - <adapt type="org.eclipse.core.resources.IFolder" /> - <adapt type="org.eclipse.core.resources.IProject" /> - <adapt type="org.eclipse.core.resources.IWorkspaceRoot" /> - <instanceof value="org.jboss.tools.seam.core.ISeamElement"/> - </or> - </enablement> - </commonWizard> - - <commonWizard - menuGroupId="org.jboss.tools.seam.ui" - type="new" - wizardId="org.jboss.tools.seam.ui.wizard.SeamConversationWizard"> - <enablement> - <or> - <adapt type="org.eclipse.core.resources.IFile" /> - <adapt type="org.eclipse.core.resources.IFolder" /> - <adapt type="org.eclipse.core.resources.IProject" /> - <adapt type="org.eclipse.core.resources.IWorkspaceRoot" /> - <instanceof value="org.jboss.tools.seam.core.ISeamElement"/> - </or> - </enablement> - </commonWizard> - - <commonWizard - menuGroupId="org.jboss.tools.seam.ui" - type="new" - wizardId="org.jboss.tools.seam.ui.wizard.SeamEntityWizard"> - <enablement> - <or> - <adapt type="org.eclipse.core.resources.IFile" /> - <adapt type="org.eclipse.core.resources.IFolder" /> - <adapt type="org.eclipse.core.resources.IProject" /> - <adapt type="org.eclipse.core.resources.IWorkspaceRoot" /> - <instanceof value="org.jboss.tools.seam.core.ISeamElement"/> - </or> - </enablement> - </commonWizard> - - <commonWizard - menuGroupId="org.jboss.tools.seam.ui" - type="new" - wizardId="org.jboss.tools.seam.ui.wizard.SeamFormWizard"> - <enablement> - <or> - <adapt type="org.eclipse.core.resources.IFile" /> - <adapt type="org.eclipse.core.resources.IFolder" /> - <adapt type="org.eclipse.core.resources.IProject" /> - <adapt type="org.eclipse.core.resources.IWorkspaceRoot" /> - <instanceof value="org.jboss.tools.seam.core.ISeamElement"/> - </or> - </enablement> - </commonWizard> - - <commonWizard - menuGroupId="org.jboss.tools.seam.ui" - type="new" - wizardId="org.jboss.tools.seam.ui.wizard.SeamGenerateEnitiesWizard"> - <enablement> - <or> - <adapt type="org.eclipse.core.resources.IFile" /> - <adapt type="org.eclipse.core.resources.IFolder" /> - <adapt type="org.eclipse.core.resources.IProject" /> - <adapt type="org.eclipse.core.resources.IWorkspaceRoot" /> - <instanceof value="org.jboss.tools.seam.core.ISeamElement"/> - </or> - </enablement> - </commonWizard> - <commonWizard type="new" wizardId="org.eclipse.ui.wizards.new.folder"> @@ -473,20 +383,27 @@ <enablement> </enablement> </actionProvider> + </navigatorContent> - <commonWizard + <commonWizard menuGroupId="org.jboss.tools.seam.ui" type="new" wizardId="org.jboss.tools.seam.ui.wizard.SeamActionWizard"> <enablement> - <or> - <instanceof value="org.eclipse.jdt.core.IPackageFragment"/> - <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/> - <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/> - <adapt type="org.eclipse.core.resources.IProject"> - <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/> - </adapt> - </or> + <and> + <or> + <instanceof value="org.eclipse.jdt.core.IPackageFragment"/> + <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/> + <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/> + <instanceof value="org.jboss.tools.seam.core.ISeamElement"/> + <adapt type="org.eclipse.core.resources.IProject"> + <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/> + </adapt> + </or> + <adapt type="org.eclipse.core.resources.IResource"> + <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/> + </adapt> + </and> </enablement> </commonWizard> @@ -495,14 +412,20 @@ type="new" wizardId="org.jboss.tools.seam.ui.wizard.SeamConversationWizard"> <enablement> - <or> - <instanceof value="org.eclipse.jdt.core.IPackageFragment"/> - <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/> - <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/> - <adapt type="org.eclipse.core.resources.IProject"> - <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/> - </adapt> - </or> + <and> + <or> + <instanceof value="org.eclipse.jdt.core.IPackageFragment"/> + <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/> + <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/> + <instanceof value="org.jboss.tools.seam.core.ISeamElement"/> + <adapt type="org.eclipse.core.resources.IProject"> + <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/> + </adapt> + </or> + <adapt type="org.eclipse.core.resources.IResource"> + <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/> + </adapt> + </and> </enablement> </commonWizard> @@ -511,14 +434,20 @@ type="new" wizardId="org.jboss.tools.seam.ui.wizard.SeamEntityWizard"> <enablement> - <or> - <instanceof value="org.eclipse.jdt.core.IPackageFragment"/> - <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/> - <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/> - <adapt type="org.eclipse.core.resources.IProject"> - <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/> - </adapt> - </or> + <and> + <or> + <instanceof value="org.eclipse.jdt.core.IPackageFragment"/> + <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/> + <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/> + <instanceof value="org.jboss.tools.seam.core.ISeamElement"/> + <adapt type="org.eclipse.core.resources.IProject"> + <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/> + </adapt> + </or> + <adapt type="org.eclipse.core.resources.IResource"> + <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/> + </adapt> + </and> </enablement> </commonWizard> @@ -527,14 +456,20 @@ type="new" wizardId="org.jboss.tools.seam.ui.wizard.SeamFormWizard"> <enablement> - <or> - <instanceof value="org.eclipse.jdt.core.IPackageFragment"/> - <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/> - <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/> - <adapt type="org.eclipse.core.resources.IProject"> - <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/> - </adapt> - </or> + <and> + <or> + <instanceof value="org.eclipse.jdt.core.IPackageFragment"/> + <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/> + <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/> + <instanceof value="org.jboss.tools.seam.core.ISeamElement"/> + <adapt type="org.eclipse.core.resources.IProject"> + <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/> + </adapt> + </or> + <adapt type="org.eclipse.core.resources.IResource"> + <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/> + </adapt> + </and> </enablement> </commonWizard> @@ -543,18 +478,23 @@ type="new" wizardId="org.jboss.tools.seam.ui.wizard.SeamGenerateEnitiesWizard"> <enablement> - <or> - <instanceof value="org.eclipse.jdt.core.IPackageFragment"/> - <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/> - <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/> - <adapt type="org.eclipse.core.resources.IProject"> - <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/> - </adapt> - </or> + <and> + <or> + <instanceof value="org.eclipse.jdt.core.IPackageFragment"/> + <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/> + <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/> + <instanceof value="org.jboss.tools.seam.core.ISeamElement"/> + <adapt type="org.eclipse.core.resources.IProject"> + <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/> + </adapt> + </or> + <adapt type="org.eclipse.core.resources.IResource"> + <test property="org.eclipse.core.resources.projectNature" value="org.jboss.tools.seam.core.seamnature"/> + </adapt> + </and> </enablement> </commonWizard> - </navigatorContent> </extension> <extension