[Jcommander-commit] plugins/org.jcommander.ui.compare/src/org/jcommander/compare ComparePlugin.java,1.3,1.4 CompareTest.java,1.1,NONE

[Matthias K <mat...@us...>]

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

Modified Files:
	ComparePlugin.java 
Removed Files:
	CompareTest.java 
Log Message:
Now using displayablePath also in compare view and copy/move confirm dialog

Index: ComparePlugin.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.compare/src/org/jcommander/compare/ComparePlugin.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ComparePlugin.java	17 Apr 2006 08:48:51 -0000	1.3
--- ComparePlugin.java	17 Apr 2006 21:31:07 -0000	1.4
***************
*** 27,30 ****
--- 27,31 ----
  import org.jcommander.ui.utils.EclipseBroker;
  import org.jcommander.ui.utils.ImageBroker;
+ import org.jcommander.vfsextensions.VfsManagerExtension;
  import org.osgi.framework.BundleContext;
  import org.apache.commons.vfs.*;
***************
*** 331,335 ****
  						if ((diffNode.getRight()!=null)&&(diffNode.getRight() instanceof FileInput)) {
  							FileInput file = (FileInput) diffNode.getRight();
! 							return file.file.getName().getURI();
  						}
  						return super.getRightLabel(element);
--- 332,336 ----
  						if ((diffNode.getRight()!=null)&&(diffNode.getRight() instanceof FileInput)) {
  							FileInput file = (FileInput) diffNode.getRight();
! 							return VfsManagerExtension.getDisplayablePath(file.file);
  						}
  						return super.getRightLabel(element);
***************
*** 347,351 ****
  						if ((diffNode.getLeft()!=null)&&(diffNode.getLeft() instanceof FileInput)) {
  							FileInput file = (FileInput) diffNode.getLeft();
! 							return file.file.getName().getURI();
  						}
  						return super.getLeftLabel(element);
--- 348,352 ----
  						if ((diffNode.getLeft()!=null)&&(diffNode.getLeft() instanceof FileInput)) {
  							FileInput file = (FileInput) diffNode.getLeft();
! 							return VfsManagerExtension.getDisplayablePath(file.file);
  						}
  						return super.getLeftLabel(element);

--- CompareTest.java DELETED ---