jcommander-commit — User commit notifications

[Jcommander-commit] plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/structuremergeviewer - New directory

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

Update of /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/structuremergeviewer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4880/compare/org/eclipse/compare/structuremergeviewer

Log Message:
Directory /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/structuremergeviewer added to the repository

[Jcommander-commit] plugins/org.jcommander.eclipsepatch.compare/icons/full/ovr16 - New directory

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

Update of /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/icons/full/ovr16
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4880/icons/full/ovr16

Log Message:
Directory /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/icons/full/ovr16 added to the repository

[Jcommander-commit] plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal - New directory

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

Update of /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4880/compare/org/eclipse/compare/internal

Log Message:
Directory /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal added to the repository

[Jcommander-commit] plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse - New directory

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

Update of /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4880/compare/org/eclipse

Log Message:
Directory /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse added to the repository

[Jcommander-commit] plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/merge - New directory

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

Update of /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/merge
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4880/compare/org/eclipse/compare/internal/merge

Log Message:
Directory /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/merge added to the repository

[Jcommander-commit] plugins/org.jcommander.eclipsepatch.compare/compare/org - New directory

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

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

Log Message:
Directory /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org added to the repository

[Jcommander-commit] plugins/org.jcommander.eclipsepatch.compare - New directory

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

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

Log Message:
Directory /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare added to the repository

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers FileCopyPerformer.java,1.30,1.31

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

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

Modified Files:
	FileCopyPerformer.java 
Log Message:
Fixed bug [ 1457817 ] Deactive "Run in background" when the operation is finished

Index: FileCopyPerformer.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/FileCopyPerformer.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** FileCopyPerformer.java	20 Jan 2006 05:52:27 -0000	1.30
--- FileCopyPerformer.java	28 Mar 2006 08:45:39 -0000	1.31
***************
*** 186,189 ****
--- 186,191 ----
  						progressDialogComposite.getPauseButton().setEnabled(false);
  						progressDialogComposite.getAbortButton().setEnabled(false);
+ 						
+ 						progressDialogComposite.getRunInBackgroundButton().setEnabled(false);
  					}
  				});

[Jcommander-commit] plugins/org.jcommander.vfsextensions/src/org/jcommander/vfsextensions VfsManagerExtension.java,1.17,1.18

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

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

Modified Files:
	VfsManagerExtension.java 
Log Message:
Fixed bug [ 1457803 ] Can't recreate directory

