[92538] Fix for duplicate labels
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJarItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJarItemProvider.java index f4319cc..c859fa6 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJarItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJarItemProvider.java
@@ -103,6 +103,8 @@ IVirtualReference[] modules = ear.getReferences(); for (int i=0; i<modules.length; i++) { IVirtualComponent module = modules[i].getReferencedComponent(); + if (module.getProject() == null || !module.getProject().isAccessible()) + continue; // return only jars for utility components if (IModuleConstants.JST_UTILITY_MODULE.equals(module.getComponentTypeId())) { IProject project = ProjectUtilities.getProject(application);
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java index 11cb525..889478a 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java
@@ -477,6 +477,8 @@ IVirtualReference[] refComponents = earComponent.getReferences(); for (int i = 0; i < refComponents.length; i++) { IVirtualComponent module = refComponents[i].getReferencedComponent(); + if (module.getProject() == null || !module.getProject().isAccessible()) + continue; //if component types passed in is null then return all components if (componentTypes == null || componentTypes.size()==0) components.add(refComponents[i]);
diff --git a/plugins/org.eclipse.jst.servlet.ui/plugin.xml b/plugins/org.eclipse.jst.servlet.ui/plugin.xml index 3abcb89..efce74c 100644 --- a/plugins/org.eclipse.jst.servlet.ui/plugin.xml +++ b/plugins/org.eclipse.jst.servlet.ui/plugin.xml
@@ -47,7 +47,7 @@ point="org.eclipse.ui.newWizards"> <category name="%web.category_ui_" - id="org.eclipse.jst.servlet.ui"> + id="org.eclipse.wst.web.ui"> </category> <wizard name="%web.project_ui_"
diff --git a/plugins/org.eclipse.wst.web.ui/plugin.xml b/plugins/org.eclipse.wst.web.ui/plugin.xml index 59d6d43..3a2f3d0 100644 --- a/plugins/org.eclipse.wst.web.ui/plugin.xml +++ b/plugins/org.eclipse.wst.web.ui/plugin.xml
@@ -3,7 +3,7 @@ <plugin> <!-- static web project wizard --> - <extension + <!-- <extension point="org.eclipse.wst.common.frameworks.ui.extendableWizard"> <extendableWizard id="org.eclipse.wst.web.ui.internal.wizards.SimpleWebModuleCreationWizard"> @@ -29,7 +29,7 @@ class="org.eclipse.core.resources.IResource"> </selection> </wizard> - </extension> + </extension> --> <!-- add in the features page <extension id="corg.eclipse.wst.web.ui.internal.wizards.WebProjectFeaturesWizardPage"