jcommander-commit — User commit notifications

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers Utils.java,1.4,1.5

[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-serv27928/src/org/jcommander/ui/filepanel/performers

Modified Files:
	Utils.java 
Log Message:
Made tool windows resizable

Index: Utils.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/Utils.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Utils.java	3 May 2005 19:51:11 -0000	1.4
--- Utils.java	13 Apr 2006 07:55:09 -0000	1.5
***************
*** 21,25 ****
  	 */
  	public static Shell createOperationDialog(Shell parent, TabMediator mediator) {
! 		Shell tmpShell = new Shell(parent, SWT.TOOL | SWT.TITLE | SWT.CLOSE); 
  //				SWT.TITLE | SWT.CLOSE | SWT.MIN | SWT.MAX | SWT.BORDER | SWT.RESIZE);
  		
--- 21,25 ----
  	 */
  	public static Shell createOperationDialog(Shell parent, TabMediator mediator) {
! 		Shell tmpShell = new Shell(parent, SWT.TOOL | SWT.RESIZE | SWT.TITLE | SWT.CLOSE); 
  //				SWT.TITLE | SWT.CLOSE | SWT.MIN | SWT.MAX | SWT.BORDER | SWT.RESIZE);
  		

[Jcommander-commit] incubator/matthias_kue/dialogs CustomConfirmDialogComposite.java,NONE,1.1 DeleteConfirmDialogComposite.java,NONE,1.1

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

Update of /cvsroot/jcommander/incubator/matthias_kue/dialogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27852/matthias_kue/dialogs

Added Files:
	CustomConfirmDialogComposite.java 
	DeleteConfirmDialogComposite.java 
Log Message:
New dialog implementation with details

--- NEW FILE: CustomConfirmDialogComposite.java ---
/**
 * 
 */
package org.jcommander.ui.filepanel.dialogs;

import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.layout.RowLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.internal.progress.ProgressMessages;

/**
 * @author MatthiasK
 *
 */
public class CustomConfirmDialogComposite extends Composite {

	private Composite mainComposite = null;
	private Composite buttonsComposite = null;
	private Composite detailsComposite = null;
	private Composite detailsContent = null;
	
	private Button yesButton = null;
	private Button noButton = null;
	private Button detailsButton = null;
	
	private GridData detailsData = null;
	private int detailsHeight = 0;
	
	/**
	 * @param parent
	 * @param style
	 */
	public CustomConfirmDialogComposite(Composite parent, int style) {
		super(parent, style);
		initialize();
	}
	
	private void initialize(){
		createMainContent(this);
		createButtonsComposite();
		//mainComposite.setLayout(new GridLayout());
		this.setLayout(new GridLayout());
	}
	
	private void createButtonsComposite(){
		detailsComposite = new Composite(this, SWT.NONE);
		detailsData=new GridData();
		detailsData.horizontalAlignment=SWT.FILL;
		//detailsData.grabExcessHorizontalSpace=true;
		GridLayout detailsLayout = new GridLayout();
		detailsLayout.marginWidth=0;
		detailsComposite.setLayout(detailsLayout);
		detailsComposite.setLayoutData(detailsData);
		
		GridLayout gridLayout3 = new GridLayout();
		GridData gridData2 = new GridData();
		buttonsComposite = new Composite(this, SWT.NONE);
		
		Label fillLabel = new Label(buttonsComposite, SWT.NONE);
		GridData gridDataFill = new GridData();
		gridDataFill.grabExcessHorizontalSpace=true;
		gridDataFill.minimumWidth=200;
		fillLabel.setLayoutData(gridDataFill);
		
		yesButton = new Button(buttonsComposite, SWT.NONE);
		noButton = new Button(buttonsComposite, SWT.NONE);
		gridData2.grabExcessHorizontalSpace = true;
		gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.END;
		gridData2.verticalAlignment = org.eclipse.swt.layout.GridData.END;
		buttonsComposite.setLayoutData(gridData2);
		buttonsComposite.setLayout(gridLayout3);
		gridLayout3.numColumns = 4;
		gridLayout3.marginHeight = 1;
		gridLayout3.marginWidth = 1;
		yesButton.setText("&Yes");
//		GridLayout buttonLayout1 = new GridLayout();
		GridData l1 = new GridData();
		//l1.horizontalAlignment=SWT.FILL;
		l1.grabExcessHorizontalSpace=true;
		l1.minimumWidth=75;
		yesButton.setLayoutData(l1);
		GridData l2 = new GridData();
		l2.grabExcessHorizontalSpace=true;
		//l2.horizontalAlignment=SWT.FILL;
		l2.minimumWidth=75;
		noButton.setText("&No");
		noButton.setLayoutData(l2);
		
		detailsButton = new Button(buttonsComposite, SWT.NONE);
		GridData detailsButtonData = new GridData();
		detailsButtonData.minimumWidth=75;
		detailsButton.setText(ProgressMessages.ProgressMonitorJobsDialog_DetailsTitle);
		detailsButton.addSelectionListener(new SelectionAdapter() {
			@Override
			public void widgetSelected(SelectionEvent e) {
				super.widgetSelected(e);
		        Shell shell = getShell();
		        Point shellSize = shell.getSize();
		        Composite composite = buttonsComposite.getParent();
		        if (detailsContent != null) {
		        	detailsContent.dispose();
		        	detailsContent = null;
		            composite.layout();
		            shell.setSize(shellSize.x, shellSize.y -detailsHeight);
		            detailsButton.setText(ProgressMessages.ProgressMonitorJobsDialog_DetailsTitle);
		        } else {
		            //Abort if there are no jobs visible
		            /*if (ProgressManager.getInstance().getRootElements(Policy.DEBUG_SHOW_SYSTEM_JOBS).length == 0) {
		                detailsButton.setEnabled(false);
		                return;
		            }*/
		        	
		        	detailsContent = new Composite(detailsComposite, SWT.NONE|SWT.BORDER);
		        	//detailsContent.setBackground(getDisplay().getSystemColor(SWT.COLOR_WHITE));
		        	GridData detailsCData = new GridData();
		        	detailsCData.horizontalAlignment=SWT.FILL;
		        	detailsCData.grabExcessHorizontalSpace=true;
		        	//detailsCData.height=200;
		        	detailsContent.setLayoutData(detailsCData);
		        	detailsContent.setLayout(new RowLayout());
		        	createDetailsContent(detailsContent);
		        	/*Button b = new Button(detailsContent, SWT.NONE);
		        	b.setText("b");*/
		        	detailsComposite.layout(true);
		        	detailsContent.setVisible(true);
		        	detailsButton.setText(ProgressMessages.ProgressMonitorJobsDialog_HideTitle);
		        	//b.setVisible(true);
		        	composite.layout(true);
		        	Point p = detailsContent.getSize();
		        	detailsHeight = p.y;
		        	shell.setSize(shellSize.x, shellSize.y+detailsHeight);
		        	shell.pack();
			}
		}
		});
	}
	
	protected void createDetailsContent(Composite parent){
		
	}
	
	protected void createMainContent(Composite parent){
		
	}

	public Button getYesButton() {
		return yesButton;
	}
	
	public Button getNoButton() {
		return noButton;
	}
	
}

--- NEW FILE: DeleteConfirmDialogComposite.java ---
/*
 * Created on Jan 16, 2005
 */
package org.jcommander.ui.filepanel.dialogs;

import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.resource.*;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.*;
import org.eclipse.swt.widgets.*;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.jcommander.ui.filepanel.FilePanelPlugin;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.layout.GridLayout;

/**
 * Composite to show inside the delete confirmation dialog.
 * 
 * @author sky_halud
 */
public class DeleteConfirmDialogComposite extends CustomConfirmDialogComposite{

	private Label label = null;
	private Composite infoComposite = null;
	private Composite listComposite = null;
	private List deleteFileList;
	private Button moveToRecycleButton = null;
	private Label trashLabel = null;
	private boolean moveToRecycle;
	

	public DeleteConfirmDialogComposite(Composite parent, int style) {
		super(parent, style);
	}
	
	private void createListComposite(Composite info) {
		GridData gridData = new GridData();
		gridData.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
		gridData.grabExcessHorizontalSpace = true;
		gridData.verticalAlignment = org.eclipse.swt.layout.GridData.FILL;
		gridData.grabExcessVerticalSpace = true;
		GridData gridData1 = new GridData();
		GridData gridData2 = new GridData();
		gridData1.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
		gridData1.grabExcessHorizontalSpace = true;
		gridData1.verticalAlignment = org.eclipse.swt.layout.GridData.FILL;
		gridData1.grabExcessVerticalSpace = true;
		gridData1.heightHint=60;
		gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.END;
		gridData2.verticalAlignment = org.eclipse.swt.layout.GridData.BEGINNING;
		GridLayout gridLayout = new GridLayout();
		gridLayout.numColumns = 2;
		gridLayout.marginWidth=0;
		listComposite = new Composite(info, SWT.NONE);
		listComposite.setLayoutData(gridData);
		listComposite.setLayout(gridLayout);
		deleteFileList = new List(listComposite, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
		deleteFileList.setLayoutData(gridData1);
//		removeFileButton = new Button(listComposite, SWT.NONE);		
//		removeFileButton.setLayoutData(gridData2);
//		removeFileButton.setText("&Remove");	
//		
//		removeFileButton.addSelectionListener(new SelectionAdapter() {
//			public void widgetSelected(SelectionEvent e) {
//				int [] indices = deleteFileList.getSelectionIndices();
//				deleteFileList.remove(indices);
//				
//				if(deleteFileList.getItemCount() == 0) {
//					/** Nothing to delete. Disabling controls */
//					removeFileButton.setEnabled(false);
//					yesButton.setEnabled(false);
//					deleteFileList.setEnabled(false);
//				}
//			}
//		});
	}

	@Override
	protected void createMainContent(Composite parent) {
		GridLayout gridLayout1 = new GridLayout();
		gridLayout1.numColumns = 1;
		GridData gridData2 = new GridData();
		GridData gridData1 = new GridData();

		label = new Label(parent, SWT.NONE);
		
		infoComposite = new Composite(parent, SWT.NONE);
		//gridData1.horizontalAlignment = org.eclipse.swt.layout.GridData.CENTER;
		gridData1.grabExcessHorizontalSpace = true;
		gridData1.grabExcessVerticalSpace = true;
		
		label.setText("Delete selected files?");
		label.setLayoutData(gridData1);
		
		createListComposite(infoComposite);
		
		moveToRecycle = ((FilePanelPlugin.getDefault().getPreferenceStore()).
				getBoolean(FilePanelPlugin.MOVE_TO_RECYCLE_KEY));
		
		gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
		gridData2.verticalAlignment = org.eclipse.swt.layout.GridData.CENTER;
		gridData2.grabExcessHorizontalSpace = true;
		gridData2.grabExcessVerticalSpace = true;
		gridLayout1.marginWidth=0;
		infoComposite.setLayoutData(gridData2);
		infoComposite.setLayout(gridLayout1);
	}
	
	@Override
	protected void createDetailsContent(Composite parent) {
		//Button b = new Button(parent, SWT.NONE);
		Composite trashComposite = new Composite(parent, SWT.NONE);
		GridLayout trashLayout = new GridLayout();
		
		trashLayout.numColumns=2;
		trashComposite.setLayout(trashLayout);
		
		GridData trashData1 = new GridData();
		GridData trashData2 = new GridData();
		trashData1.verticalAlignment=SWT.CENTER;
		trashData2.verticalAlignment=SWT.CENTER;
		trashLabel = new Label(trashComposite, SWT.NONE);
		trashLabel.setText("");
		ImageDescriptor imgDesc = FilePanelPlugin.imageDescriptorFromPlugin(FilePanelPlugin.ID, "icons/trash.gif");
		Image trashImg = imgDesc.createImage(getDisplay());
		trashLabel.setImage(trashImg);
		trashLabel.setLayoutData(trashData1);
			
		moveToRecycleButton = new Button(trashComposite, SWT.CHECK);
		if(Platform.getOS().equals(Platform.OS_WIN32)) {
			moveToRecycleButton.setText("&Move to the recycle bin");
			moveToRecycleButton.setToolTipText("Moved deleted files to the recycle bin");
		}
		else {
			moveToRecycleButton.setText("&Move to the trash");
			moveToRecycleButton.setToolTipText("Moved deleted files to the trash");
		}
					
		moveToRecycleButton.setSelection(moveToRecycle);
		moveToRecycleButton.
						addSelectionListener(new SelectionAdapter() {
							public void widgetSelected(SelectionEvent e) {
								try {	
									IPreferenceStore store = FilePanelPlugin.getDefault().getPreferenceStore();
									store.setValue(FilePanelPlugin.MOVE_TO_RECYCLE_KEY,((Button) e.getSource()).getSelection());
								}
								catch(Exception ex) {
									//ignore
								}
							}
						});
		moveToRecycleButton.setLayoutData(trashData2);
	}

	public List getDeleteFileList() {
		return deleteFileList;
	}
	
	private void toggleEnableMoveToRecycle(boolean value) {
		if (moveToRecycleButton!=null)
		{
			moveToRecycleButton.setEnabled(value);
		}
	}
	
	private void setMoveToRecycle(boolean value) {
		IPreferenceStore store = FilePanelPlugin.getDefault().getPreferenceStore();
		store.setValue(FilePanelPlugin.MOVE_TO_RECYCLE_KEY,value);
		if (moveToRecycleButton!=null)
		{
			moveToRecycleButton.setSelection(value);
		}
	}
	
	public void disableMoveToRecycle() {
		setMoveToRecycle(false);
		toggleEnableMoveToRecycle(false);
	}
	
	public boolean getMoveToRecycle() {
		return moveToRecycle;
	}
} //  @jve:decl-index=0:visual-constraint="10,10"

[Jcommander-commit] incubator/matthias_kue/dialogs - New directory

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

Update of /cvsroot/jcommander/incubator/matthias_kue/dialogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27799/matthias_kue/dialogs

Log Message:
Directory /cvsroot/jcommander/incubator/matthias_kue/dialogs added to the repository

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

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

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

Modified Files:
	CompareAction.java 
Log Message:
Moved FileInput and the compare code to ComparePlugin

Index: CompareAction.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/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	5 Apr 2006 16:14:28 -0000	1.2
--- CompareAction.java	5 Apr 2006 21:36:11 -0000	1.3
***************
*** 4,40 ****
  package org.jcommander.ui.filepanel.actions;
  
- import java.io.File;
- import java.io.FileInputStream;
- import java.io.FileNotFoundException;
- 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;
- 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.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;
  
--- 4,15 ----
***************
*** 52,434 ****
  
  	}
- 
- //    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;
-     	
-     	//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 {
- 				if (file.getType()==FileType.FOLDER) {
- 					System.out.println(FOLDER_TYPE);
- 					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;
- 		}
- 
- 		/* (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;
- 		}
- 
- 		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");
- 				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
- 				e.printStackTrace();
- 			} catch (IOException e) {
- 				// TODO Auto-generated catch block
- 				e.printStackTrace();
- 			}
- 		}
- 
- 		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;
- 		}
-  
-     
-     }
  	
  	/* (non-Javadoc)
--- 27,30 ----
***************
*** 496,562 ****
  		}
  		
! 		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() {
! 			
! 				/* (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);
! 	        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");
--- 92,97 ----
  		}
  		
! 		if(!error) {
! 			ComparePlugin.getDefault().compare(leftFile, rightFile);
  		} else {
  			MessageDisplayer.setStatusErrorMessage("Could not find suitable selections for performing diff");

[Jcommander-commit] plugins/org.jcommander.ui.compare/src/org/jcommander/compare ComparePlugin.java,1.1,1.2

[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-serv24918/src/org/jcommander/compare

Modified Files:
	ComparePlugin.java 
Log Message:
Moved FileInput and the compare code to ComparePlugin

Index: ComparePlugin.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.compare/src/org/jcommander/compare/ComparePlugin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ComparePlugin.java	28 Mar 2006 13:54:49 -0000	1.1
--- ComparePlugin.java	5 Apr 2006 21:36:02 -0000	1.2
***************
*** 1,5 ****
--- 1,8 ----
  package org.jcommander.compare;
  
+ import java.io.IOException;
  import java.io.InputStream;
+ import java.io.OutputStream;
+ import java.lang.reflect.InvocationTargetException;
  
  import org.eclipse.swt.graphics.Image;
***************
*** 10,17 ****
--- 13,27 ----
  import org.eclipse.ui.WorkbenchException;
  import org.eclipse.ui.plugin.*;
+ import org.eclipse.compare.CompareConfiguration;
+ import org.eclipse.compare.CompareEditorInput;
+ import org.eclipse.compare.CompareUI;
+ import org.eclipse.compare.IEditableContent;
  import org.eclipse.compare.IStreamContentAccessor;
  import org.eclipse.compare.ITypedElement;
+ import org.eclipse.compare.structuremergeviewer.DiffNode;
+ 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.resource.ImageDescriptor;
  import org.jcommander.ui.utils.EclipseBroker;
***************
*** 36,40 ****
  	 * eclipse comparefunctions are able to use.
  	 */
!     private static class FileInput implements IStructureComparator, ITypedElement, IStreamContentAccessor {
  
      	/**
--- 46,51 ----
  	 * eclipse comparefunctions are able to use.
  	 */
!     private static class FileInput implements IStructureComparator, 
!     	ITypedElement, IStreamContentAccessor, IEditableContent {
  
      	/**
***************
*** 156,163 ****
  		 */
  		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
--- 167,181 ----
  		 */
  		public String getType() {
  			try {
! 				if (file.getType()==FileType.FOLDER) {
! 					System.out.println(FOLDER_TYPE);
! 					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
***************
*** 171,175 ****
  		 */
  		public InputStream getContents() throws CoreException {
- 			// TODO Auto-generated method stub
  			try {
  				if (file.getType()==FileType.FOLDER) return null;
--- 189,192 ----
***************
*** 181,184 ****
--- 198,268 ----
  			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");
+ 				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
+ 				e.printStackTrace();
+ 			} catch (IOException e) {
+ 				// TODO Auto-generated catch block
+ 				e.printStackTrace();
+ 			}
+ 		}
+ 
+ 		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;
+ 		}
   
      
***************
*** 228,239 ****
  	
  	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");
  	}
  }
--- 312,377 ----
  	
  	public void compare(FileObject left, FileObject right){
+ 
  		try {
  			IWorkbenchPage page = PlatformUI.getWorkbench().showPerspective(COMPARE_PERSPECTIVE_ID, EclipseBroker.getWorkbenchWindow());
! 			} catch (WorkbenchException e) {
! 				// TODO Auto-generated catch block
! 				e.printStackTrace();
! 			}
! 			
! 			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);
! 			final FileObject fLeftFile=left;
! 			final FileObject fRightFile=right;
! 	        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);
  	}
  }

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls DirectoryTreeManager.java,1.8,1.9

[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-serv29305/src/org/jcommander/ui/filepanel/controls

Modified Files:
	DirectoryTreeManager.java 
Log Message:
Fixed bug [ 1465312 ] Display user friendly VFS URLs

Index: DirectoryTreeManager.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/DirectoryTreeManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DirectoryTreeManager.java	9 Jan 2006 01:08:31 -0000	1.8
--- DirectoryTreeManager.java	5 Apr 2006 20:57:01 -0000	1.9
***************
*** 105,108 ****
--- 105,110 ----
  				TreeItem rootItem = createTreeItem(directoryTree, currentParent);
  				
+ 				rootItem.setText(VfsManagerExtension.getDisplayablePath(currentParent));
+ 				
  				return rootItem;
  			}

[Jcommander-commit] plugins/org.jcommander.ui.compare/META-INF MANIFEST.MF,1.1,1.2

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

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

Modified Files:
	MANIFEST.MF 
Log Message:
Exporting plugin packages

Index: MANIFEST.MF
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.compare/META-INF/MANIFEST.MF,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MANIFEST.MF	28 Mar 2006 13:54:49 -0000	1.1
--- MANIFEST.MF	5 Apr 2006 20:43:01 -0000	1.2
***************
*** 12,13 ****
--- 12,16 ----
   org.jcommander.ui.utils
  Eclipse-LazyStart: true
+ Export-Package: org.jcommander.compare,
+  org.jcommander.compare.perspective,
+  org.jcommander.compare.preferences

[Jcommander-commit] plugins/org.jcommander.ui.app plugin_customization.ini,1.7,1.8

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

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

Modified Files:
	plugin_customization.ini 
Log Message:
Added property for opening the perspectives in new windows. This property for now is commented because JCommander does not handle well multiple windows (see bug [ 1465320 ] Poor support for multiple windows).

Index: plugin_customization.ini
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.app/plugin_customization.ini,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** plugin_customization.ini	5 Jan 2006 22:08:40 -0000	1.7
--- plugin_customization.ini	5 Apr 2006 20:42:03 -0000	1.8
***************
*** 22,24 ****
  
  #Workbench preferences
! org.eclipse.ui.workbench/RUN_IN_BACKGROUND=true
\ No newline at end of file
--- 22,27 ----
  
  #Workbench preferences
! org.eclipse.ui.workbench/RUN_IN_BACKGROUND=true
! 
! #open perspectives in new windows
! #org.eclipse.ui.workbench/OPEN_PERSPECTIVE_MODE=2
\ No newline at end of file

[Jcommander-commit] plugins/org.jcommander.ui.app plugin.xml,1.94,1.95

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

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

Modified Files:
	plugin.xml 
Log Message:
Fixed the size of the progress bar and the text color of the progress messages while loading JCommander

Index: plugin.xml
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.app/plugin.xml,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** plugin.xml	28 Mar 2006 17:16:34 -0000	1.94
--- plugin.xml	5 Apr 2006 20:37:38 -0000	1.95
***************
*** 61,64 ****
--- 61,73 ----
             name="aboutText"
             value="JCommander - The Next Generation File Manager

Version: 0.7.1
Product Home Page: http://jcommander.sourceforge.net/

This product is distributed freely under the Eclipse Public License 1.0.
http://www.opensource.org/licenses/eclipse-1.0.php


The Team

Lead Developers:
- Robert Enyedi (Founder)
- Marius Hanganu (Founder)

Developers:
- Michael Smith
- Michael Borodkin

Graphical Design: Adrian Chromenko


Credits:

JCommander is built on top of the Eclipse Rich Client Platform (RCP).
http://www.eclipse.org/rcp/

This product includes software developed by the Apache Software Foundation.
http://www.apache.org/"/>
+      <property
+            name="startupForegroundColor"
+            value="000000"/>
+      <property
+            name="startupMessageRect"
+            value="5,15,310,20"/>
+      <property
+            name="startupProgressRect"
+            value="5,3,310,10"/>
    </product>
  	</extension>

[Jcommander-commit] plugins/org.jcommander jcommander.product,1.32,1.33

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

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

Modified Files:
	jcommander.product 
Log Message:
Fixed the size of the progress bar and the text color of the progress messages while loading JCommander

Index: jcommander.product
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander/jcommander.product,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** jcommander.product	19 Mar 2006 21:20:54 -0000	1.32
--- jcommander.product	5 Apr 2006 20:37:32 -0000	1.33
***************
*** 44,51 ****
     </launcherArgs>
  
!    <windowImages small="icons/small_icon.png" large="icons/small_icon.png,icons/large_icon.png,icons/extra_large_icon.png"/>
! 
!    <splash location="org.jcommander.ui.app"/>
  
     <launcher name="jcmd">
        <linux icon="/org.jcommander/icons/icon32.xpm"/>
--- 44,54 ----
     </launcherArgs>
  
!    <windowImages/>
  
+    <splash
+       location="org.jcommander.ui.app"
+       startupProgressRect="5,3,310,10"
+       startupMessageRect="5,15,310,20"
+       startupForegroundColor="000000" />
     <launcher name="jcmd">
        <linux icon="/org.jcommander/icons/icon32.xpm"/>
***************
*** 57,68 ****
--- 60,79 ----
     </launcher>
  
+    <intro introId="org.jcommander.ui.app.intro"/>
+ 
     <plugins>
        <plugin id="org.apache.ant"/>
        <plugin id="org.apache.commons"/>
+       <plugin id="org.apache.commons.vfs"/>
+       <plugin id="org.apache.commons.vfs.dependencies"/>
        <plugin id="org.apache.log4j"/>
        <plugin id="org.apache.lucene"/>
        <plugin id="org.eclipse.ant.core"/>
        <plugin id="org.eclipse.core.commands"/>
+       <plugin id="org.eclipse.core.contenttype"/>
        <plugin id="org.eclipse.core.expressions"/>
+       <plugin id="org.eclipse.core.filesystem"/>
+       <plugin id="org.eclipse.core.filesystem.win32.x86"/>
+       <plugin id="org.eclipse.core.jobs"/>
        <plugin id="org.eclipse.core.resources"/>
        <plugin id="org.eclipse.core.resources.compatibility"/>
***************
*** 70,74 ****
--- 81,89 ----
        <plugin id="org.eclipse.core.runtime"/>
        <plugin id="org.eclipse.core.runtime.compatibility"/>
+       <plugin id="org.eclipse.core.runtime.compatibility.registry"/>
        <plugin id="org.eclipse.core.variables"/>
+       <plugin id="org.eclipse.equinox.common"/>
+       <plugin id="org.eclipse.equinox.preferences"/>
+       <plugin id="org.eclipse.equinox.registry"/>
        <plugin id="org.eclipse.help"/>
        <plugin id="org.eclipse.help.appserver"/>
***************
*** 86,91 ****
--- 101,108 ----
        <plugin id="org.eclipse.ui"/>
        <plugin id="org.eclipse.ui.forms"/>
+       <plugin id="org.eclipse.ui.intro"/>
        <plugin id="org.eclipse.ui.workbench"/>
        <plugin id="org.eclipse.ui.workbench.compatibility"/>
+       <plugin id="org.eclipse.ui.workbench.texteditor"/>
        <plugin id="org.eclipse.update.configurator"/>
        <plugin id="org.eclipse.update.core"/>
***************
*** 93,96 ****
--- 110,115 ----
        <plugin id="org.eclipse.update.scheduler"/>
        <plugin id="org.eclipse.update.ui"/>
+       <plugin id="org.jcommander.eclipsepatch.compare"/>
+       <plugin id="org.jcommander.eclipsepatch.progressview"/>
        <plugin id="org.jcommander.logger"/>
        <plugin id="org.jcommander.phileas.bookmarks"/>
***************
*** 107,120 ****
--- 126,148 ----
        <plugin id="org.jcommander.systemshell"/>
        <plugin id="org.jcommander.systemshell.win32"/>
+       <plugin id="org.jcommander.tools.nativemanager"/>
+       <plugin id="org.jcommander.tools.nativemanager.ui"/>
        <plugin id="org.jcommander.ui.app"/>
        <plugin id="org.jcommander.ui.app.iconpack.eclipse"/>
+       <plugin id="org.jcommander.ui.compare"/>
+       <plugin id="org.jcommander.ui.editor"/>
+       <plugin id="org.jcommander.ui.editor.iconpack.eclipse"/>
        <plugin id="org.jcommander.ui.externaltools"/>
        <plugin id="org.jcommander.ui.filepanel"/>
        <plugin id="org.jcommander.ui.filepanel.iconpack.eclipse"/>
+       <plugin id="org.jcommander.ui.fileviewer"/>
        <plugin id="org.jcommander.ui.findfiles"/>
        <plugin id="org.jcommander.ui.findfiles.iconpack.eclipse"/>
        <plugin id="org.jcommander.ui.help"/>
+       <plugin id="org.jcommander.ui.intro"/>
+       <plugin id="org.jcommander.ui.logger"/>
        <plugin id="org.jcommander.ui.utils"/>
        <plugin id="org.jcommander.update"/>
+       <plugin id="org.jcommander.vfsextensions"/>
        <plugin id="org.samba.jcifs"/>
     </plugins>

[Jcommander-commit] plugins/org.jcommander.ui.app/src/org/jcommander/ui/app/config Configuration.java,1.13,1.14

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

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

Modified Files:
	Configuration.java 
Log Message:
Partial fix for bug [ 1463794 ] [win32] Cannot open tabs when home directory is the root

Index: Configuration.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app/config/Configuration.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Configuration.java	6 Dec 2005 15:23:33 -0000	1.13
--- Configuration.java	5 Apr 2006 20:35:16 -0000	1.14
***************
*** 36,40 ****
  	protected ConfigurationPanel defaultRightpanel;
  
! 	protected String defaultLocation = "file://" + System.getProperty("user.home");
  
  	/** Default constructor for Java bean */
--- 36,40 ----
  	protected ConfigurationPanel defaultRightpanel;
  
! 	protected String defaultLocation = "file:/" + System.getProperty("user.home") + '/';
  
  	/** Default constructor for Java bean */
***************
*** 48,57 ****
  		if (instance == null) {
  			instance = new Configuration();
- 			instance.initializeDefaultConfiguration();
  			
  			if (new File(DEFAULT_CONFIG_FILE_PATH).exists()) {
  				instance = load(DEFAULT_CONFIG_FILE_PATH);
  			}
  		}
  		return instance;
  	}
--- 48,59 ----
  		if (instance == null) {
  			instance = new Configuration();
  			
  			if (new File(DEFAULT_CONFIG_FILE_PATH).exists()) {
  				instance = load(DEFAULT_CONFIG_FILE_PATH);
  			}
+ 			
+ 			instance.initializeDefaultConfiguration();
  		}
+ 		
  		return instance;
  	}

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

