[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls FilePanelMediator.java,1.46,1.47

[Robert E. <sky...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23335/src/org/jcommander/ui/filepanel/controls

Modified Files:
	FilePanelMediator.java 
Log Message:
Fixed bug [ 1457815 ] "Rename" needs check if the name was changed (severe!)

Index: FilePanelMediator.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FilePanelMediator.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** FilePanelMediator.java	20 Mar 2006 05:49:24 -0000	1.46
--- FilePanelMediator.java	28 Mar 2006 07:55:26 -0000	1.47
***************
*** 305,314 ****
  																String newFileName = computeNewFileName(details, newName);
  																
! 																if(details.getFile().canRenameTo(
! 																		VfsManagerExtension.getInstance().resolveFile(
! 																				newFileName))) {
  																	return null;
  																} else {
! 																	return "Invalid file name!";
  																}
  															} catch (FileSystemException e) {
--- 305,315 ----
  																String newFileName = computeNewFileName(details, newName);
  																
! 																FileObject newFile = VfsManagerExtension.getInstance().resolveFile(
! 																				newFileName);
! 																if(	!newFile.equals(details.getFile()) 
! 																	&& details.getFile().canRenameTo(newFile)) {
  																	return null;
  																} else {
! 																	return "Please specify a different file name.";
  																}
  															} catch (FileSystemException e) {