[579170] Project Explorer Hierarchical Package Presentation
Regression
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF
index 2022ac9..bbfaf4d 100644
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.jst.j2ee.navigator.ui; singleton:=true
-Bundle-Version: 1.1.900.qualifier
+Bundle-Version: 1.1.1000.qualifier
Bundle-Activator: org.eclipse.jst.j2ee.navigator.internal.plugin.J2EENavigatorPlugin
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
@@ -40,3 +40,4 @@
org.eclipse.wst.common.ui;bundle-version="[1.2.0,1.3.0)"
Eclipse-LazyStart: true; exceptions="org.eclipse.jst.j2ee.navigator.internal"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Automatic-Module-Name: org.eclipse.jst.j2ee.navigator.ui
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EELabelProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EELabelProvider.java
index 5a91668..d4ad8e5 100644
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EELabelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EELabelProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2012 IBM Corporation and others.
+ * Copyright (c) 2003, 2022 IBM Corporation and others.
* 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
@@ -18,6 +18,7 @@
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
import org.eclipse.jface.viewers.ILabelProviderListener;
@@ -158,7 +159,7 @@
return J2EEUIPlugin.getDefault().getImage("jar_obj"); //$NON-NLS-1$
if(element instanceof LoadingDDNode)
return ((LoadingDDNode)element).getImage();
- if (element instanceof IProject || element instanceof IJavaProject)
+ if (element instanceof IProject || element instanceof IJavaElement)
return null;
if (delegateLabelProvider != null)
return delegateLabelProvider.getImage(element);
@@ -174,10 +175,12 @@
return ((J2EEJavaClassProviderHelper) element).getText();
if (element instanceof File)
return ((File)element).getName();
- if (element instanceof IProject)
- return ((IProject)element).getName();
+ if (element instanceof IProject || element instanceof IJavaProject)
+ return null;
if(element instanceof LoadingDDNode)
return ((LoadingDDNode)element).getText();
+ if (element instanceof IJavaElement)
+ return null;
if (delegateLabelProvider != null)
return delegateLabelProvider.getText(element);
return null;
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/pom.xml b/plugins/org.eclipse.jst.j2ee.navigator.ui/pom.xml
index 7a1ef7f..72f2b86 100644
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/pom.xml
+++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.javaee</groupId>
<artifactId>org.eclipse.jst.j2ee.navigator.ui</artifactId>
- <version>1.1.900-SNAPSHOT</version>
+ <version>1.1.1000-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