[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-serv13666/src/org/jcommander/vfsextensions

Modified Files:
	VfsManagerExtension.java 
Log Message:
Fixed bug [ 1465312 ] Display user friendly VFS URLs

Index: VfsManagerExtension.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.vfsextensions/src/org/jcommander/vfsextensions/VfsManagerExtension.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** VfsManagerExtension.java	28 Mar 2006 08:23:50 -0000	1.18
--- VfsManagerExtension.java	5 Apr 2006 20:34:43 -0000	1.19
***************
*** 2,5 ****
--- 2,6 ----
  
  import java.io.File;
+ import java.util.regex.*;
  
  import org.apache.commons.vfs.*;
***************
*** 7,10 ****
--- 8,12 ----
  import org.apache.commons.vfs.provider.sftp.SftpFileSystemConfigBuilder;
  import org.apache.commons.vfs.provider.smb.*;
+ import org.eclipse.core.runtime.*;
  import org.jcommander.vfsextensions.copy.*;
  import org.jcommander.vfsextensions.listener.*;
***************
*** 13,16 ****
--- 15,19 ----
  public class VfsManagerExtension {
  	
+ 	protected static final String LOCAL_FILE_URI = "file:/";
  	protected static VfsManagerExtension instance;
  	protected FileSystemManager fileSystemManager;
***************
*** 236,238 ****
--- 239,281 ----
  		return fileName.getRootURI() + fileName.getPath();
  	}
+ 	
+ 	/**
+ 	 * This method makes a Commons VFS URL safe and more readable.
+ 	 * Passwords are cleared as well as local file name prefixes (file:///).
+ 	 * Note that the resulting string might not be a valid VFS URL.
+ 	 * 
+ 	 * TODO Improve the algorithm.
+ 	 * 
+ 	 * @param file
+ 	 * @return The processed file path.
+ 	 */
+ 	public static String getDisplayablePath(FileObject file) {
+ 		String path = getFullPath(file);
+ 		boolean localFile = false;
+ 		
+ 		/* Clean up local file prefixes */
+ 		if(path.startsWith(LOCAL_FILE_URI)) {
+ 			path = path.substring(LOCAL_FILE_URI.length());
+ 			localFile = true;
+ 		}
+ 		
+ 		while(path.startsWith("/")) {
+ 			path = path.substring(1);
+ 		}
+ 		
+ 		/* Remove passwords */
+ 		path = path.replaceAll(":([^@:]*)@", "@");
+ 		
+ 		/* Remove duplicate path separators */
+ 		if(localFile) {
+ 			path = path.replaceAll("//", "/");
+ 		}
+ 		
+ 		/* Make directory separators uniform */
+ 		if(localFile && Platform.getOS().equals(Platform.OS_WIN32)) {
+ 			path = path.replaceAll("/", "\\\\");
+ 		}
+ 		
+ 		return path;
+ 	}
  }

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls FilePanel.java,1.60,1.61 FilePanelMediator.java,1.47,1.48

