Menu
▾
▴
[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
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] |
