### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.ui
Index: core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/ReorgUtils.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/ReorgUtils.java,v
retrieving revision 1.35
diff -u -r1.35 ReorgUtils.java
--- core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/ReorgUtils.java	6 May 2008 09:43:47 -0000	1.35
+++ core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/ReorgUtils.java	10 Jul 2008 14:33:47 -0000
@@ -54,6 +54,7 @@
 import org.eclipse.jdt.internal.ui.viewsupport.BasicElementLabels;
 
 
+
 public class ReorgUtils {
 
 	//workaround for bug 18311
@@ -87,12 +88,12 @@
 	}
 
 	public static boolean isInsideCompilationUnit(IJavaElement element) {
-		return 	!(element instanceof ICompilationUnit) && 
+		return 	!(element instanceof ICompilationUnit) &&
 				hasAncestorOfType(element, IJavaElement.COMPILATION_UNIT);
 	}
 	
 	public static boolean isInsideClassFile(IJavaElement element) {
-		return 	!(element instanceof IClassFile) && 
+		return 	!(element instanceof IClassFile) &&
 				hasAncestorOfType(element, IJavaElement.CLASS_FILE);
 	}
 	
@@ -134,20 +135,13 @@
 		}
 		return result;
 	}
-	
+
 	public static String getName(IResource resource) {
-		String resourceLabel= BasicElementLabels.getResourceName(resource);
-		switch (resource.getType()){
-			case IResource.FILE:
-				return Messages.format(RefactoringCoreMessages.ReorgUtils_0, resourceLabel);
-			case IResource.FOLDER:
-				return Messages.format(RefactoringCoreMessages.ReorgUtils_1, resourceLabel);
-			case IResource.PROJECT:
-				return Messages.format(RefactoringCoreMessages.ReorgUtils_2, resourceLabel);
-			default:
-				Assert.isTrue(false);
-				return null;
-		}
+		StringBuffer buf= new StringBuffer(50);
+		buf.append('\'');
+		buf.append(BasicElementLabels.getResourceName(resource));
+		buf.append('\'');
+		return buf.toString();
 	}
 
 	public static String getName(IJavaElement element) throws JavaModelException {
@@ -159,42 +153,42 @@
 	private static String createNamePattern(IJavaElement element) throws JavaModelException {
 		switch(element.getElementType()){
 			case IJavaElement.CLASS_FILE:
-				return RefactoringCoreMessages.ReorgUtils_3; 
+				return RefactoringCoreMessages.ReorgUtils_3;
 			case IJavaElement.COMPILATION_UNIT:
-				return RefactoringCoreMessages.ReorgUtils_4; 
+				return RefactoringCoreMessages.ReorgUtils_4;
 			case IJavaElement.FIELD:
-				return RefactoringCoreMessages.ReorgUtils_5; 
+				return RefactoringCoreMessages.ReorgUtils_5;
 			case IJavaElement.IMPORT_CONTAINER:
-				return RefactoringCoreMessages.ReorgUtils_6; 
+				return RefactoringCoreMessages.ReorgUtils_6;
 			case IJavaElement.IMPORT_DECLARATION:
-				return RefactoringCoreMessages.ReorgUtils_7; 
+				return RefactoringCoreMessages.ReorgUtils_7;
 			case IJavaElement.INITIALIZER:
-				return RefactoringCoreMessages.ReorgUtils_8; 
+				return RefactoringCoreMessages.ReorgUtils_8;
 			case IJavaElement.JAVA_PROJECT:
-				return RefactoringCoreMessages.ReorgUtils_9; 
+				return RefactoringCoreMessages.ReorgUtils_9;
 			case IJavaElement.METHOD:
 				if (((IMethod)element).isConstructor())
-					return RefactoringCoreMessages.ReorgUtils_10; 
+					return RefactoringCoreMessages.ReorgUtils_10;
 				else
-					return RefactoringCoreMessages.ReorgUtils_11; 
+					return RefactoringCoreMessages.ReorgUtils_11;
 			case IJavaElement.PACKAGE_DECLARATION:
-				return RefactoringCoreMessages.ReorgUtils_12; 
+				return RefactoringCoreMessages.ReorgUtils_12;
 			case IJavaElement.PACKAGE_FRAGMENT:
 				if (JavaElementUtil.isDefaultPackage(element))
-					return RefactoringCoreMessages.ReorgUtils_13; 
+					return RefactoringCoreMessages.ReorgUtils_13;
 				else
-					return RefactoringCoreMessages.ReorgUtils_14; 
+					return RefactoringCoreMessages.ReorgUtils_14;
 			case IJavaElement.PACKAGE_FRAGMENT_ROOT:
 				if (isSourceFolder(element))
-					return RefactoringCoreMessages.ReorgUtils_15; 
+					return RefactoringCoreMessages.ReorgUtils_15;
 				if (isClassFolder(element))
-					return RefactoringCoreMessages.ReorgUtils_16; 
-				return RefactoringCoreMessages.ReorgUtils_17; 
+					return RefactoringCoreMessages.ReorgUtils_16;
+				return RefactoringCoreMessages.ReorgUtils_17;
 			case IJavaElement.TYPE:
 				IType type= (IType)element;
 				if (type.getElementName().length() == 0 && type.isAnonymous())
-					return RefactoringCoreMessages.ReorgUtils_20; 
-				return RefactoringCoreMessages.ReorgUtils_18; 
+					return RefactoringCoreMessages.ReorgUtils_20;
+				return RefactoringCoreMessages.ReorgUtils_18;
 			default:
 				Assert.isTrue(false);
 				return null;
@@ -233,7 +227,7 @@
 	}
 
 	public static boolean hasSourceAvailable(IMember member) throws JavaModelException{
-		return ! member.isBinary() || 
+		return ! member.isBinary() ||
 				(member.getSourceRange() != null && ! fgUnknownRange.equals(member.getSourceRange()));
 	}
 	
@@ -241,14 +235,14 @@
 		Set setMinus= new HashSet(setToRemoveFrom.length - setToRemoveFrom.length);
 		setMinus.addAll(Arrays.asList(setToRemoveFrom));
 		setMinus.removeAll(Arrays.asList(elementsToRemove));
-		return (IResource[]) setMinus.toArray(new IResource[setMinus.size()]);		
+		return (IResource[]) setMinus.toArray(new IResource[setMinus.size()]);
 	}
 
 	public static IJavaElement[] setMinus(IJavaElement[] setToRemoveFrom, IJavaElement[] elementsToRemove) {
 		Set setMinus= new HashSet(setToRemoveFrom.length - setToRemoveFrom.length);
 		setMinus.addAll(Arrays.asList(setToRemoveFrom));
 		setMinus.removeAll(Arrays.asList(elementsToRemove));
-		return (IJavaElement[]) setMinus.toArray(new IJavaElement[setMinus.size()]);		
+		return (IJavaElement[]) setMinus.toArray(new IJavaElement[setMinus.size()]);
 	}
 	
 	public static IJavaElement[] union(IJavaElement[] set1, IJavaElement[] set2) {
@@ -256,14 +250,14 @@
 		addAll(set1, union);
 		addAll(set2, union);
 		return (IJavaElement[]) union.toArray(new IJavaElement[union.size()]);
-	}	
+	}
 
 	public static IResource[] union(IResource[] set1, IResource[] set2) {
 		List union= new ArrayList(set1.length + set2.length);//use lists to avoid sequence problems
 		addAll(ReorgUtils.getNotNulls(set1), union);
 		addAll(ReorgUtils.getNotNulls(set2), union);
 		return (IResource[]) union.toArray(new IResource[union.size()]);
-	}	
+	}
 
 	private static void addAll(Object[] array, List list) {
 		for (int i= 0; i < array.length; i++) {
@@ -310,7 +304,7 @@
 	}
 	
 	//the result can be cast down to the requested type array
-	//type is _not_ a mask	
+	//type is _not_ a mask
 	public static List getElementsOfType(IJavaElement[] javaElements, int type){
 		List result= new ArrayList(javaElements.length);
 		for (int i= 0; i < javaElements.length; i++) {
@@ -329,7 +323,7 @@
 		return false;
 	}
 
-	//type is _not_ a mask	
+	//type is _not_ a mask
 	public static boolean hasElementsNotOfType(IJavaElement[] javaElements, int type) {
 		for (int i= 0; i < javaElements.length; i++) {
 			IJavaElement element= javaElements[i];
@@ -339,7 +333,7 @@
 		return false;
 	}
 	
-	//type is _not_ a mask	
+	//type is _not_ a mask
 	public static boolean hasElementsOfType(IJavaElement[] javaElements, int type) {
 		for (int i= 0; i < javaElements.length; i++) {
 			IJavaElement element= javaElements[i];
@@ -449,11 +443,11 @@
 	
 	public static boolean isParentInWorkspaceOrOnDisk(IPackageFragment pack, IPackageFragmentRoot root){
 		if (pack == null)
-			return false;		
+			return false;
 		IJavaElement packParent= pack.getParent();
 		if (packParent == null)
-			return false;		
-		if (packParent.equals(root))	
+			return false;
+		if (packParent.equals(root))
 			return true;
 		IResource packageResource= ResourceUtil.getResource(pack);
 		IResource packageRootResource= ResourceUtil.getResource(root);
@@ -462,11 +456,11 @@
 
 	public static boolean isParentInWorkspaceOrOnDisk(IPackageFragmentRoot root, IJavaProject javaProject){
 		if (root == null)
-			return false;		
+			return false;
 		IJavaElement rootParent= root.getParent();
 		if (rootParent == null)
-			return false;		
-		if (rootParent.equals(root))	
+			return false;
+		if (rootParent.equals(root))
 			return true;
 		IResource packageResource= ResourceUtil.getResource(root);
 		IResource packageRootResource= ResourceUtil.getResource(javaProject);
@@ -479,7 +473,7 @@
 		IJavaElement cuParent= cu.getParent();
 		if (cuParent == null)
 			return false;
-		if (cuParent.equals(dest))	
+		if (cuParent.equals(dest))
 			return true;
 		IResource cuResource= cu.getResource();
 		IResource packageResource= ResourceUtil.getResource(dest);
Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/refactoringui.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/refactoringui.properties,v
retrieving revision 1.273
diff -u -r1.273 refactoringui.properties
--- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/refactoringui.properties	29 May 2008 11:03:35 -0000	1.273
+++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/refactoringui.properties	10 Jul 2008 14:33:47 -0000
@@ -477,12 +477,12 @@
 DeleteWizard_1=Confirm Delete
 DeleteWizard_2=An unexpected exception occurred. See the error log for more details.
 DeleteWizard_3=Are you sure you want to delete linked resource ''{0}''?\nOnly the workspace link will be deleted. Link target will remain unchanged.
-DeleteWizard_4=Are you sure you want to delete {0}?
+DeleteWizard_4=Are you sure you want to delete {0} from the file system?
 DeleteWizard_5=Are you sure you want to delete linked resource ''{0}''?\nOnly the workspace link will be deleted. Link target will remain unchanged.
 DeleteWizard_6=Are you sure you want to delete linked resource ''{0}''?\nOnly the workspace link will be deleted. Link target will remain unchanged.\n\nNote that all subelements of the selected linked packages and package fragment roots will be removed from the workspace.
 DeleteWizard_7=Are you sure you want to delete linked resource ''{0}''?\nOnly the workspace link will be deleted. Link target will remain unchanged.
-DeleteWizard_8=Are you sure you want to delete {0}?
-DeleteWizard_9=Are you sure you want to delete these {0} elements?
+DeleteWizard_8=Are you sure you want to delete {0} from the file system?
+DeleteWizard_9=Are you sure you want to delete these {0} elements from the file system?
 DeleteWizard_10=Are you sure you want to delete these {0} elements?\n\nSelection contains linked resources.\nOnly the workspace links will be deleted. Link targets will remain unchanged.
 DeleteWizard_11=Are you sure you want to delete these {0} elements?\n\nSelection contains linked packages.\nOnly the workspace links will be deleted. Link targets will remain unchanged.\n\nNote that all subelements of linked packages and package fragment roots will be removed from the workspace.
 DeleteWizard_12=The selected element(s) do not exist anymore and cannot be deleted.