[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-serv13529/src/org/jcommander/ui/filepanel/controls

Modified Files:
	FilePanel.java FilePanelMediator.java 
Log Message:
Fixed bug [ 1465312 ] Display user friendly VFS URLs

Index: FilePanelMediator.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FilePanelMediator.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** FilePanelMediator.java	28 Mar 2006 07:55:26 -0000	1.47
--- FilePanelMediator.java	5 Apr 2006 20:34:31 -0000	1.48
***************
*** 129,133 ****
  			
  			getTabMediator().updateCaption();
! 			currentDirectoryLabel.setText(currentFile.toString());
  			
  		} else {
--- 129,133 ----
  			
  			getTabMediator().updateCaption();
! 			currentDirectoryLabel.setText(VfsManagerExtension.getDisplayablePath(currentFile));
  			
  		} else {

Index: FilePanel.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FilePanel.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** FilePanel.java	20 Mar 2006 12:12:28 -0000	1.60
--- FilePanel.java	5 Apr 2006 20:34:31 -0000	1.61
***************
*** 462,467 ****
  		});
  		
  		
- 		currentDirectoryLabel.setText(model.getCurrentParent().getName().getRootURI() + model.getCurrentParent().getName().getPath());
  		currentDirectoryLabel.setLayoutData(gridData9);
  		currentDirectoryLabel.setBackground(org.eclipse.swt.widgets.Display.getDefault().getSystemColor(org.eclipse.swt.SWT.COLOR_TITLE_INACTIVE_BACKGROUND));
