### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.ui Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringMessages.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringMessages.java,v retrieving revision 1.42 diff -u -r1.42 RefactoringMessages.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringMessages.java 17 Nov 2006 16:12:00 -0000 1.42 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringMessages.java 20 Nov 2006 10:55:21 -0000 @@ -529,6 +529,8 @@ public static String MoveMembersInputPage_move_Member; public static String MoveMembersInputPage_no_binary; + + public static String MoveMembersInputPage_same; public static String MoveMembersInputPage_not_found; Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveMembersWizard.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveMembersWizard.java,v retrieving revision 1.46 diff -u -r1.46 MoveMembersWizard.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveMembersWizard.java 7 Apr 2006 16:52:34 -0000 1.46 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveMembersWizard.java 20 Nov 2006 10:55:20 -0000 @@ -286,11 +286,13 @@ return getMoveProcessor().getDeclaringType().getElementName(); } - private static IStatus validateDestinationType(IType type, String typeName){ + private IStatus validateDestinationType(IType type, String typeName){ if (type == null || ! type.exists()) return new Status(IStatus.ERROR, JavaPlugin.getPluginId(), IStatus.OK, Messages.format(RefactoringMessages.MoveMembersInputPage_not_found, typeName), null); if (type.isBinary()) - return new Status(IStatus.ERROR, JavaPlugin.getPluginId(), IStatus.OK, RefactoringMessages.MoveMembersInputPage_no_binary, null); + return new Status(IStatus.ERROR, JavaPlugin.getPluginId(), IStatus.OK, RefactoringMessages.MoveMembersInputPage_no_binary, null); + if (type.equals(getMoveProcessor().getDeclaringType())) + return new Status(IStatus.ERROR, JavaPlugin.getPluginId(), IStatus.OK, RefactoringMessages.MoveMembersInputPage_same, null); return new Status(IStatus.OK, JavaPlugin.getPluginId(), IStatus.OK, "", null); //$NON-NLS-1$ } 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.245 diff -u -r1.245 refactoringui.properties --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/refactoringui.properties 17 Nov 2006 16:12:00 -0000 1.245 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/refactoringui.properties 20 Nov 2006 10:55:21 -0000 @@ -176,6 +176,7 @@ MoveMembersInputPage_invalid_name=Invalid Type Name MoveMembersInputPage_Invalid_selection=Invalid selection MoveMembersInputPage_no_binary=Cannot move members to binary types +MoveMembersInputPage_same=Destination and source types are the same MoveMembersInputPage_internal_error=An unexpected exception occurred. See the error log for more details. MoveMembersInputPage_move=Move Members