Attachment 180895 Details for Bug 327802 – Fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix

327802_patch.txt (text/plain), 2.76 KB, created by Neeraj Agrawal

on 2010-10-14 12:58:39 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Neeraj Agrawal

Created: 2010-10-14 12:58:39 EDT

Size: 2.76 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.servlet.ui
>Index: property_files/web_ui.properties
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/property_files/web_ui.properties,v
>retrieving revision 1.28
>diff -u -r1.28 web_ui.properties
>--- property_files/web_ui.properties	11 Mar 2010 14:44:18 -0000	1.28
>+++ property_files/web_ui.properties	14 Oct 2010 16:51:54 -0000
>@@ -153,7 +153,7 @@
> 
> 
> Compressed_Libraries= Libraries
>-Compressed_JavaResources= Java Resources{0}
>+Compressed_JavaResources= Java Resources
> 
> ConvertToWebTitle=Convert to Dynamic Web Project
> SelectWebVersion=Select a Dynamic Web module version:
>Index: servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaProject.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaProject.java,v
>retrieving revision 1.9
>diff -u -r1.9 CompressedJavaProject.java
>--- servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaProject.java	20 Jun 2007 17:09:15 -0000	1.9
>+++ servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaProject.java	14 Oct 2010 16:51:54 -0000
>@@ -30,7 +30,6 @@
> 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 @@
> 	}
> 
> 	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 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();
> 	}

Actions: View | Diff

Attachments on bug 327802: 180895