--- 462,467 ----
  		});
  		
+ 		currentDirectoryLabel.setText(VfsManagerExtension.getDisplayablePath(model.getCurrentParent()));
  		
  		currentDirectoryLabel.setLayoutData(gridData9);
  		currentDirectoryLabel.setBackground(org.eclipse.swt.widgets.Display.getDefault().getSystemColor(org.eclipse.swt.SWT.COLOR_TITLE_INACTIVE_BACKGROUND));
***************
*** 480,483 ****
--- 480,484 ----
  		
  	}
+ 	
  	/**
  	 * This method initializes composite	

[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel TabMediator.java,1.34,1.35

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

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

Modified Files:
	TabMediator.java 
Log Message:
Fixed bug [ 1465312 ] Display user friendly VFS URLs

Index: TabMediator.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/TabMediator.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** TabMediator.java	11 Feb 2006 13:52:43 -0000	1.34
--- TabMediator.java	5 Apr 2006 20:34:32 -0000	1.35
***************
*** 14,17 ****
--- 14,18 ----
  import org.jcommander.ui.filepanel.performers.*;
  import org.jcommander.ui.utils.*;
+ import org.jcommander.vfsextensions.*;
  
  /**
***************
*** 251,260 ****
  		// adjust directory names
  		if (leftCannonicalName.equals("")) {
! 			leftCannonicalName = leftModel.getCurrentParent().getName().getRootURI() + leftModel.getCurrentParent().getName().getPath();
  		}
  
  		if (rightCannonicalName.equals("")) {
! 			rightCannonicalName = rightModel.getCurrentParent().getName().getRootURI() 
! 									+ rightModel.getCurrentParent().getName().getPath();
  		}
  
--- 252,260 ----
  		// adjust directory names
  		if (leftCannonicalName.equals("")) {
! 			leftCannonicalName = VfsManagerExtension.getDisplayablePath(leftModel.getCurrentParent());
  		}
  
  		if (rightCannonicalName.equals("")) {
! 			rightCannonicalName = VfsManagerExtension.getDisplayablePath(rightModel.getCurrentParent());
  		}
  

[Jcommander-commit] plugins/org.jcommander.eclipsepatch.compare/META-INF MANIFEST.MF,1.2,1.3

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

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

Modified Files:
	MANIFEST.MF 
Log Message:
Fixes for upgrade to 3.2 M6

Index: MANIFEST.MF
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/META-INF/MANIFEST.MF,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MANIFEST.MF	5 Apr 2006 16:12:49 -0000	1.2
--- MANIFEST.MF	5 Apr 2006 19:53:14 -0000	1.3
***************
*** 3,7 ****
  Bundle-Name: %pluginName
  Bundle-SymbolicName: org.jcommander.eclipsepatch.compare;singleton:=true
! Bundle-Version: 3.2.0.qualifier
  Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin
  Bundle-Vendor: %providerName
--- 3,7 ----
  Bundle-Name: %pluginName
  Bundle-SymbolicName: org.jcommander.eclipsepatch.compare;singleton:=true
! Bundle-Version: 3.2.0
  Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin
  Bundle-Vendor: %providerName

[Jcommander-commit] plugins/org.jcommander.eclipseplatform feature.xml,1.18,1.19

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

Update of /cvsroot/jcommander/plugins/org.jcommander.eclipseplatform
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14385

Modified Files:
	feature.xml 
Log Message:
Fixes for upgrade to 3.2 M6

Index: feature.xml
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipseplatform/feature.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** feature.xml	28 Mar 2006 17:16:44 -0000	1.18
--- feature.xml	5 Apr 2006 19:53:07 -0000	1.19
***************
*** 51,55 ****
           download-size="0"
           install-size="0"
!          version="1.4.103.v20051212"/>
  
     <plugin
--- 51,55 ----
           download-size="0"
           install-size="0"
!          version="1.4.103.v20060320"/>
  
     <plugin
***************
*** 64,68 ****
           download-size="0"
           install-size="0"
!          version="3.1.0.v20060123"
           unpack="false"/>
  
--- 64,68 ----
           download-size="0"
           install-size="0"
!          version="3.1.100.v20060313"
           unpack="false"/>
  
***************
*** 71,75 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060212"
           unpack="false"/>
  
--- 71,75 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060328"
           unpack="false"/>
  
***************
*** 78,82 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060212"/>
  
     <plugin
--- 78,82 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060327a"/>
  
     <plugin
***************
*** 84,88 ****
           download-size="0"
           install-size="0"
!          version="4.1.130.v20060212"/>
  
     <plugin
--- 84,88 ----
           download-size="0"
           install-size="0"
!          version="4.1.130.v20060303"/>
  
     <plugin
***************
*** 90,94 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060212b"
           unpack="false"/>
  
--- 90,94 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060315"
           unpack="false"/>
  
***************
*** 114,118 ****
           download-size="0"
           install-size="0"
!          version="3.1.100.v20051212"
           unpack="false"/>
  
--- 114,118 ----
           download-size="0"
           install-size="0"
!          version="3.1.100.v20060223"
           unpack="false"/>
  
***************
*** 121,125 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060123"
           fragment="true"
           unpack="false"/>
--- 121,125 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060313"
           fragment="true"
           unpack="false"/>
***************
*** 139,143 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060213"
           unpack="false"/>
  
--- 139,143 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060327"
           unpack="false"/>
  
***************
*** 146,150 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060214"
           unpack="false"/>
  
--- 146,150 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060328"
           unpack="false"/>
  
***************
*** 153,157 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060215-1200"
           unpack="false"/>
  
--- 153,157 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060329-1600"
           unpack="false"/>
  
***************
*** 160,164 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060215-1200"
           unpack="false"/>
  
--- 160,164 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060329-1600"
           unpack="false"/>
  
***************
*** 167,171 ****
           download-size="0"
           install-size="0"
!          version="3.1.100.v20051215a"
           unpack="false"/>
  
--- 167,171 ----
           download-size="0"
           install-size="0"
!          version="3.1.100.v20060329a"
           unpack="false"/>
  
***************
*** 174,178 ****
           download-size="0"
           install-size="0"
!          version="3.1.100.v20051215"
           unpack="false"/>
  
--- 174,178 ----
           download-size="0"
           install-size="0"
!          version="3.1.100.v20060329"
           unpack="false"/>
  
***************
*** 181,185 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060212"
           unpack="false"/>
  
--- 181,185 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060327a"
           unpack="false"/>
  
***************
*** 201,205 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060214"
           unpack="false"/>
  
--- 201,205 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060328"
           unpack="false"/>
  
***************
*** 208,212 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060223_M5a"
           unpack="false"/>
  
--- 208,212 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060327"
           unpack="false"/>
  
***************
*** 215,219 ****
           download-size="0"
           install-size="0"
!          version="1.0.0.v20060206"
           unpack="false"/>
  
--- 215,219 ----
           download-size="0"
           install-size="0"
!          version="1.0.0.v20060317"
           unpack="false"/>
  
***************
*** 279,283 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060216-0800"
           unpack="false"/>
  
--- 279,283 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060329-1600"
           unpack="false"/>
  
***************
*** 286,290 ****
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060215a"
           unpack="false"/>
  
--- 286,290 ----
           download-size="0"
           install-size="0"
!          version="3.2.0.v20060327"
           unpack="false"/>
  

[Jcommander-commit] plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal OverlayPreferenceStore.java,1.1,1.2 ReplaceWithEditionAction.properties,1.1,1.2 BufferedCanvas.java,1.1,1.2 BinaryCompareViewerResources.properties,1.1,1.2 CompareFilter.java,1.1,1.2 ImageCanvas.java,1.1,1.2 INavigatable.java,1.1,1.2 AbstractViewer.java,1.1,1.2 AddFromHistoryDialog.java,1.1,1.2 CompareEditor.java,1.1,1.2 StructureCreatorDescriptor.java,1.1,1.2 CompareWithEditionAction.java,1.1,1.2 BinaryCompareViewer.java,1.1,1.2 ImageMergeViewerResources.properties,1.1,1.2 CompareDialog.java,1.1,1.2 ImageMergeViewer.java,1.1,1.2 AddFromHistoryAction.java,1.1,1.2 DiffImage.java,1.1,1.2 ExceptionHandler.java,1.1,1.2 CompareNavigator.java,1.1,1.2 TextViewerCreator.java,1.1,1.2 ViewerSwitchingCancelled.java,1.1,1.2 DocumentManager.java,1.1,1.2 IViewerDescriptor.java,1.1,1.2 ListDialog.java,1.1,1.2 AddFromHistoryAction.properties,1.1,1.2 CompareMessages.properties,1.1,1.2 MergeSourceViewer.java,1.1,1.2 TextMergeViewerCreator.java,1.1,1.2 BaseCompareAction.java,1.1,1.2 MergeViewerAction.java,1.1,1.2 TokenComparator.java,1.1,1.2 IOpenable.java,1.1,1.2 NullViewer.java,1.1,1.2 CompareOutlinePage.java,1.1,1.2 CompareAction.java,1.1,1.2 EditionAction.java,1.1,1.2 ReplaceWithPreviousEditionAction.java,1.1,1.2 ResourceCompareInput.java,1.1,1.2 SimpleTextViewer.java,1.1,1.2 ShowPseudoConflicts.java,1.1,1.2 ResizableDialog.java,1.1,1.2 StreamMergerDescriptor.java,1.1,1.2 ReplaceWithEditionAction.java,1.1,1.2 ChangePropertyAction.java,1.1,1.2 IgnoreWhiteSpaceAction.java,1.1,1.2 CompareUIPlugin.java,1.1,1.2 CompareWithEditionAction.properties,1.1,1.2 ISavable.java,1.1,1.2 MergeViewerContentProvider.java,1.1,1.2 TabFolderLayout.java,1.1,1.2 ImageMergeViewerCreator.java,1.1,1.2 ListContentProvider.java,1.1,1.2 DocLineComparator.java,1.1,1.2 Utilities.java,1.1,1.2 ViewerDescriptor.java,1.1,1.2 ComparePreferencePage.java,1.1,1.2 BinaryCompareViewerCreator.java,1.1,1.2 CompareEditorContributor.java,1.1,1.2 BufferedResourceNode.java,1.1,1.2 ICompareContextIds.java,1.1,1.2

[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-serv13295/compare/org/eclipse/compare/internal

Modified Files:
	OverlayPreferenceStore.java 
	ReplaceWithEditionAction.properties BufferedCanvas.java 
	BinaryCompareViewerResources.properties CompareFilter.java 
	ImageCanvas.java INavigatable.java AbstractViewer.java 
	AddFromHistoryDialog.java CompareEditor.java 
	StructureCreatorDescriptor.java CompareWithEditionAction.java 
	BinaryCompareViewer.java ImageMergeViewerResources.properties 
	CompareDialog.java ImageMergeViewer.java 
	AddFromHistoryAction.java DiffImage.java ExceptionHandler.java 
	CompareNavigator.java TextViewerCreator.java 
	ViewerSwitchingCancelled.java DocumentManager.java 
	IViewerDescriptor.java ListDialog.java 
	AddFromHistoryAction.properties CompareMessages.properties 
	MergeSourceViewer.java TextMergeViewerCreator.java 
	BaseCompareAction.java MergeViewerAction.java 
	TokenComparator.java IOpenable.java NullViewer.java 
	CompareOutlinePage.java CompareAction.java EditionAction.java 
	ReplaceWithPreviousEditionAction.java 
	ResourceCompareInput.java SimpleTextViewer.java 
	ShowPseudoConflicts.java ResizableDialog.java 
	StreamMergerDescriptor.java ReplaceWithEditionAction.java 
	ChangePropertyAction.java IgnoreWhiteSpaceAction.java 
	CompareUIPlugin.java CompareWithEditionAction.properties 
	ISavable.java MergeViewerContentProvider.java 
	TabFolderLayout.java ImageMergeViewerCreator.java 
	ListContentProvider.java DocLineComparator.java Utilities.java 
	ViewerDescriptor.java ComparePreferencePage.java 
	BinaryCompareViewerCreator.java CompareEditorContributor.java 
	BufferedResourceNode.java ICompareContextIds.java 
Log Message:
Updated to Eclipse 3.2 M6

Index: ICompareContextIds.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/ICompareContextIds.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ICompareContextIds.java	28 Mar 2006 13:49:15 -0000	1.1
--- ICompareContextIds.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2003 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: CompareNavigator.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/CompareNavigator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompareNavigator.java	28 Mar 2006 13:49:15 -0000	1.1
--- CompareNavigator.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: DiffImage.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/DiffImage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DiffImage.java	28 Mar 2006 13:49:15 -0000	1.1
--- DiffImage.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2003 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: ResourceCompareInput.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ResourceCompareInput.java	28 Mar 2006 13:49:15 -0000	1.1
--- ResourceCompareInput.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: TextViewerCreator.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/TextViewerCreator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TextViewerCreator.java	28 Mar 2006 13:49:15 -0000	1.1
--- TextViewerCreator.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2003 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: CompareUIPlugin.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompareUIPlugin.java	28 Mar 2006 13:49:15 -0000	1.1
--- CompareUIPlugin.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2006 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: MergeViewerAction.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/MergeViewerAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MergeViewerAction.java	28 Mar 2006 13:49:15 -0000	1.1
--- MergeViewerAction.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: ReplaceWithEditionAction.properties
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReplaceWithEditionAction.properties	28 Mar 2006 13:49:15 -0000	1.1
--- ReplaceWithEditionAction.properties	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  ###############################################################################
! # Copyright (c) 2000, 2004 IBM Corporation and others.
  # All rights reserved. This program and the accompanying materials
  # are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  ###############################################################################
! # Copyright (c) 2000, 2005 IBM Corporation and others.
  # All rights reserved. This program and the accompanying materials
  # are made available under the terms of the Eclipse Public License v1.0

Index: ComparePreferencePage.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ComparePreferencePage.java	28 Mar 2006 13:49:15 -0000	1.1
--- ComparePreferencePage.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: IOpenable.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/IOpenable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IOpenable.java	28 Mar 2006 13:49:15 -0000	1.1
--- IOpenable.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2003 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: ImageCanvas.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/ImageCanvas.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ImageCanvas.java	28 Mar 2006 13:49:15 -0000	1.1
--- ImageCanvas.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: BufferedResourceNode.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/BufferedResourceNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BufferedResourceNode.java	28 Mar 2006 13:49:15 -0000	1.1
--- BufferedResourceNode.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: ViewerSwitchingCancelled.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/ViewerSwitchingCancelled.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ViewerSwitchingCancelled.java	28 Mar 2006 13:49:15 -0000	1.1
--- ViewerSwitchingCancelled.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: ResizableDialog.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/ResizableDialog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ResizableDialog.java	28 Mar 2006 13:49:15 -0000	1.1
--- ResizableDialog.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: CompareEditorContributor.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompareEditorContributor.java	28 Mar 2006 13:49:15 -0000	1.1
--- CompareEditorContributor.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: OverlayPreferenceStore.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/OverlayPreferenceStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OverlayPreferenceStore.java	28 Mar 2006 13:49:15 -0000	1.1
--- OverlayPreferenceStore.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: ExceptionHandler.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/ExceptionHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExceptionHandler.java	28 Mar 2006 13:49:15 -0000	1.1
--- ExceptionHandler.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: EditionAction.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/EditionAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EditionAction.java	28 Mar 2006 13:49:15 -0000	1.1
--- EditionAction.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: StructureCreatorDescriptor.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/StructureCreatorDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StructureCreatorDescriptor.java	28 Mar 2006 13:49:15 -0000	1.1
--- StructureCreatorDescriptor.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2004, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: ViewerDescriptor.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/ViewerDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ViewerDescriptor.java	28 Mar 2006 13:49:15 -0000	1.1
--- ViewerDescriptor.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2003 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2006 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: DocumentManager.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/DocumentManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DocumentManager.java	28 Mar 2006 13:49:15 -0000	1.1
--- DocumentManager.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2003 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: SimpleTextViewer.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/SimpleTextViewer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SimpleTextViewer.java	28 Mar 2006 13:49:15 -0000	1.1
--- SimpleTextViewer.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2003 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: INavigatable.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/INavigatable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** INavigatable.java	28 Mar 2006 13:49:15 -0000	1.1
--- INavigatable.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: ReplaceWithEditionAction.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReplaceWithEditionAction.java	28 Mar 2006 13:49:15 -0000	1.1
--- ReplaceWithEditionAction.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2003 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: AbstractViewer.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/AbstractViewer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractViewer.java	28 Mar 2006 13:49:15 -0000	1.1
--- AbstractViewer.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: TabFolderLayout.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/TabFolderLayout.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TabFolderLayout.java	28 Mar 2006 13:49:15 -0000	1.1
--- TabFolderLayout.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2003 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: ISavable.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/ISavable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ISavable.java	28 Mar 2006 13:49:15 -0000	1.1
--- ISavable.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2003 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: ShowPseudoConflicts.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/ShowPseudoConflicts.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ShowPseudoConflicts.java	28 Mar 2006 13:49:15 -0000	1.1
--- ShowPseudoConflicts.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2003 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: TokenComparator.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/TokenComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TokenComparator.java	28 Mar 2006 13:49:15 -0000	1.1
--- TokenComparator.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: IViewerDescriptor.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/IViewerDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IViewerDescriptor.java	28 Mar 2006 13:49:15 -0000	1.1
--- IViewerDescriptor.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2003 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: AddFromHistoryAction.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AddFromHistoryAction.java	28 Mar 2006 13:49:15 -0000	1.1
--- AddFromHistoryAction.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: MergeViewerContentProvider.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MergeViewerContentProvider.java	28 Mar 2006 13:49:15 -0000	1.1
--- MergeViewerContentProvider.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: BinaryCompareViewer.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BinaryCompareViewer.java	28 Mar 2006 13:49:15 -0000	1.1
--- BinaryCompareViewer.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: BufferedCanvas.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/BufferedCanvas.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BufferedCanvas.java	28 Mar 2006 13:49:15 -0000	1.1
--- BufferedCanvas.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: ImageMergeViewer.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/ImageMergeViewer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ImageMergeViewer.java	28 Mar 2006 13:49:15 -0000	1.1
--- ImageMergeViewer.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: ImageMergeViewerResources.properties
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/ImageMergeViewerResources.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ImageMergeViewerResources.properties	28 Mar 2006 13:49:15 -0000	1.1
--- ImageMergeViewerResources.properties	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  ###############################################################################
! # Copyright (c) 2000, 2003 IBM Corporation and others.
  # All rights reserved. This program and the accompanying materials
  # are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  ###############################################################################
! # Copyright (c) 2000, 2005 IBM Corporation and others.
  # All rights reserved. This program and the accompanying materials
  # are made available under the terms of the Eclipse Public License v1.0

Index: DocLineComparator.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/DocLineComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DocLineComparator.java	28 Mar 2006 13:49:15 -0000	1.1
--- DocLineComparator.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: BinaryCompareViewerCreator.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/BinaryCompareViewerCreator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BinaryCompareViewerCreator.java	28 Mar 2006 13:49:15 -0000	1.1
--- BinaryCompareViewerCreator.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2003 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: BaseCompareAction.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/BaseCompareAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BaseCompareAction.java	28 Mar 2006 13:49:15 -0000	1.1
--- BaseCompareAction.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2003 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: BinaryCompareViewerResources.properties
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/BinaryCompareViewerResources.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BinaryCompareViewerResources.properties	28 Mar 2006 13:49:15 -0000	1.1
--- BinaryCompareViewerResources.properties	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  ###############################################################################
! # Copyright (c) 2000, 2003 IBM Corporation and others.
  # All rights reserved. This program and the accompanying materials
  # are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  ###############################################################################
! # Copyright (c) 2000, 2005 IBM Corporation and others.
  # All rights reserved. This program and the accompanying materials
  # are made available under the terms of the Eclipse Public License v1.0

Index: CompareOutlinePage.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/CompareOutlinePage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompareOutlinePage.java	28 Mar 2006 13:49:15 -0000	1.1
--- CompareOutlinePage.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2006 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: CompareMessages.properties
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/CompareMessages.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompareMessages.properties	28 Mar 2006 13:49:15 -0000	1.1
--- CompareMessages.properties	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  ###############################################################################
! # Copyright (c) 2000, 2004 IBM Corporation and others.
  # All rights reserved. This program and the accompanying materials
  # are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  ###############################################################################
! # Copyright (c) 2000, 2005 IBM Corporation and others.
  # All rights reserved. This program and the accompanying materials
  # are made available under the terms of the Eclipse Public License v1.0

Index: ChangePropertyAction.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/ChangePropertyAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ChangePropertyAction.java	28 Mar 2006 13:49:15 -0000	1.1
--- ChangePropertyAction.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2003 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: IgnoreWhiteSpaceAction.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/IgnoreWhiteSpaceAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IgnoreWhiteSpaceAction.java	28 Mar 2006 13:49:15 -0000	1.1
--- IgnoreWhiteSpaceAction.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2003 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: AddFromHistoryDialog.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AddFromHistoryDialog.java	28 Mar 2006 13:49:15 -0000	1.1
--- AddFromHistoryDialog.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: CompareFilter.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/CompareFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompareFilter.java	28 Mar 2006 13:49:15 -0000	1.1
--- CompareFilter.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: TextMergeViewerCreator.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/TextMergeViewerCreator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TextMergeViewerCreator.java	28 Mar 2006 13:49:15 -0000	1.1
--- TextMergeViewerCreator.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2003 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: StreamMergerDescriptor.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/StreamMergerDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StreamMergerDescriptor.java	28 Mar 2006 13:49:15 -0000	1.1
--- StreamMergerDescriptor.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2004, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: CompareWithEditionAction.properties
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompareWithEditionAction.properties	28 Mar 2006 13:49:15 -0000	1.1
--- CompareWithEditionAction.properties	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  ###############################################################################
! # Copyright (c) 2000, 2003 IBM Corporation and others.
  # All rights reserved. This program and the accompanying materials
  # are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  ###############################################################################
! # Copyright (c) 2000, 2005 IBM Corporation and others.
  # All rights reserved. This program and the accompanying materials
  # are made available under the terms of the Eclipse Public License v1.0

Index: Utilities.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/Utilities.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Utilities.java	28 Mar 2006 13:49:15 -0000	1.1
--- Utilities.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2006 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
***************
*** 345,349 ****
  				CompareUIPlugin.log(x);
  			} catch (MissingResourceException x) {
! 				CompareUIPlugin.log(x);
  			}
  		}
--- 345,349 ----
  				CompareUIPlugin.log(x);
  			} catch (MissingResourceException x) {
! 				// silently ignore Exception
  			}
  		}

Index: ImageMergeViewerCreator.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/ImageMergeViewerCreator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ImageMergeViewerCreator.java	28 Mar 2006 13:49:15 -0000	1.1
--- ImageMergeViewerCreator.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2003 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: ReplaceWithPreviousEditionAction.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/ReplaceWithPreviousEditionAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReplaceWithPreviousEditionAction.java	28 Mar 2006 13:49:15 -0000	1.1
--- ReplaceWithPreviousEditionAction.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2003 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: ListContentProvider.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/ListContentProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ListContentProvider.java	28 Mar 2006 13:49:15 -0000	1.1
--- ListContentProvider.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: CompareWithEditionAction.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompareWithEditionAction.java	28 Mar 2006 13:49:15 -0000	1.1
--- CompareWithEditionAction.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2003 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: CompareEditor.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/CompareEditor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompareEditor.java	28 Mar 2006 13:49:15 -0000	1.1
--- CompareEditor.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2006 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
***************
*** 37,41 ****
   * Most functionality is delegated to the ICompareEditorInput.
   */