Index: VfsManagerExtension.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.vfsextensions/src/org/jcommander/vfsextensions/VfsManagerExtension.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** VfsManagerExtension.java	20 Mar 2006 05:49:29 -0000	1.17
--- VfsManagerExtension.java	28 Mar 2006 08:23:50 -0000	1.18
***************
*** 100,103 ****
--- 100,105 ----
      public static boolean delete(FileObject file, boolean moveToTrash) throws FileSystemException {
      	try {
+     		FileObject parent = file.getParent();
+     		
      		if(moveToTrash && (file instanceof LocalFile)) { 
      			fileUtil.recycle(new File(getExecutableName(file)));
***************
*** 109,112 ****
--- 111,115 ----
      		// TODO Hack to overcome the VFS architectural refresh bug
      		file.close();
+     		parent.close();
      		
      		return true;

[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) {

[Jcommander-commit] incubator/matthias_kue/difftest/src/org/jcommander/ui/filepanel/actions CompareAction.java,1.2,1.3

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

Update of /cvsroot/jcommander/incubator/matthias_kue/difftest/src/org/jcommander/ui/filepanel/actions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32571/matthias_kue/difftest/src/org/jcommander/ui/filepanel/actions

Modified Files:
	CompareAction.java 
Log Message:
New version of CompareAction:
- Editing, moving changes and replacing works.
- Added filenames to show which two files you are comparing currently
- Not longer left=active FilePanel, right=inactive FilePanel, but left=left FilePanel, right=right FilePanel.

Index: CompareAction.java
===================================================================
RCS file: /cvsroot/jcommander/incubator/matthias_kue/difftest/src/org/jcommander/ui/filepanel/actions/CompareAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CompareAction.java	26 Mar 2006 12:15:51 -0000	1.2
--- CompareAction.java	27 Mar 2006 16:59:50 -0000	1.3
***************
*** 9,16 ****
--- 9,18 ----
  import java.io.IOException;
  import java.io.InputStream;
+ import java.io.OutputStream;
  import java.lang.reflect.InvocationTargetException;
  
  import org.apache.commons.vfs.*;
  import org.eclipse.compare.*;
+ import org.eclipse.compare.structuremergeviewer.DiffNode;
  import org.eclipse.compare.structuremergeviewer.Differencer;
  import org.eclipse.compare.structuremergeviewer.IStructureComparator;
***************
*** 368,372 ****
  			try {
  				System.out.println("setContent");
! 				file.getContent().getOutputStream().write(newContent);
  			} catch (FileSystemException e) {
  				// TODO Auto-generated catch block
--- 370,378 ----
  			try {
  				System.out.println("setContent");
! 				String nC=new String(newContent);
! 				System.out.println(nC);
! 				OutputStream oStream=file.getContent().getOutputStream();
! 				oStream.write(nC.getBytes());
! 				oStream.close();
  			} catch (FileSystemException e) {
  				// TODO Auto-generated catch block
***************
*** 380,384 ****
--- 386,428 ----
  		public ITypedElement replace(ITypedElement dest, ITypedElement src) {
  			// TODO Implement!
+ //			if ((dest==null)&&(src!=null)) {
+ //				System.out.println("Add: "+((FileInput)src).file.getName().getURI());
+ //			} else if ((dest!=null)&&(src==null)) {
+ //				System.out.println("Remove: "+((FileInput)src).file.getName().getURI());
+ //			}
  			System.out.println("replace");
+ 			try{
+ 				if (dest!=null) {
+ 					if (dest instanceof FileInput) {
+ 						FileInput fDest = (FileInput) dest;
+ 						if (src==null) {
+ 							fDest.file.delete();
+ 						} else if (src instanceof FileInput) {
+ 							FileInput fSrc = (FileInput) src;
+ 							fDest.file.copyFrom(fSrc.file, null);
+ 							return fDest;
+ 						} else {
+ 							System.out.println("Error in FileInput.replace: Src no FileInput");
+ 						}
+ 					} else {
+ 						System.out.println("Error in FileInput.replace: Dest no FileInput");
+ 					} 
+ 				} else if (src!=null) {
+ 					if (src instanceof FileInput) {
+ 						FileInput fSrc = (FileInput) src;
+ 						FileObject fDest=file.resolveFile(fSrc.file.getName().getBaseName());
+ 						System.out.println("Copying to "+fDest.getName().getURI());
+ 						fDest.copyFrom(fSrc.file,new AllFileSelector());
+ 						return new FileInput(fDest,base);
+ 					} else {
+ 						System.out.println("Error in FileInput.replace: Src no FileInput");
+ 					}
+ 				} else {
+ 					System.out.println("Error in FileInput.replace: Src and Dest null");
+ 				}
+ 			} catch (FileSystemException e) {
+ 				// TODO: handle exception
+ 				e.printStackTrace();
+ 			}
  			return null;
  		}
***************
*** 415,418 ****
--- 459,464 ----
  		FileObject rightFile = null;
  		
+ 		
+ 		//TODO: Unnecessary loop? FilePanel.getPanelMediator().getFilePanel()???
  		FileObject[] selectedFiles = tab.getActiveFilePanel()
  													.getPanelMediator()
***************
*** 430,435 ****
  		if(selectedFiles.length == 1){
  			// Try to find a matching file in the other panel
! 			
! 			FileObject[] otherSelectedFiles = tab.getInactiveFilePanel()
  																.getPanelMediator()
  																.getFilePanel()
--- 476,485 ----
  		if(selectedFiles.length == 1){
  			// Try to find a matching file in the other panel
! 			selectedFiles = tab.getLeftFilePanel()
! 											.getPanelMediator()
! 											.getFilePanel()
! 											.getFileControl()
! 											.getSelectedFiles();
! 			FileObject[] otherSelectedFiles = tab.getRightFilePanel()
  																.getPanelMediator()
  																.getFilePanel()
***************
*** 437,441 ****
  																.getSelectedFiles();
  			
! 			if(otherSelectedFiles.length ==1) {
  				error = false;
  				
--- 487,491 ----
  																.getSelectedFiles();
  			
! 			if((otherSelectedFiles.length ==1)&&(selectedFiles.length ==1)) {
  				error = false;
  				
***************
*** 456,460 ****
  			}
  			
! 			CompareConfiguration cc = new CompareConfiguration();
  			cc.setLeftEditable(true);
  			cc.setRightEditable(true);
--- 506,544 ----
  			}
  			
! 			CompareConfiguration cc = new CompareConfiguration() {
! 			
! 				/* (non-Javadoc)
! 				 * @see org.eclipse.compare.CompareConfiguration#getRightLabel(java.lang.Object)
! 				 */
! 				@Override
! 				public String getRightLabel(Object element) {
! 					if (element!=null) {
! 						DiffNode diffNode = (DiffNode) element;
! 						if ((diffNode.getRight()!=null)&&(diffNode.getRight() instanceof FileInput)) {
! 							FileInput file = (FileInput) diffNode.getRight();
! 							return file.file.getName().getURI();
! 						}
! 						return super.getRightLabel(element);
! 					}
! 					else return super.getRightLabel(element);
! 				}
! 			
! 				/* (non-Javadoc)
! 				 * @see org.eclipse.compare.CompareConfiguration#getLeftLabel(java.lang.Object)
! 				 */
! 				@Override
! 				public String getLeftLabel(Object element) {
! 					if (element!=null) {
! 						DiffNode diffNode = (DiffNode) element;
! 						if ((diffNode.getLeft()!=null)&&(diffNode.getLeft() instanceof FileInput)) {
! 							FileInput file = (FileInput) diffNode.getLeft();
! 							return file.file.getName().getURI();
! 						}
! 						return super.getLeftLabel(element);
! 					}
! 					else return super.getLeftLabel(element);
! 				}
! 			
! 			};
  			cc.setLeftEditable(true);
  			cc.setRightEditable(true);

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls FileTableControl.java,1.87,1.88

[Matthias K <mat...@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-serv28398/src/org/jcommander/ui/filepanel/controls

Modified Files:
	FileTableControl.java 
Log Message:
Partitial fix for Bug 1457836: Flickering when moving cursor first time in a directory

Index: FileTableControl.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FileTableControl.java,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** FileTableControl.java	20 Mar 2006 12:12:28 -0000	1.87
--- FileTableControl.java	26 Mar 2006 13:02:32 -0000	1.88
***************
*** 594,598 ****
  	 * @throws FileSystemException 
  	 */
! 	public void doRefresh() throws FileSystemException {	
  		Job job = new Job("Retrieving contents for directory " + model.getCurrentParent().getName().toString()) {
  			protected IStatus run(IProgressMonitor monitor) {
--- 594,598 ----
  	 * @throws FileSystemException 
  	 */
! 	public void doRefresh() throws FileSystemException {
  		Job job = new Job("Retrieving contents for directory " + model.getCurrentParent().getName().toString()) {
  			protected IStatus run(IProgressMonitor monitor) {
***************
*** 670,678 ****
  				if(!model.isHighlightColorRemoved()) {
  					FileObject oldHighlight = model.getHighlightedFile();
  					model.removeColor(oldHighlight,
  								TEXT_BACKGROUND_COLOR,SELECTION_FOREGROUND_COLOR,
  								TEXT_FOREGROUND_COLOR, SELECTION_BACKGROUND_COLOR,
  								SELECTED_FLAG);
! 					tableViewer.setInput(model);
  				}
  				table.setSelection(index);
--- 670,681 ----
  				if(!model.isHighlightColorRemoved()) {
  					FileObject oldHighlight = model.getHighlightedFile();
+ 					int oldSelection=model.getIndexOf(oldHighlight);
  					model.removeColor(oldHighlight,
  								TEXT_BACKGROUND_COLOR,SELECTION_FOREGROUND_COLOR,
  								TEXT_FOREGROUND_COLOR, SELECTION_BACKGROUND_COLOR,
  								SELECTED_FLAG);
! 					//tableViewer.setInput(model); <- Causes flickering
! 					tableViewer.update(table.getItem(oldSelection).getData(), null);
! 					tableViewer.update(table.getItem(index).getData(), null);
  				}
  				table.setSelection(index);

[Jcommander-commit] incubator/matthias_kue/difftest/src/org/jcommander/ui/filepanel/actions CompareAction.java,1.1,1.2

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

Update of /cvsroot/jcommander/incubator/matthias_kue/difftest/src/org/jcommander/ui/filepanel/actions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7890/matthias_kue/difftest/src/org/jcommander/ui/filepanel/actions

Modified Files:
	CompareAction.java 
Log Message:
editable

Index: CompareAction.java
===================================================================
RCS file: /cvsroot/jcommander/incubator/matthias_kue/difftest/src/org/jcommander/ui/filepanel/actions/CompareAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompareAction.java	25 Mar 2006 12:14:27 -0000	1.1
--- CompareAction.java	26 Mar 2006 12:15:51 -0000	1.2
***************
*** 7,13 ****
--- 7,15 ----
  import java.io.FileInputStream;
  import java.io.FileNotFoundException;
+ import java.io.IOException;
  import java.io.InputStream;
  import java.lang.reflect.InvocationTargetException;
  
+ import org.apache.commons.vfs.*;
  import org.eclipse.compare.*;
  import org.eclipse.compare.structuremergeviewer.Differencer;
***************
*** 27,33 ****
--- 29,39 ----
  import org.eclipse.ui.WorkbenchException;
  import org.jcommander.compare.ComparePlugin;
+ import org.jcommander.compare.CompareTest;
  import org.jcommander.compare.perspective.ComparePerspectiveFactory;
+ import org.jcommander.ui.filepanel.FilePanelManagerProvider;
+ import org.jcommander.ui.filepanel.controls.FileTab;
  import org.jcommander.ui.utils.EclipseBroker;
  import org.jcommander.ui.utils.ImageBroker;
+ import org.jcommander.ui.utils.MessageDisplayer;
  
  /**
***************
*** 45,55 ****
  	}
  
!     private static class FileInput implements IStructureComparator, ITypedElement, IStreamContentAccessor {
  
-     	private File file;
      	/**
! 		 * 
! 		 */
!     	
      	public String base;
      	
--- 51,220 ----
  	}
  
! //    private static class FileInput implements IStructureComparator, ITypedElement, IStreamContentAccessor, IEditableContent {
! //
! //    	private File file;
! //    	/**
! //		 * 
! //		 */
! //    	
! //    	public String base;
! //    	
! //    	//protected static final ImageRegistry imgRegistry = new ImageRegistry();
! //    	
! //		public boolean equals(Object other) {
! //			if (other instanceof ITypedElement)
! //				return getName().equals(((ITypedElement) other).getName());
! //			return super.equals(other);
! //		}
! //    	
! //		public int hashCode() {
! //			return getName().hashCode();
! //		}
! //		
! //		public FileInput(File file, String base) {
! //			// TODO Auto-generated constructor stub
! //			System.out.println(file.getName());
! //			this.file=file;
! //			this.base=base;
! //		}
! //    	
! //		/* (non-Javadoc)
! //		 * @see org.eclipse.compare.structuremergeviewer.IStructureComparator#getChildren()
! //		 */
! //		public Object[] getChildren() {
! //			//System.out.println("getchildren");
! //			if (file.listFiles()==null)
! //				{
! //					//System.out.println("Keine Kinder");
! //					return null;
! //				
! //				}
! //			//System.out.println("Kinder->");
! //			//ArrayList list = new ArrayList();
! //			Object[] children= new Object[file.listFiles().length];
! //			File[] filelist = file.listFiles();
! //			
! //			for (int i = 0; i < filelist.length; i++) {
! //				//list.add(new FileInput(filelist[i]));
! //				children[i]=new FileInput(filelist[i],base);
! //			}
! //			return children;//list.toArray();
! //		}
! //
! //		/* (non-Javadoc)
! //		 * @see org.eclipse.compare.ITypedElement#getName()
! //		 */
! //		public String getName() {
! //			//return file.getAbsolutePath().substring(base.length());
! //			return file.getName();
! //		}
! //
! //		public Image getIconFromProgram(Program program) {
! //			Image image;// = (Image) imgRegistry.get(program.getName());
! //			//if (image == null) {
! //				ImageData imageData = program.getImageData();
! //				if (imageData != null) {
! //					image = new Image(null, imageData, imageData.getTransparencyMask());
! //					//imgRegistry.put(program.getName(), image);
! //				} else {
! //					image = ImageBroker.FILE_ICON;
! //				}
! //			//}
! //			return image;
! //		}
! //		
! //		/* (non-Javadoc)
! //		 * @see org.eclipse.compare.ITypedElement#getImage()
! //		 */
! //		public Image getImage() {
! //			Image iconImage = null;
! //			if (file.isDirectory()) return ImageBroker.FOLDER_ICON;
! //			int dot = file.getName().lastIndexOf('.');
! //			if (dot != -1) {
! //				String extension = file.getName().substring(dot);
! //				Program program = Program.findProgram(extension);
! //				if (program != null) {
! //					//typeString = program.getName();
! //					//typeString = extension.toUpperCase();
! //					iconImage = getIconFromProgram(program);
! //				} else {
! //					iconImage = ImageBroker.FILE_ICON;
! //				}
! //			} else {
! //				iconImage = ImageBroker.FILE_ICON;
! //			}
! //			return iconImage;
! //		}
! //
! //		/* (non-Javadoc)
! //		 * @see org.eclipse.compare.ITypedElement#getType()
! //		 */
! //		public String getType() {
! //			// TODO Auto-generated method stub
! //			if (file.isDirectory()){
! //				System.out.println(FOLDER_TYPE);
! //				return FOLDER_TYPE;
! //			}
! //			else {
! //				String name=file.getName();
! //				int dot=name.lastIndexOf('.');
! //				String type=name.substring(dot+1);
! //				System.out.println(type);
! //				return type;
! //			}
! //			//System.out.println((file.isDirectory())?FOLDER_TYPE:TEXT_TYPE);
! //			//return (file.isDirectory())?FOLDER_TYPE:TEXT_TYPE;
! //		}
! //
! //		/* (non-Javadoc)
! //		 * @see org.eclipse.compare.IStreamContentAccessor#getContents()
! //		 */
! //		public InputStream getContents() throws CoreException {
! //			// TODO Auto-generated method stub
! //			if (file.isDirectory()) return null;
! //			try {
! //				return new FileInputStream(file);
! //			} catch (FileNotFoundException e) {
! //				// TODO Auto-generated catch block
! //				e.printStackTrace();
! //			}
! //			return null;
! //		}
! //
! //		public boolean isEditable() {
! //			// TODO Auto-generated method stub
! //			return true;
! //		}
! //
! //		public void setContent(byte[] newContent) {
! //			// TODO Auto-generated method stub
! //			
! //		}
! //
! //		public ITypedElement replace(ITypedElement dest, ITypedElement src) {
! //			// TODO Auto-generated method stub
! //			return null;
! //		}
! //		
! //    }
!     
! 	/**
! 	 * 
! 	 * @author MatthiasK
! 	 * FileInput encapsulates an FileObject into an class the
! 	 * eclipse comparefunctions are able to use.
! 	 */
!     private static class FileInput implements IStructureComparator, 
!     	ITypedElement, IStreamContentAccessor, IEditableContent {
  
      	/**
!     	 * The FileObject this FileInput represents
!     	 */
!     	private FileObject file;
! 
!     	/**
!     	 * The basedirectory from which we are comparing.
!     	 * Not any longer needed, just not yet removed.
!     	 */
      	public String base;
      	
***************
*** 66,76 ****
  		}
  		
! 		public FileInput(File file, String base) {
! 			// TODO Auto-generated constructor stub
! 			System.out.println(file.getName());
  			this.file=file;
  			this.base=base;
  		}
!     	
  		/* (non-Javadoc)
  		 * @see org.eclipse.compare.structuremergeviewer.IStructureComparator#getChildren()
--- 231,246 ----
  		}
  		
! 		public FileInput(FileObject file, String base) {
! 			//System.out.println(file.getName());
  			this.file=file;
  			this.base=base;
  		}
! 
! 		public FileInput(FileObject file) {
! 			System.out.println(file.getName());
! 			this.file=file;
! 			this.base="";
! 		}
! 		
  		/* (non-Javadoc)
  		 * @see org.eclipse.compare.structuremergeviewer.IStructureComparator#getChildren()
***************
*** 78,97 ****
  		public Object[] getChildren() {
  			//System.out.println("getchildren");
! 			if (file.listFiles()==null)
! 				{
! 					//System.out.println("Keine Kinder");
! 					return null;
! 				
! 				}
! 			//System.out.println("Kinder->");
! 			//ArrayList list = new ArrayList();
! 			Object[] children= new Object[file.listFiles().length];
! 			File[] filelist = file.listFiles();
  			
  			for (int i = 0; i < filelist.length; i++) {
- 				//list.add(new FileInput(filelist[i]));
  				children[i]=new FileInput(filelist[i],base);
  			}
! 			return children;//list.toArray();
  		}
  
--- 248,273 ----
  		public Object[] getChildren() {
  			//System.out.println("getchildren");
! 			try {
! 				if (file.getChildren()==null)
! 					{
! 						return null;
! 					}
! 			} catch (FileSystemException e) {
! 				return null;
! 			}
! 			Object[] children=null;
! 			FileObject[] filelist=null;			
! 			try {
! 				children= new Object[file.getChildren().length];
! 				filelist = file.getChildren();
! 			} catch (FileSystemException e) {
! 				e.printStackTrace();
! 			}
! 			
  			
  			for (int i = 0; i < filelist.length; i++) {
  				children[i]=new FileInput(filelist[i],base);
  			}
! 			return children;
  		}
  
***************
*** 101,108 ****
  		public String getName() {
  			//return file.getAbsolutePath().substring(base.length());
! 			return file.getName();
  		}
  
! 		public Image getIconFromProgram(Program program) {
  			Image image;// = (Image) imgRegistry.get(program.getName());
  			//if (image == null) {
--- 277,284 ----
  		public String getName() {
  			//return file.getAbsolutePath().substring(base.length());
! 			return file.getName().getBaseName();
  		}
  
! 		private Image getIconFromProgram(Program program) {
  			Image image;// = (Image) imgRegistry.get(program.getName());
  			//if (image == null) {
***************
*** 123,130 ****
  		public Image getImage() {
  			Image iconImage = null;
! 			if (file.isDirectory()) return ImageBroker.FOLDER_ICON;
! 			int dot = file.getName().lastIndexOf('.');
  			if (dot != -1) {
! 				String extension = file.getName().substring(dot);
  				Program program = Program.findProgram(extension);
  				if (program != null) {
--- 299,311 ----
  		public Image getImage() {
  			Image iconImage = null;
! 			try {
! 				if (file.getType()==FileType.FOLDER) return ImageBroker.FOLDER_ICON;
! 			} catch (FileSystemException e) {
! 				// TODO Auto-generated catch block
! 				e.printStackTrace();
! 			}
! 			int dot = file.getName().getBaseName().lastIndexOf('.');
  			if (dot != -1) {
! 				String extension = file.getName().getBaseName().substring(dot);
  				Program program = Program.findProgram(extension);
  				if (program != null) {
***************
*** 146,151 ****
  		public String getType() {
  			// TODO Auto-generated method stub
! 			System.out.println((file.isDirectory())?FOLDER_TYPE:TEXT_TYPE);
! 			return (file.isDirectory())?FOLDER_TYPE:TEXT_TYPE;
  		}
  
--- 327,345 ----
  		public String getType() {
  			// TODO Auto-generated method stub
! 			try {
! 				if (file.getType()==FileType.FOLDER) {
! 					return FOLDER_TYPE;
! 				} else {
! 					String name=file.getName().getBaseName();
! 					int dot=name.lastIndexOf('.');
! 					return name.substring(dot+1);
! 				}
! 				//System.out.println((file.getType()==FileType.FOLDER)?FOLDER_TYPE:TEXT_TYPE);
! 				//return (file.getType()==FileType.FOLDER)?FOLDER_TYPE:TEXT_TYPE;
! 			} catch (FileSystemException e) {
! 				// TODO Auto-generated catch block
! 				e.printStackTrace();
! 			}
! 			return null;
  		}
  
***************
*** 155,171 ****
  		public InputStream getContents() throws CoreException {
  			// TODO Auto-generated method stub
- 			if (file.isDirectory()) return null;
  			try {
! 				return new FileInputStream(file);
! 			} catch (FileNotFoundException e) {
  				// TODO Auto-generated catch block
  				e.printStackTrace();
  			}
  			return null;
  		}
! 		
!     }
      
! 
  	
  	/* (non-Javadoc)
--- 349,389 ----
  		public InputStream getContents() throws CoreException {
  			// TODO Auto-generated method stub
  			try {
! 				if (file.getType()==FileType.FOLDER) return null;
! 				return file.getContent().getInputStream();
! 			} catch (FileSystemException e1) {
! 				// TODO Auto-generated catch block
! 				e1.printStackTrace();
! 			}
! 			return null;
! 		}
! 
! 		public boolean isEditable() {
! 			// TODO Auto-generated method stub
! 			return true;
! 		}
! 
! 		public void setContent(byte[] newContent) {
! 			// TODO Auto-generated method stub
! 			try {
! 				System.out.println("setContent");
! 				file.getContent().getOutputStream().write(newContent);
! 			} catch (FileSystemException e) {
! 				// TODO Auto-generated catch block
! 				e.printStackTrace();
! 			} catch (IOException e) {
  				// TODO Auto-generated catch block
  				e.printStackTrace();
  			}
+ 		}
+ 
+ 		public ITypedElement replace(ITypedElement dest, ITypedElement src) {
+ 			// TODO Implement!
+ 			System.out.println("replace");
  			return null;
  		}
!  
      
!     }
  	
  	/* (non-Javadoc)
***************
*** 181,232 ****
  	 */
  	public void run(IAction action) {
! 		// TODO Auto-generated method stub
! 		System.out.println("ddd");
! //		ComparePlugin c=ComparePlugin.getDefault();
! //
! //		try {
! //			IWorkbenchPage page = PlatformUI.getWorkbench().showPerspective(ComparePlugin.COMPARE_PERSPECTIVE_ID, EclipseBroker.getWorkbenchWindow());
! //		} catch (WorkbenchException e) {
! //			// TODO Auto-generated catch block
! //			e.printStackTrace();
! //		}
! //		
! //	       Shell shell = new Shell();   
! //	        CompareConfiguration cc = new CompareConfiguration();
! //	        CompareEditorInput input = new CompareEditorInput(cc) {
! //		        protected Object prepareInput(IProgressMonitor monitor) throws
! //		            InvocationTargetException, InterruptedException {
! //		        	Object fRoot;
! //		        	Differencer d = new Differencer();
! //		        	System.out.println("Finding diffs");
! //		        	fRoot = d.findDifferences(false,monitor,null,null,
! //		        			new FileInput(new File("D:\\Matthias\\Comp\\d1"),"D:\\Matthias\\Comp\\d1"),
! //		        			new FileInput(new File("D:\\Matthias\\Comp\\d2"),"D:\\Matthias\\Comp\\d2"));
! //		        			//r1,
! //		        			//r2);
! //		        	System.out.println("found diffs");
! //		        	
! //		        	return fRoot;
! //		        /*return new DiffNode(
! //		            new ByteInput("left",
! //		                //"these\nare\nthe\ncontents"),
! //		            		"c:\\Programm"),
! //		            new ByteInput("right",    
! //		                //"theasdse\nare\nthe\ncontednts"));
! //		            		"c:\\Programme"));*/
! //		            }
! //	        };
! //	        CompareUI.openCompareEditor(input);
! //	        /*TextEditor t = new TextEditor();
! //	        try {
! //				window.getActivePage().openEditor(null,"test");
! //			} catch (WorkbenchException e) {
! //				// TODO Auto-generated catch block
! //				e.printStackTrace();
! //			}*/
! //		
! //		//CompareUI.openCompareEditor(input)
! //		
! 		ComparePlugin.getDefault().compare(null, null);
  
  	}
--- 399,480 ----
  	 */
  	public void run(IAction action) {
! 		/*
! 		 * Code below copied from CompareByContentAction
! 		 */
! 		
! 		boolean error = true;
! 		
! 		FileTab tab = FilePanelManagerProvider
! 			.getTabManager()
! 			.getActiveTabMediator()
! 			.getFileTab();
! 		
! 		/* Try to find a two file selection in the active panel */
! 		
! 		FileObject leftFile = null;
! 		FileObject rightFile = null;
! 		
! 		FileObject[] selectedFiles = tab.getActiveFilePanel()
! 													.getPanelMediator()
! 													.getFilePanel()
! 													.getFileControl()
! 													.getSelectedFiles();
! 
! 		if(selectedFiles.length == 2) {
! 			error = false;
! 			
! 			// We have found an exact selection in the active panel
! 			leftFile = selectedFiles[0];
! 			rightFile = selectedFiles[1];
! 		} else 
! 		if(selectedFiles.length == 1){
! 			// Try to find a matching file in the other panel
! 			
! 			FileObject[] otherSelectedFiles = tab.getInactiveFilePanel()
! 																.getPanelMediator()
! 																.getFilePanel()
! 																.getFileControl()
! 																.getSelectedFiles();
! 			
! 			if(otherSelectedFiles.length ==1) {
! 				error = false;
! 				
! 				leftFile = selectedFiles[0];
! 				rightFile = otherSelectedFiles[0];
! 			}
! 		}
! 		
! 		final FileObject fLeftFile=leftFile;
! 		final FileObject fRightFile=rightFile;
! 		if(!error) {		
! 			
! 			try {
! 			IWorkbenchPage page = PlatformUI.getWorkbench().showPerspective(ComparePlugin.COMPARE_PERSPECTIVE_ID, EclipseBroker.getWorkbenchWindow());
! 			} catch (WorkbenchException e) {
! 				// TODO Auto-generated catch block
! 				e.printStackTrace();
! 			}
! 			
! 			CompareConfiguration cc = new CompareConfiguration();
! 			cc.setLeftEditable(true);
! 			cc.setRightEditable(true);
! 	        CompareEditorInput input = new CompareEditorInput(cc) {
! 		        protected Object prepareInput(IProgressMonitor monitor) throws
! 		            InvocationTargetException, InterruptedException {
! 		        	Object fRoot;
! 		        	Differencer d = new Differencer();
! 		        	//System.out.println("Finding diffs");
! 		        	fRoot = d.findDifferences(false,monitor,null,null,
! 		        			new FileInput(fLeftFile),
! 		        			new FileInput(fRightFile));
! 		        	//System.out.println("found diffs");
! 		        	
! 		        	return fRoot;
! 		            }
! 	        };
! 	        CompareUI.openCompareEditor(input);
! 		} else {
! 			MessageDisplayer.setStatusErrorMessage("Could not find suitable selections for performing diff");
! 		}
  
  	}

[Jcommander-commit] incubator/matthias_kue/org.jcommander.compare/src/org/jcommander/compare ComparePlugin.java,NONE,1.1

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

Update of /cvsroot/jcommander/incubator/matthias_kue/org.jcommander.compare/src/org/jcommander/compare
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3787/matthias_kue/org.jcommander.compare/src/org/jcommander/compare

Added Files:
	ComparePlugin.java 
Log Message:
Compare tests

--- NEW FILE: ComparePlugin.java ---
package org.jcommander.compare;

import java.io.InputStream;

import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.ImageData;
import org.eclipse.swt.program.Program;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.WorkbenchException;
import org.eclipse.ui.plugin.*;
import org.eclipse.compare.IStreamContentAccessor;
import org.eclipse.compare.ITypedElement;
import org.eclipse.compare.structuremergeviewer.IStructureComparator;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.resource.ImageDescriptor;
import org.jcommander.ui.utils.EclipseBroker;
import org.jcommander.ui.utils.ImageBroker;
import org.osgi.framework.BundleContext;
import org.apache.commons.vfs.*;

/**
 * The main plugin class to be used in the desktop.
 */
public class ComparePlugin extends AbstractUIPlugin {

	//The shared instance.
	private static ComparePlugin plugin;
	
	public static final String COMPARE_PERSPECTIVE_ID = "org.jcommander.compare.Compare";
	
	/**
	 * 
	 * @author MatthiasK
	 * FileInput encapsulates an FileObject into an class the
	 * eclipse comparefunctions are able to use.
	 */
    private static class FileInput implements IStructureComparator, ITypedElement, IStreamContentAccessor {

    	/**
    	 * The FileObject this FileInput represents
    	 */
    	private FileObject file;

    	/**
    	 * The basedirectory from which we are comparing.
    	 * Not any longer needed, just not yet removed.
    	 */
    	public String base;
    	
    	//protected static final ImageRegistry imgRegistry = new ImageRegistry();
    	
		public boolean equals(Object other) {
			if (other instanceof ITypedElement)
				return getName().equals(((ITypedElement) other).getName());
			return super.equals(other);
		}
    	
		public int hashCode() {
			return getName().hashCode();
		}
		
		public FileInput(FileObject file, String base) {
			//System.out.println(file.getName());
			this.file=file;
			this.base=base;
		}

		public FileInput(FileObject file) {
			System.out.println(file.getName());
			this.file=file;
			this.base="";
		}
		
		/* (non-Javadoc)
		 * @see org.eclipse.compare.structuremergeviewer.IStructureComparator#getChildren()
		 */
		public Object[] getChildren() {
			//System.out.println("getchildren");
			try {
				if (file.getChildren()==null)
					{
						return null;
					}
			} catch (FileSystemException e) {
				return null;
			}
			Object[] children=null;
			FileObject[] filelist=null;			
			try {
				children= new Object[file.getChildren().length];
				filelist = file.getChildren();
			} catch (FileSystemException e) {
				e.printStackTrace();
			}
			
			
			for (int i = 0; i < filelist.length; i++) {
				children[i]=new FileInput(filelist[i],base);
			}
			return children;
		}

		/* (non-Javadoc)
		 * @see org.eclipse.compare.ITypedElement#getName()
		 */
		public String getName() {
			//return file.getAbsolutePath().substring(base.length());
			return file.getName().getBaseName();
		}

		private Image getIconFromProgram(Program program) {
			Image image;// = (Image) imgRegistry.get(program.getName());
			//if (image == null) {
				ImageData imageData = program.getImageData();
				if (imageData != null) {
					image = new Image(null, imageData, imageData.getTransparencyMask());
					//imgRegistry.put(program.getName(), image);
				} else {
					image = ImageBroker.FILE_ICON;
				}
			//}
			return image;
		}
		
		/* (non-Javadoc)
		 * @see org.eclipse.compare.ITypedElement#getImage()
		 */
		public Image getImage() {
			Image iconImage = null;
			try {
				if (file.getType()==FileType.FOLDER) return ImageBroker.FOLDER_ICON;
			} catch (FileSystemException e) {
				// TODO Auto-generated catch block
				e.printStackTrace();
			}
			int dot = file.getName().getBaseName().lastIndexOf('.');
			if (dot != -1) {
				String extension = file.getName().getBaseName().substring(dot);
				Program program = Program.findProgram(extension);
				if (program != null) {
					//typeString = program.getName();
					//typeString = extension.toUpperCase();
					iconImage = getIconFromProgram(program);
				} else {
					iconImage = ImageBroker.FILE_ICON;
				}
			} else {
				iconImage = ImageBroker.FILE_ICON;
			}
			return iconImage;
		}

		/* (non-Javadoc)
		 * @see org.eclipse.compare.ITypedElement#getType()
		 */
		public String getType() {
			// TODO Auto-generated method stub
			try {
				System.out.println((file.getType()==FileType.FOLDER)?FOLDER_TYPE:TEXT_TYPE);
				return (file.getType()==FileType.FOLDER)?FOLDER_TYPE:TEXT_TYPE;
			} catch (FileSystemException e) {
				// TODO Auto-generated catch block
				e.printStackTrace();
			}
			return null;
		}

		/* (non-Javadoc)
		 * @see org.eclipse.compare.IStreamContentAccessor#getContents()
		 */
		public InputStream getContents() throws CoreException {
			// TODO Auto-generated method stub
			try {
				if (file.getType()==FileType.FOLDER) return null;
				return file.getContent().getInputStream();
			} catch (FileSystemException e1) {
				// TODO Auto-generated catch block
				e1.printStackTrace();
			}
			return null;
		}
 
    
    }
	
	/**
	 * The constructor.
	 */
	public ComparePlugin() {
		plugin = this;
	}

	/**
	 * This method is called upon plug-in activation
	 */
	public void start(BundleContext context) throws Exception {
		super.start(context);
	}

	/**
	 * This method is called when the plug-in is stopped
	 */
	public void stop(BundleContext context) throws Exception {
		super.stop(context);
		plugin = null;
	}

	/**
	 * Returns the shared instance.
	 *
	 * @return the shared instance.
	 */
	public static ComparePlugin getDefault() {
		return plugin;
	}

	/**
	 * Returns an image descriptor for the image file at the given
	 * plug-in relative path.
	 *
	 * @param path the path
	 * @return the image descriptor
	 */
	public static ImageDescriptor getImageDescriptor(String path) {
		return AbstractUIPlugin.imageDescriptorFromPlugin("org.jcommander.compare", path);
	}
	
	public void compare(FileObject left, FileObject right){
		try {
			IWorkbenchPage page = PlatformUI.getWorkbench().showPerspective(COMPARE_PERSPECTIVE_ID, EclipseBroker.getWorkbenchWindow());
			System.out.println("Compare!!!");
		} catch (WorkbenchException e) {
			// TODO Auto-generated catch block
			e.printStackTrace();
		}
		System.out.println("ComparePlugin");
	}
}

[Jcommander-commit] incubator/matthias_kue/org.jcommander.compare/src/org/jcommander/compare/perspective ComparePerspectiveFactory.java,NONE,1.1

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

Update of /cvsroot/jcommander/incubator/matthias_kue/org.jcommander.compare/src/org/jcommander/compare/perspective
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3787/matthias_kue/org.jcommander.compare/src/org/jcommander/compare/perspective

Added Files:
	ComparePerspectiveFactory.java 
Log Message:
Compare tests

--- NEW FILE: ComparePerspectiveFactory.java ---
/**
 * 
 */
package org.jcommander.compare.perspective;

import org.eclipse.ui.IPageLayout;
import org.eclipse.ui.IPerspectiveFactory;

/**
 * @author MatthiasK
 *
 */
public class ComparePerspectiveFactory implements IPerspectiveFactory {

	/* (non-Javadoc)
	 * @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui.IPageLayout)
	 */
	public void createInitialLayout(IPageLayout layout) {
		// TODO Auto-generated method stub
		layout.setEditorAreaVisible(true);
	}

}

[Jcommander-commit] incubator/matthias_kue/org.jcommander.compare build.properties,NONE,1.1 plugin.xml,NONE,1.1

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

Update of /cvsroot/jcommander/incubator/matthias_kue/org.jcommander.compare
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3787/matthias_kue/org.jcommander.compare

Added Files:
	build.properties plugin.xml 
Log Message:
Compare tests

--- NEW FILE: build.properties ---
source.. = src/
output.. = bin/
bin.includes = plugin.xml,\
               META-INF/,\
               .

--- NEW FILE: plugin.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
<plugin>

   <extension
         point="org.eclipse.ui.preferencePages">
      <page
            name="Compare Preferences"
            class="org.jcommander.compare.preferences.ComparePreferencePage"
            id="org.jcommander.compare.preferences.ComparePreferencePage">
      </page>
   </extension>
   <extension
         point="org.eclipse.core.runtime.preferences">
      <initializer
            class="org.jcommander.compare.preferences.PreferenceInitializer">
      </initializer>
   </extension>
   <extension
   		 point="org.eclipse.ui.perspectives">
         <perspective
         id="org.jcommander.compare.Compare"
         class="org.jcommander.compare.perspective.ComparePerspectiveFactory"
         name="Compare"
          />
   </extension>

</plugin>

[Jcommander-commit] incubator/matthias_kue/difftest/src/org/jcommander/ui/filepanel/actions CompareAction.java,NONE,1.1

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

Update of /cvsroot/jcommander/incubator/matthias_kue/difftest/src/org/jcommander/ui/filepanel/actions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3787/matthias_kue/difftest/src/org/jcommander/ui/filepanel/actions

Added Files:
	CompareAction.java 
Log Message:
Compare tests

--- NEW FILE: CompareAction.java ---
/**
 * 
 */
package org.jcommander.ui.filepanel.actions;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;

import org.eclipse.compare.*;
import org.eclipse.compare.structuremergeviewer.Differencer;
import org.eclipse.compare.structuremergeviewer.IStructureComparator;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.ImageData;
import org.eclipse.swt.program.Program;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.IWorkbenchWindowActionDelegate;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.WorkbenchException;
import org.jcommander.compare.ComparePlugin;
import org.jcommander.compare.perspective.ComparePerspectiveFactory;
import org.jcommander.ui.utils.EclipseBroker;
import org.jcommander.ui.utils.ImageBroker;

/**
 * @author MatthiasK
 *
 */
public class CompareAction implements IWorkbenchWindowActionDelegate {

	/* (non-Javadoc)
	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
	 */
	public void dispose() {
		// TODO Auto-generated method stub

	}

    private static class FileInput implements IStructureComparator, ITypedElement, IStreamContentAccessor {

    	private File file;
    	/**
		 * 
		 */
    	
    	public String base;
    	
    	//protected static final ImageRegistry imgRegistry = new ImageRegistry();
    	
		public boolean equals(Object other) {
			if (other instanceof ITypedElement)
				return getName().equals(((ITypedElement) other).getName());
			return super.equals(other);
		}
    	
		public int hashCode() {
			return getName().hashCode();
		}
		
		public FileInput(File file, String base) {
			// TODO Auto-generated constructor stub
			System.out.println(file.getName());
			this.file=file;
			this.base=base;
		}
    	
		/* (non-Javadoc)
		 * @see org.eclipse.compare.structuremergeviewer.IStructureComparator#getChildren()
		 */
		public Object[] getChildren() {
			//System.out.println("getchildren");
			if (file.listFiles()==null)
				{
					//System.out.println("Keine Kinder");
					return null;
				
				}
			//System.out.println("Kinder->");
			//ArrayList list = new ArrayList();
			Object[] children= new Object[file.listFiles().length];
			File[] filelist = file.listFiles();
			
			for (int i = 0; i < filelist.length; i++) {
				//list.add(new FileInput(filelist[i]));
				children[i]=new FileInput(filelist[i],base);
			}
			return children;//list.toArray();
		}

		/* (non-Javadoc)
		 * @see org.eclipse.compare.ITypedElement#getName()
		 */
		public String getName() {
			//return file.getAbsolutePath().substring(base.length());
			return file.getName();
		}

		public Image getIconFromProgram(Program program) {
			Image image;// = (Image) imgRegistry.get(program.getName());
			//if (image == null) {
				ImageData imageData = program.getImageData();
				if (imageData != null) {
					image = new Image(null, imageData, imageData.getTransparencyMask());
					//imgRegistry.put(program.getName(), image);
				} else {
					image = ImageBroker.FILE_ICON;
				}
			//}
			return image;
		}
		
		/* (non-Javadoc)
		 * @see org.eclipse.compare.ITypedElement#getImage()
		 */
		public Image getImage() {
			Image iconImage = null;
			if (file.isDirectory()) return ImageBroker.FOLDER_ICON;
			int dot = file.getName().lastIndexOf('.');
			if (dot != -1) {
				String extension = file.getName().substring(dot);
				Program program = Program.findProgram(extension);
				if (program != null) {
					//typeString = program.getName();
					//typeString = extension.toUpperCase();
					iconImage = getIconFromProgram(program);
				} else {
					iconImage = ImageBroker.FILE_ICON;
				}
			} else {
				iconImage = ImageBroker.FILE_ICON;
			}
			return iconImage;
		}

		/* (non-Javadoc)
		 * @see org.eclipse.compare.ITypedElement#getType()
		 */
		public String getType() {
			// TODO Auto-generated method stub
			System.out.println((file.isDirectory())?FOLDER_TYPE:TEXT_TYPE);
			return (file.isDirectory())?FOLDER_TYPE:TEXT_TYPE;
		}

		/* (non-Javadoc)
		 * @see org.eclipse.compare.IStreamContentAccessor#getContents()
		 */
		public InputStream getContents() throws CoreException {
			// TODO Auto-generated method stub
			if (file.isDirectory()) return null;
			try {
				return new FileInputStream(file);
			} catch (FileNotFoundException e) {
				// TODO Auto-generated catch block
				e.printStackTrace();
			}
			return null;
		}
		
    }
    

	
	/* (non-Javadoc)
	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
	 */
	public void init(IWorkbenchWindow window) {
		// TODO Auto-generated method stub

	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
	 */
	public void run(IAction action) {
		// TODO Auto-generated method stub
		System.out.println("ddd");
//		ComparePlugin c=ComparePlugin.getDefault();
//
//		try {
//			IWorkbenchPage page = PlatformUI.getWorkbench().showPerspective(ComparePlugin.COMPARE_PERSPECTIVE_ID, EclipseBroker.getWorkbenchWindow());
//		} catch (WorkbenchException e) {
//			// TODO Auto-generated catch block
//			e.printStackTrace();
//		}
//		
//	       Shell shell = new Shell();   
//	        CompareConfiguration cc = new CompareConfiguration();
//	        CompareEditorInput input = new CompareEditorInput(cc) {
//		        protected Object prepareInput(IProgressMonitor monitor) throws
//		            InvocationTargetException, InterruptedException {
//		        	Object fRoot;
//		        	Differencer d = new Differencer();
//		        	System.out.println("Finding diffs");
//		        	fRoot = d.findDifferences(false,monitor,null,null,
//		        			new FileInput(new File("D:\\Matthias\\Comp\\d1"),"D:\\Matthias\\Comp\\d1"),
//		        			new FileInput(new File("D:\\Matthias\\Comp\\d2"),"D:\\Matthias\\Comp\\d2"));
//		        			//r1,
//		        			//r2);
//		        	System.out.println("found diffs");
//		        	
//		        	return fRoot;
//		        /*return new DiffNode(
//		            new ByteInput("left",
//		                //"these\nare\nthe\ncontents"),
//		            		"c:\\Programm"),
//		            new ByteInput("right",    
//		                //"theasdse\nare\nthe\ncontednts"));
//		            		"c:\\Programme"));*/
//		            }
//	        };
//	        CompareUI.openCompareEditor(input);
//	        /*TextEditor t = new TextEditor();
//	        try {
//				window.getActivePage().openEditor(null,"test");
//			} catch (WorkbenchException e) {
//				// TODO Auto-generated catch block
//				e.printStackTrace();
//			}*/
//		
//		//CompareUI.openCompareEditor(input)
//		
		ComparePlugin.getDefault().compare(null, null);

	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
	 */
	public void selectionChanged(IAction action, ISelection selection) {
		// TODO Auto-generated method stub

	}

}

[Jcommander-commit] incubator/matthias_kue/org.jcommander.compare/META-INF MANIFEST.MF,NONE,1.1

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

Update of /cvsroot/jcommander/incubator/matthias_kue/org.jcommander.compare/META-INF
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3787/matthias_kue/org.jcommander.compare/META-INF

Added Files:
	MANIFEST.MF 
Log Message:
Compare tests

--- NEW FILE: MANIFEST.MF ---
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Compare Plug-in
Bundle-SymbolicName: org.jcommander.compare; singleton:=true
Bundle-Version: 1.0.0
Bundle-Activator: org.jcommander.compare.ComparePlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
 org.eclipse.core.runtime,
 org.apache.commons.vfs,
 org.jcommander.eclipsepatch.compare,
 org.jcommander.ui.utils
Eclipse-LazyStart: true

[Jcommander-commit] incubator/matthias_kue/org.jcommander.compare/src/org/jcommander/compare/preferences ComparePreferencePage.java,NONE,1.1 PreferenceConstants.java,NONE,1.1 PreferenceInitializer.java,NONE,1.1

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

Update of /cvsroot/jcommander/incubator/matthias_kue/org.jcommander.compare/src/org/jcommander/compare/preferences
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3787/matthias_kue/org.jcommander.compare/src/org/jcommander/compare/preferences

Added Files:
	ComparePreferencePage.java PreferenceConstants.java 
	PreferenceInitializer.java 
Log Message:
Compare tests

--- NEW FILE: PreferenceConstants.java ---
package org.jcommander.compare.preferences;

/**
 * Constant definitions for plug-in preferences
 */
public class PreferenceConstants {

	public static final String P_PATH = "pathPreference";

	public static final String P_BOOLEAN = "booleanPreference";

	public static final String P_CHOICE = "choicePreference";

	public static final String P_STRING = "stringPreference";
	
}

--- NEW FILE: ComparePreferencePage.java ---
package org.jcommander.compare.preferences;

import org.eclipse.jface.preference.*;
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.IWorkbench;
import org.jcommander.compare.ComparePlugin;

/**
 * This class represents a preference page that
 * is contributed to the Preferences dialog. By 
 * subclassing <samp>FieldEditorPreferencePage</samp>, we
 * can use the field support built into JFace that allows
 * us to create a page that is small and knows how to 
 * save, restore and apply itself.
 * <p>
 * This page is used to modify preferences only. They
 * are stored in the preference store that belongs to
 * the main plug-in class. That way, preferences can
 * be accessed directly via the preference store.
 */

public class ComparePreferencePage
	extends FieldEditorPreferencePage
	implements IWorkbenchPreferencePage {

	public ComparePreferencePage() {
		super(GRID);
		setPreferenceStore(ComparePlugin.getDefault().getPreferenceStore());
		setDescription("A demonstration of a preference page implementation");
	}
	
	/**
	 * Creates the field editors. Field editors are abstractions of
	 * the common GUI blocks needed to manipulate various types
	 * of preferences. Each field editor knows how to save and
	 * restore itself.
	 */
	public void createFieldEditors() {
		addField(new DirectoryFieldEditor(PreferenceConstants.P_PATH, 
				"&Directory preference:", getFieldEditorParent()));
		addField(
			new BooleanFieldEditor(
				PreferenceConstants.P_BOOLEAN,
				"&An example of a boolean preference",
				getFieldEditorParent()));

		addField(new RadioGroupFieldEditor(
				PreferenceConstants.P_CHOICE,
			"An example of a multiple-choice preference",
			1,
			new String[][] { { "&Choice 1", "choice1" }, {
				"C&hoice 2", "choice2" }
		}, getFieldEditorParent()));
		addField(
			new StringFieldEditor(PreferenceConstants.P_STRING, "A &text preference:", getFieldEditorParent()));
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
	 */
	public void init(IWorkbench workbench) {
	}
	
}
--- NEW FILE: PreferenceInitializer.java ---
package org.jcommander.compare.preferences;

import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
import org.eclipse.jface.preference.IPreferenceStore;

import org.jcommander.compare.ComparePlugin;

/**
 * Class used to initialize default preference values.
 */
public class PreferenceInitializer extends AbstractPreferenceInitializer {

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
	 */
	public void initializeDefaultPreferences() {
		IPreferenceStore store = ComparePlugin.getDefault()
				.getPreferenceStore();
		store.setDefault(PreferenceConstants.P_BOOLEAN, true);
		store.setDefault(PreferenceConstants.P_CHOICE, "choice2");
		store.setDefault(PreferenceConstants.P_STRING,
				"Default value");
	}

}

[Jcommander-commit] incubator/matthias_kue/org.jcommander.compare/src/org/jcommander/compare/perspective - New directory

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

Update of /cvsroot/jcommander/incubator/matthias_kue/org.jcommander.compare/src/org/jcommander/compare/perspective
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3700/matthias_kue/org.jcommander.compare/src/org/jcommander/compare/perspective

Log Message:
Directory /cvsroot/jcommander/incubator/matthias_kue/org.jcommander.compare/src/org/jcommander/compare/perspective added to the repository

[Jcommander-commit] incubator/matthias_kue/org.jcommander.compare/src/org/jcommander - New directory

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

Update of /cvsroot/jcommander/incubator/matthias_kue/org.jcommander.compare/src/org/jcommander
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3700/matthias_kue/org.jcommander.compare/src/org/jcommander

Log Message:
Directory /cvsroot/jcommander/incubator/matthias_kue/org.jcommander.compare/src/org/jcommander added to the repository

[Jcommander-commit] incubator/matthias_kue/org.jcommander.compare/src - New directory

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

Update of /cvsroot/jcommander/incubator/matthias_kue/org.jcommander.compare/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3700/matthias_kue/org.jcommander.compare/src

Log Message:
Directory /cvsroot/jcommander/incubator/matthias_kue/org.jcommander.compare/src added to the repository

[Jcommander-commit] incubator/matthias_kue/org.jcommander.compare/src/org/jcommander/compare/preferences - New directory

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

Update of /cvsroot/jcommander/incubator/matthias_kue/org.jcommander.compare/src/org/jcommander/compare/preferences
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3700/matthias_kue/org.jcommander.compare/src/org/jcommander/compare/preferences

Log Message:
Directory /cvsroot/jcommander/incubator/matthias_kue/org.jcommander.compare/src/org/jcommander/compare/preferences added to the repository

[Jcommander-commit] incubator/matthias_kue/org.jcommander.compare/src/org/jcommander/compare - New directory

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

Update of /cvsroot/jcommander/incubator/matthias_kue/org.jcommander.compare/src/org/jcommander/compare
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3700/matthias_kue/org.jcommander.compare/src/org/jcommander/compare

Log Message:
Directory /cvsroot/jcommander/incubator/matthias_kue/org.jcommander.compare/src/org/jcommander/compare added to the repository

[Jcommander-commit] incubator/matthias_kue/org.jcommander.compare - New directory

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

Update of /cvsroot/jcommander/incubator/matthias_kue/org.jcommander.compare
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3700/matthias_kue/org.jcommander.compare

Log Message:
Directory /cvsroot/jcommander/incubator/matthias_kue/org.jcommander.compare added to the repository