Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcbridgha2010-10-14 19:49:46 +0000
committercbridgha2010-10-14 19:49:46 +0000
commit0b8d4de54c06567248e306c0757aa8b72c83f9ed (patch)
tree15e19dfad00ad7305381825235f56a6d78bcbb70 /plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui
parentdb9fccde791ea1fe7cba3faeb8b86e47c935cb53 (diff)
downloadwebtools.javaee-0b8d4de54c06567248e306c0757aa8b72c83f9ed.tar.gz
webtools.javaee-0b8d4de54c06567248e306c0757aa8b72c83f9ed.tar.xz
webtools.javaee-0b8d4de54c06567248e306c0757aa8b72c83f9ed.zip
[327821] ensuring source folder always shown
Diffstat (limited to 'plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui')
-rw-r--r--plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaProject.java13
1 files changed, 1 insertions, 12 deletions
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaProject.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaProject.java
index 94f025d8b..2f8819b66 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaProject.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaProject.java
@@ -30,7 +30,6 @@ import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.graphics.Image;
public class CompressedJavaProject implements ICompressedNode, IAdaptable {
@@ -60,12 +59,7 @@ public class CompressedJavaProject implements ICompressedNode, IAdaptable {
}
private String determineLabel() {
- List nonextSourceFolders = getNonExternalSourceFolders();
- IPackageFragmentRoot singleRoot = null;
- if (nonextSourceFolders.size() == 1) {
- singleRoot = (IPackageFragmentRoot) nonextSourceFolders.get(0);
- }
- return NLS.bind(WEBUIMessages.Compressed_JavaResources, ((singleRoot != null) ? ": " + singleRoot.getElementName() : "")); //$NON-NLS-1$ //$NON-NLS-2$
+ return WEBUIMessages.Compressed_JavaResources;
}
public IProject getProject() {
@@ -75,11 +69,6 @@ public class CompressedJavaProject implements ICompressedNode, IAdaptable {
public Object[] getChildren(ITreeContentProvider delegateContentProvider) {
List nonExternalSourceFolders = getNonExternalSourceFolders();
- if (nonExternalSourceFolders.size() == 1) {
- Object[] sourceFolderChildren = delegateContentProvider.getChildren(nonExternalSourceFolders.get(0));
- nonExternalSourceFolders.clear();
- nonExternalSourceFolders.addAll(Arrays.asList(sourceFolderChildren));
- }
nonExternalSourceFolders.add(getCompressedJavaLibraries());
return nonExternalSourceFolders.toArray();
}

Back to the top