! public class CompareEditor extends EditorPart implements IReusableEditor, ISaveableModelSource, ISaveableModel {
  	
  	/**
--- 37,41 ----
   * Most functionality is delegated to the ICompareEditorInput.
   */
! public class CompareEditor extends EditorPart implements IReusableEditor, ISaveablesSource {
  	
  	/**
***************
*** 60,64 ****
  	/** the outline page */
  	private CompareOutlinePage fOutlinePage;
! 	/** enable outline */
  	
  	
--- 60,65 ----
  	/** the outline page */
  	private CompareOutlinePage fOutlinePage;
! 
! 	private CompareSaveable fSaveable;
  	
  	
***************
*** 259,267 ****
  	public boolean isDirty() {
  		IEditorInput input= getEditorInput();
! 		if (input instanceof ISaveableModelSource) {
! 			ISaveableModelSource sms = (ISaveableModelSource) input;
! 			ISaveableModel[] models = sms.getModels();
! 			for (int i = 0; i < models.length; i++) {
! 				ISaveableModel model = models[i];
  				if (model.isDirty())
  					return true;
--- 260,268 ----
  	public boolean isDirty() {
  		IEditorInput input= getEditorInput();
! 		if (input instanceof ISaveablesSource) {
! 			ISaveablesSource sms= (ISavea...
 
[truncated message content]

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

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

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

Modified Files:
	CompareAction.java 
Log Message:
Updated to Eclipse 3.2 M6

Index: CompareAction.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/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	28 Mar 2006 17:16:40 -0000	1.1
--- CompareAction.java	5 Apr 2006 16:14:28 -0000	1.2
***************
*** 331,334 ****
--- 331,335 ----
  			try {
  				if (file.getType()==FileType.FOLDER) {
+ 					System.out.println(FOLDER_TYPE);
  					return FOLDER_TYPE;
  				} else {

[Jcommander-commit] plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare ResourceNode.java,1.1,1.2 CompareEditorInput.java,1.1,1.2 IPropertyChangeNotifier.java,1.1,1.2 IContentChangeNotifier.java,1.1,1.2 IModificationDate.java,1.1,1.2 CompareViewerSwitchingPane.java,1.1,1.2 Splitter.java,1.1,1.2 ICompareNavigator.java,1.1,1.2 IStreamContentAccessor.java,1.1,1.2 BufferedContent.java,1.1,1.2 ITypedElement.java,1.1,1.2 IEncodedStreamContentAccessor.java,1.1,1.2 CompareViewerPane.java,1.1,1.2 EditionSelectionDialog.java,1.1,1.2 NavigationAction.java,1.1,1.2 IContentChangeListener.java,1.1,1.2 IStreamMerger.java,1.1,1.2 CompareConfiguration.java,1.1,1.2 HistoryItem.java,1.1,1.2 IViewerCreator.java,1.1,1.2

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

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

Modified Files:
	ResourceNode.java CompareEditorInput.java 
	IPropertyChangeNotifier.java IContentChangeNotifier.java 
	IModificationDate.java CompareViewerSwitchingPane.java 
	Splitter.java ICompareNavigator.java 
	IStreamContentAccessor.java BufferedContent.java 
	ITypedElement.java IEncodedStreamContentAccessor.java 
	CompareViewerPane.java EditionSelectionDialog.java 
	NavigationAction.java IContentChangeListener.java 
	IStreamMerger.java CompareConfiguration.java HistoryItem.java 
	IViewerCreator.java 
Log Message:
Updated to Eclipse 3.2 M6

Index: IContentChangeListener.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/IContentChangeListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IContentChangeListener.java	28 Mar 2006 13:49:15 -0000	1.1
--- IContentChangeListener.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: IPropertyChangeNotifier.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/IPropertyChangeNotifier.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IPropertyChangeNotifier.java	28 Mar 2006 13:49:15 -0000	1.1
--- IPropertyChangeNotifier.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: IModificationDate.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/IModificationDate.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IModificationDate.java	28 Mar 2006 13:49:15 -0000	1.1
--- IModificationDate.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: IStreamContentAccessor.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/IStreamContentAccessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IStreamContentAccessor.java	28 Mar 2006 13:49:15 -0000	1.1
--- IStreamContentAccessor.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: Splitter.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/Splitter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Splitter.java	28 Mar 2006 13:49:15 -0000	1.1
--- Splitter.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: EditionSelectionDialog.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/EditionSelectionDialog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EditionSelectionDialog.java	28 Mar 2006 13:49:15 -0000	1.1
--- EditionSelectionDialog.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2006 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: CompareViewerPane.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/CompareViewerPane.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompareViewerPane.java	28 Mar 2006 13:49:15 -0000	1.1
--- CompareViewerPane.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2006 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: ICompareNavigator.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/ICompareNavigator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ICompareNavigator.java	28 Mar 2006 13:49:15 -0000	1.1
--- ICompareNavigator.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2003, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2003, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: ResourceNode.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/ResourceNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ResourceNode.java	28 Mar 2006 13:49:15 -0000	1.1
--- ResourceNode.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: CompareConfiguration.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/CompareConfiguration.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompareConfiguration.java	28 Mar 2006 13:49:15 -0000	1.1
--- CompareConfiguration.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2006 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: HistoryItem.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/HistoryItem.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HistoryItem.java	28 Mar 2006 13:49:15 -0000	1.1
--- HistoryItem.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: ITypedElement.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/ITypedElement.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ITypedElement.java	28 Mar 2006 13:49:15 -0000	1.1
--- ITypedElement.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: IStreamMerger.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/IStreamMerger.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IStreamMerger.java	28 Mar 2006 13:49:15 -0000	1.1
--- IStreamMerger.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2004, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: IViewerCreator.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/IViewerCreator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IViewerCreator.java	28 Mar 2006 13:49:15 -0000	1.1
--- IViewerCreator.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: CompareViewerSwitchingPane.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompareViewerSwitchingPane.java	28 Mar 2006 13:49:15 -0000	1.1
--- CompareViewerSwitchingPane.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2006 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: IEncodedStreamContentAccessor.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/IEncodedStreamContentAccessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IEncodedStreamContentAccessor.java	28 Mar 2006 13:49:15 -0000	1.1
--- IEncodedStreamContentAccessor.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: NavigationAction.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/NavigationAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NavigationAction.java	28 Mar 2006 13:49:15 -0000	1.1
--- NavigationAction.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: IContentChangeNotifier.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/IContentChangeNotifier.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IContentChangeNotifier.java	28 Mar 2006 13:49:15 -0000	1.1
--- IContentChangeNotifier.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: BufferedContent.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/BufferedContent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BufferedContent.java	28 Mar 2006 13:49:15 -0000	1.1
--- BufferedContent.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2006 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: CompareEditorInput.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/CompareEditorInput.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompareEditorInput.java	28 Mar 2006 13:49:15 -0000	1.1
--- CompareEditorInput.java	5 Apr 2006 16:12:45 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2006 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
***************
*** 89,93 ****
   * top left pane, method <code>createDiffViewer</code> can be overridden.
   * <p>
!  * If subclasses of this class implement {@link ISaveableModelSource}, the compare editor will
   * pass these models through to the workbench. The editor will still show the dirty indicator 
   * if one of these underlying models is dirty. It is the reponsibility of subclasses that
--- 89,93 ----
   * top left pane, method <code>createDiffViewer</code> can be overridden.
   * <p>
!  * If subclasses of this class implement {@link ISaveablesSource}, the compare editor will
   * pass these models through to the workbench. The editor will still show the dirty indicator 
   * if one of these underlying models is dirty. It is the reponsibility of subclasses that

[Jcommander-commit] plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/structuremergeviewer ICompareInputChangeListener.java,1.1,1.2 DiffNode.java,1.1,1.2 DiffTreeViewerResources.properties,1.1,1.2 StructureDiffViewer.java,1.1,1.2 DiffContainer.java,1.1,1.2 ICompareInput.java,1.1,1.2 IDiffElement.java,1.1,1.2 IStructureComparator.java,1.1,1.2 IStructureCreator.java,1.1,1.2 IDiffContainer.java,1.1,1.2 DiffElement.java,1.1,1.2

[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-serv13295/compare/org/eclipse/compare/structuremergeviewer

Modified Files:
	ICompareInputChangeListener.java DiffNode.java 
	DiffTreeViewerResources.properties StructureDiffViewer.java 
	DiffContainer.java ICompareInput.java IDiffElement.java 
	IStructureComparator.java IStructureCreator.java 
	IDiffContainer.java DiffElement.java 
Log Message:
Updated to Eclipse 3.2 M6

Index: ICompareInput.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/structuremergeviewer/ICompareInput.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ICompareInput.java	28 Mar 2006 13:49:15 -0000	1.1
--- ICompareInput.java	5 Apr 2006 16:12:46 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: DiffContainer.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/structuremergeviewer/DiffContainer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DiffContainer.java	28 Mar 2006 13:49:15 -0000	1.1
--- DiffContainer.java	5 Apr 2006 16:12:46 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: StructureDiffViewer.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StructureDiffViewer.java	28 Mar 2006 13:49:15 -0000	1.1
--- StructureDiffViewer.java	5 Apr 2006 16:12:46 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: DiffElement.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/structuremergeviewer/DiffElement.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DiffElement.java	28 Mar 2006 13:49:15 -0000	1.1
--- DiffElement.java	5 Apr 2006 16:12:46 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: IStructureComparator.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IStructureComparator.java	28 Mar 2006 13:49:15 -0000	1.1
--- IStructureComparator.java	5 Apr 2006 16:12:46 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: ICompareInputChangeListener.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/structuremergeviewer/ICompareInputChangeListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ICompareInputChangeListener.java	28 Mar 2006 13:49:15 -0000	1.1
--- ICompareInputChangeListener.java	5 Apr 2006 16:12:46 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: DiffTreeViewerResources.properties
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DiffTreeViewerResources.properties	28 Mar 2006 13:49:15 -0000	1.1
--- DiffTreeViewerResources.properties	5 Apr 2006 16:12:46 -0000	1.2
***************
*** 1,4 ****
  ###############################################################################
! # Copyright (c) 2000, 2004 IBM Corporation and others.
  # All rights reserved. This program and the accompanying materials
  # are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  ###############################################################################
! # Copyright (c) 2000, 2005 IBM Corporation and others.
  # All rights reserved. This program and the accompanying materials
  # are made available under the terms of the Eclipse Public License v1.0

Index: IStructureCreator.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IStructureCreator.java	28 Mar 2006 13:49:15 -0000	1.1
--- IStructureCreator.java	5 Apr 2006 16:12:46 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: IDiffContainer.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/structuremergeviewer/IDiffContainer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IDiffContainer.java	28 Mar 2006 13:49:15 -0000	1.1
--- IDiffContainer.java	5 Apr 2006 16:12:46 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: DiffNode.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DiffNode.java	28 Mar 2006 13:49:15 -0000	1.1
--- DiffNode.java	5 Apr 2006 16:12:46 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2006 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: IDiffElement.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/structuremergeviewer/IDiffElement.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IDiffElement.java	28 Mar 2006 13:49:15 -0000	1.1
--- IDiffElement.java	5 Apr 2006 16:12:46 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

[Jcommander-commit] plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/rangedifferencer LinkedRangeDifference.java,1.1,1.2 DifferencesIterator.java,1.1,1.2 IRangeComparator.java,1.1,1.2 RangeDifference.java,1.1,1.2

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

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

Modified Files:
	LinkedRangeDifference.java DifferencesIterator.java 
	IRangeComparator.java RangeDifference.java 
Log Message:
Updated to Eclipse 3.2 M6

Index: RangeDifference.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifference.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RangeDifference.java	28 Mar 2006 13:49:16 -0000	1.1
--- RangeDifference.java	5 Apr 2006 16:12:49 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: LinkedRangeDifference.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/rangedifferencer/LinkedRangeDifference.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LinkedRangeDifference.java	28 Mar 2006 13:49:16 -0000	1.1
--- LinkedRangeDifference.java	5 Apr 2006 16:12:49 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: DifferencesIterator.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/rangedifferencer/DifferencesIterator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DifferencesIterator.java	28 Mar 2006 13:49:16 -0000	1.1
--- DifferencesIterator.java	5 Apr 2006 16:12:49 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: IRangeComparator.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/rangedifferencer/IRangeComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IRangeComparator.java	28 Mar 2006 13:49:16 -0000	1.1
--- IRangeComparator.java	5 Apr 2006 16:12:49 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

[Jcommander-commit] plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/patch CompareWithPatchAction.java,1.1,1.2 PatchTargetPage.java,1.1,1.2 PatchErrorDialog.java,1.1,1.2 LineReader.java,1.1,1.2 PatchWizard.java,1.1,1.2

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

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

Modified Files:
	CompareWithPatchAction.java PatchTargetPage.java 
	PatchErrorDialog.java LineReader.java PatchWizard.java 
Log Message:
Updated to Eclipse 3.2 M6

Index: CompareWithPatchAction.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/patch/CompareWithPatchAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompareWithPatchAction.java	28 Mar 2006 13:49:15 -0000	1.1
--- CompareWithPatchAction.java	5 Apr 2006 16:12:49 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2006 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: PatchErrorDialog.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/patch/PatchErrorDialog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PatchErrorDialog.java	28 Mar 2006 13:49:15 -0000	1.1
--- PatchErrorDialog.java	5 Apr 2006 16:12:49 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: LineReader.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/patch/LineReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LineReader.java	28 Mar 2006 13:49:15 -0000	1.1
--- LineReader.java	5 Apr 2006 16:12:49 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: PatchTargetPage.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PatchTargetPage.java	28 Mar 2006 13:49:15 -0000	1.1
--- PatchTargetPage.java	5 Apr 2006 16:12:49 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2005, 2006 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: PatchWizard.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PatchWizard.java	28 Mar 2006 13:49:15 -0000	1.1
--- PatchWizard.java	5 Apr 2006 16:12:49 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2006 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

[Jcommander-commit] plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/contentmergeviewer IDocumentRange.java,1.1,1.2 ITokenComparator.java,1.1,1.2 IMergeViewerContentProvider.java,1.1,1.2 TextMergeViewer.java,1.1,1.2

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

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

Modified Files:
	IDocumentRange.java ITokenComparator.java 
	IMergeViewerContentProvider.java TextMergeViewer.java 
Log Message:
Updated to Eclipse 3.2 M6

Index: IMergeViewerContentProvider.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/contentmergeviewer/IMergeViewerContentProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IMergeViewerContentProvider.java	28 Mar 2006 13:49:15 -0000	1.1
--- IMergeViewerContentProvider.java	5 Apr 2006 16:12:49 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: TextMergeViewer.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TextMergeViewer.java	28 Mar 2006 13:49:15 -0000	1.1
--- TextMergeViewer.java	5 Apr 2006 16:12:49 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2006 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
***************
*** 9,12 ****
--- 9,13 ----
   *     IBM Corporation - initial API and implementation
   *     cha...@ma... - curved line code
+  *     gil...@fr... - fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=72995
   *******************************************************************************/
  package org.eclipse.compare.contentmergeviewer;
***************
*** 1666,1680 ****
  			mcp.setRightError(null);
  		}
  		
  		// set new documents
! 		setDocument(fLeft, 'L', left);
  		fLeftLineCount= fLeft.getLineCount();
! 		fLeftEncoding= getEncoding(left);
! 
! 		setDocument(fRight, 'R', right);
  		fRightLineCount= fRight.getLineCount();
- 		fRightEncoding= getEncoding(right);
  		
! 		setDocument(fAncestor, 'A', ancestor);
  		
  		updateHeader();
--- 1667,1691 ----
  			mcp.setRightError(null);
  		}
+ 
+ 		// Get encodings from streams. If an encoding is null, abide by the other one
+ 		// Defaults to workbench encoding only if both encodings are null
+ 		fLeftEncoding= getEncoding(left);
+ 		fRightEncoding= getEncoding(right);
+ 		if (fLeftEncoding == null && fRightEncoding == null) {
+ 			fLeftEncoding= fRightEncoding= ResourcesPlugin.getEncoding();
+ 		} else if (fLeftEncoding == null) {
+ 			fLeftEncoding= fRightEncoding;
+ 		} else if (fRightEncoding == null) {
+ 			fRightEncoding= fLeftEncoding;
+ 		}
  		
  		// set new documents
! 		setDocument(fLeft, 'L', left, fLeftEncoding);
  		fLeftLineCount= fLeft.getLineCount();
! 		
! 		setDocument(fRight, 'R', right, fRightEncoding);
  		fRightLineCount= fRight.getLineCount();
  		
! 		setDocument(fAncestor, 'A', ancestor, fLeftEncoding);
  		
  		updateHeader();
***************
*** 1733,1747 ****
  
  	private static String getEncoding(Object o) {
- 		String encoding= null;
  		if (o instanceof IEncodedStreamContentAccessor) {
  			try {
! 				encoding= ((IEncodedStreamContentAccessor)o).getCharset();
  			} catch (CoreException e) {
! 				// ignored
  			}
  		}
! 		if (encoding == null)
! 			encoding= ResourcesPlugin.getEncoding();
! 		return encoding;
  	}
  	
--- 1744,1755 ----
  
  	private static String getEncoding(Object o) {
  		if (o instanceof IEncodedStreamContentAccessor) {
  			try {
! 				return ((IEncodedStreamContentAccessor)o).getCharset();
  			} catch (CoreException e) {
! 				// silently ignored
  			}
  		}
! 		return null;
  	}
  	
***************
*** 1900,1904 ****
  	 * Returns true if a new Document could be installed.
  	 */
! 	private boolean setDocument(MergeSourceViewer tp, char type, Object o) {
  		
  		if (tp == null)
--- 1908,1912 ----
  	 * Returns true if a new Document could be installed.
  	 */
! 	private boolean setDocument(MergeSourceViewer tp, char type, Object o, String encoding) {
  		
  		if (tp == null)
***************
*** 1921,1927 ****
  				IStreamContentAccessor sca= (IStreamContentAccessor) o;
  				String s= null;
! 		
  				try {
! 					s= Utilities.readString(sca);
  				} catch (CoreException ex) {
  					setError(type, ex.getMessage());
--- 1929,1937 ----
  				IStreamContentAccessor sca= (IStreamContentAccessor) o;
  				String s= null;
! 				if (encoding == null)
! 					encoding= ResourcesPlugin.getEncoding();
! 
  				try {
! 					s= Utilities.readString(sca.getContents(), encoding);
  				} catch (CoreException ex) {
  					setError(type, ex.getMessage());

Index: IDocumentRange.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/contentmergeviewer/IDocumentRange.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IDocumentRange.java	28 Mar 2006 13:49:15 -0000	1.1
--- IDocumentRange.java	5 Apr 2006 16:12:49 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: ITokenComparator.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/contentmergeviewer/ITokenComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ITokenComparator.java	28 Mar 2006 13:49:15 -0000	1.1
--- ITokenComparator.java	5 Apr 2006 16:12:49 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2000, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

[Jcommander-commit] plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/merge TextStreamMerger.java,1.1,1.2 MergeMessages.properties,1.1,1.2 LineComparator.java,1.1,1.2

[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-serv13295/compare/org/eclipse/compare/internal/merge

Modified Files:
	TextStreamMerger.java MergeMessages.properties 
	LineComparator.java 
Log Message:
Updated to Eclipse 3.2 M6

Index: MergeMessages.properties
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/merge/MergeMessages.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MergeMessages.properties	28 Mar 2006 13:49:16 -0000	1.1
--- MergeMessages.properties	5 Apr 2006 16:12:49 -0000	1.2
***************
*** 1,4 ****
  ###############################################################################
! # Copyright (c) 2004 IBM Corporation and others.
  # All rights reserved. This program and the accompanying materials
  # are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  ###############################################################################
! # Copyright (c) 2004, 2005 IBM Corporation and others.
  # All rights reserved. This program and the accompanying materials
  # are made available under the terms of the Eclipse Public License v1.0

Index: TextStreamMerger.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TextStreamMerger.java	28 Mar 2006 13:49:16 -0000	1.1
--- TextStreamMerger.java	5 Apr 2006 16:12:49 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2003, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2003, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: LineComparator.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/merge/LineComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LineComparator.java	28 Mar 2006 13:49:16 -0000	1.1
--- LineComparator.java	5 Apr 2006 16:12:49 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2004, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

[Jcommander-commit] plugins/org.jcommander.eclipsepatch.compare .project,1.1,1.2 plugin.properties,1.1,1.2 build.properties,1.1,1.2 buildnotes_compare.html,1.1,1.2

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

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

Modified Files:
	.project plugin.properties build.properties 
	buildnotes_compare.html 
Log Message:
Updated to Eclipse 3.2 M6

Index: .project
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/.project,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** .project	28 Mar 2006 13:49:15 -0000	1.1
--- .project	5 Apr 2006 16:12:46 -0000	1.2
***************
*** 3,8 ****
  	<name>org.jcommander.eclipsepatch.compare</name>
  	<comment></comment>
! 	<projects>
! 	</projects>
  	<buildSpec>
  		<buildCommand>
--- 3,7 ----
  	<name>org.jcommander.eclipsepatch.compare</name>
  	<comment></comment>
! 	<projects></projects>
  	<buildSpec>
  		<buildCommand>

Index: plugin.properties
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/plugin.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** plugin.properties	28 Mar 2006 13:49:15 -0000	1.1
--- plugin.properties	5 Apr 2006 16:12:46 -0000	1.2
***************
*** 1,4 ****
  ###############################################################################
! # Copyright (c) 2000, 2004 IBM Corporation and others.
  # All rights reserved. This program and the accompanying materials
  # are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  ###############################################################################
! # Copyright (c) 2000, 2005 IBM Corporation and others.
  # All rights reserved. This program and the accompanying materials
  # are made available under the terms of the Eclipse Public License v1.0

Index: buildnotes_compare.html
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/buildnotes_compare.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** buildnotes_compare.html	28 Mar 2006 13:49:15 -0000	1.1
--- buildnotes_compare.html	5 Apr 2006 16:12:46 -0000	1.2
***************
*** 13,17 ****
  Compare</h1>
  
! Eclipse Build Input February 28th 2005
  <h2>Problem reports fixed</h2>
  <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=114108">114108</a>: [Patch] Apply patch does nothing if Finish is selected on first page<br>
--- 13,30 ----
  Compare</h1>
  
! Eclipse Build Input March 30th 2006
! <h2>Problem reports fixed</h2>
! <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=133989">133989</a>: React to rename of ISaveableModel<br>
! 
! <h1><hr WIDTH="100%"></h1>
! 
! Eclipse Build Input March 27th 2006
! <h2>Problem reports fixed</h2>
! <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=72995">72995</a>: When comparing with CVS we see a wrong encoding<br>
! <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=129763">129763</a>: MissingResourceException: Can't find resource for bundle<br>
! 
! <h1><hr WIDTH="100%"></h1>
! 
! Eclipse Build Input February 28th 2006
  <h2>Problem reports fixed</h2>
  <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=114108">114108</a>: [Patch] Apply patch does nothing if Finish is selected on first page<br>
***************
*** 20,24 ****
  <h1><hr WIDTH="100%"></h1>
  
! Eclipse Build Input February 28th 2005
  <h2>Problem reports fixed</h2>
  some artwork changed from *.gif to *.png<br>
--- 33,37 ----
  <h1><hr WIDTH="100%"></h1>
  
! Eclipse Build Input February 28th 2006
  <h2>Problem reports fixed</h2>
  some artwork changed from *.gif to *.png<br>
***************
*** 27,31 ****
  <h1><hr WIDTH="100%"></h1>
  
! Eclipse Build Input February 14th 2005
  <h2>Problem reports fixed</h2>
  <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=126685">126685</a>: org.eclipse.compare.internal.Utilities.java's internalGetResources() method does not take ResourceMapping into consideration<br>
--- 40,44 ----
  <h1><hr WIDTH="100%"></h1>
  
! Eclipse Build Input February 14th 2006
  <h2>Problem reports fixed</h2>
  <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=126685">126685</a>: org.eclipse.compare.internal.Utilities.java's internalGetResources() method does not take ResourceMapping into consideration<br>
***************
*** 33,37 ****
  <h1><hr WIDTH="100%"></h1>
  
! Eclipse Build Input February 7th 2005
  <h2>Problem reports fixed</h2>
  <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=126442">126442</a>: Leak: CompareViewerPane and created ToolBar<br>
--- 46,50 ----
  <h1><hr WIDTH="100%"></h1>
  
! Eclipse Build Input February 7th 2006
  <h2>Problem reports fixed</h2>
  <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=126442">126442</a>: Leak: CompareViewerPane and created ToolBar<br>
***************
*** 41,45 ****
  <h1><hr WIDTH="100%"></h1>
  
! Eclipse Build Input January 31th 2005
  <h2>Problem reports fixed</h2>
  <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=125379">125379</a>: CompareConfiguration uses ListenerList that has been removed<br>
--- 54,58 ----
  <h1><hr WIDTH="100%"></h1>
  
! Eclipse Build Input January 31th 2006
  <h2>Problem reports fixed</h2>
  <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=125379">125379</a>: CompareConfiguration uses ListenerList that has been removed<br>

Index: build.properties
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/build.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build.properties	28 Mar 2006 13:49:15 -0000	1.1
--- build.properties	5 Apr 2006 16:12:46 -0000	1.2
***************
*** 1,4 ****
  ###############################################################################
! # Copyright (c) 2000, 2004 IBM Corporation and others.
  # All rights reserved. This program and the accompanying materials
  # are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  ###############################################################################
! # Copyright (c) 2000, 2005 IBM Corporation and others.
  # All rights reserved. This program and the accompanying materials
  # are made available under the terms of the Eclipse Public License v1.0