Attachment 73828 Details for Bug 196303 – fix

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

[patch] fix

clipboard.txt (text/plain), 5.57 KB, created by Benno Baumgartner

on 2007-07-16 04:23:27 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Benno Baumgartner

Created: 2007-07-16 04:23:27 EDT

Size: 5.57 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.ui.tests.refactoring
>Index: test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/MoveTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/MoveTest.java,v
>retrieving revision 1.2
>diff -u -r1.2 MoveTest.java
>--- test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/MoveTest.java	12 Jul 2007 15:20:24 -0000	1.2
>+++ test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/MoveTest.java	16 Jul 2007 08:24:15 -0000
>@@ -97,6 +97,41 @@
> 			};
> 		}
> 	}
>+	
>+	private static final class ConfirmNoneQuery implements IReorgQueries {
>+		public IConfirmQuery createSkipQuery(String queryTitle, int queryID) {
>+			return new IConfirmQuery() {
>+				public boolean confirm(String question) throws OperationCanceledException {
>+					return false;
>+				}
>+				public boolean confirm(String question, Object[] elements) throws OperationCanceledException {
>+					return false;
>+				}
>+			};
>+		}
>+
>+		public IConfirmQuery createYesNoQuery(String queryTitle, boolean allowCancel, int queryID) {
>+			return new IConfirmQuery() {
>+				public boolean confirm(String question) throws OperationCanceledException {
>+					return false;
>+				}
>+				public boolean confirm(String question, Object[] elements) throws OperationCanceledException {
>+					return false;
>+				}
>+			};
>+		}
>+
>+		public IConfirmQuery createYesYesToAllNoNoToAllQuery(String queryTitle, boolean allowCancel, int queryID) {
>+			return new IConfirmQuery() {
>+				public boolean confirm(String question) throws OperationCanceledException {
>+					return false;
>+				}
>+				public boolean confirm(String question, Object[] elements) throws OperationCanceledException {
>+					return false;
>+				}
>+			};
>+		}
>+	}
> 
> 	public MoveTest(String name) {
> 		super(name);
>@@ -1164,8 +1199,7 @@
> 			safeDelete(newCuD);
> 			safeDelete(orgTest);
> 			safeDelete(org);
>-			if (newOptions != null)
>-				javaProject.setOptions(originalOptions);
>+			javaProject.setOptions(originalOptions);
> 		}
> 	}
> 
>@@ -1209,8 +1243,7 @@
> 			safeDelete(newCuD);
> 			safeDelete(orgTest);
> 			safeDelete(org);
>-			if (newOptions != null)
>-				javaProject.setOptions(originalOptions);
>+			javaProject.setOptions(originalOptions);
> 		}
> 	}
> 
>@@ -1920,7 +1953,31 @@
> 			IJavaElement[] javaElements= {};
> 			IResource[] resources= {file};
> 			
>-			move(javaElements, resources, superFolder);
>+			move(javaElements, resources, superFolder, true);
>+			
>+			assertIsParent(folder, file);
>+			assertIsParent(superFolder, folder);
>+		}finally{
>+			performDummySearch();
>+			safeDelete(file);
>+		}
>+	}	
>+	
>+	public void testDestination_bug196303() throws Exception{
>+		IProject superFolder= RefactoringTestSetup.getProject().getProject();
>+		IFolder folder1= superFolder.getFolder("bar");
>+		folder1.create(true, true, null);
>+		
>+		IFolder folder= superFolder.getFolder("foo");
>+		folder.create(true, true, null);
>+		IFile file= folder.getFile("bar");
>+		file.create(getStream("123"), true, null);
>+		
>+		try{
>+			IJavaElement[] javaElements= {};
>+			IResource[] resources= {file};
>+			
>+			move(javaElements, resources, superFolder, false);
> 			
> 			assertIsParent(folder, file);
> 			assertIsParent(superFolder, folder);
>@@ -1934,7 +1991,7 @@
> 		assertTrue(child.getParent().equals(parent));
> 	}
> 
>-	public void move(IJavaElement[] javaElements, IResource[] resources, IResource destination) throws Exception {
>+	public void move(IJavaElement[] javaElements, IResource[] resources, IResource destination, boolean confirmAll) throws Exception {
> 		assertNotNull(javaElements);
> 		assertNotNull(resources);
> 		assertNotNull(destination);
>@@ -1953,7 +2010,11 @@
> 		JavaMoveRefactoring ref= new JavaMoveRefactoring(processor);
> 		
> 		processor.setCreateTargetQueries(new CreateTargetQueries(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()));
>-		processor.setReorgQueries(new ConfirmAllQuery());
>+		if (confirmAll) {
>+			processor.setReorgQueries(new ConfirmAllQuery());			
>+		} else {
>+			processor.setReorgQueries(new ConfirmNoneQuery());
>+		}
> 		
> 		performRefactoring(ref);
> 	}
>#P org.eclipse.jdt.ui
>Index: core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/OverwriteHelper.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/OverwriteHelper.java,v
>retrieving revision 1.13
>diff -u -r1.13 OverwriteHelper.java
>--- core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/OverwriteHelper.java	12 Jul 2007 15:20:22 -0000	1.13
>+++ core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/OverwriteHelper.java	16 Jul 2007 08:24:18 -0000
>@@ -182,22 +182,17 @@
> 	private boolean willOverwrite(IResource resource) {
> 		if (resource == null)
> 			return false;
>+		
> 		IResource destinationResource= ResourceUtil.getResource(fDestination);
> 		if (destinationResource.equals(resource.getParent()))
> 			return false;
>+		
> 		if (destinationResource instanceof IContainer) {
> 			IContainer container= (IContainer)destinationResource;
> 			IResource member=  container.findMember(resource.getName());
> 			if (member == null || !member.exists())
> 				return false;
>-			if (member instanceof IContainer) {
>-				try {
>-					if (((IContainer)member).members().length == 0)
>-						return false;
>-				} catch (CoreException e) {
>-					return true;
>-				}
>-			}
>+			
> 			return true;
> 		}
> 		return false;

Actions: View | Diff

Attachments on bug 196303: 73828