|
From: Matthias K <mat...@us...> - 2006-03-28 13:49:20
|
Update of /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5127 Added Files: component.xml .project plugin.xml old_buildnotes_compare_3_1.html .cvsignore plugin.properties build.properties .classpath old_buildnotes_compare_3_0.html about.html buildnotes_compare.html Log Message: org.eclipse.compare, extracted from the Eclipse CVS. Now independent of org.eclipse.ui.ide etc. --- NEW FILE: .cvsignore --- bin --- NEW FILE: .project --- <?xml version="1.0" encoding="UTF-8"?> <projectDescription> <name>org.jcommander.eclipsepatch.compare</name> <comment></comment> <projects> </projects> <buildSpec> <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> </buildCommand> <buildCommand> <name>org.eclipse.pde.ManifestBuilder</name> <arguments> </arguments> </buildCommand> <buildCommand> <name>org.eclipse.pde.SchemaBuilder</name> <arguments> </arguments> </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> </natures> </projectDescription> --- NEW FILE: plugin.properties --- ############################################################################### # 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 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html # # Contributors: # IBM Corporation - initial API and implementation ############################################################################### # # Resource strings for Compare Plug-in # pluginName= Compare Support providerName=Eclipse.org # # Extension point names # streamMergers= Stream Merger structureCreators= Structure Creator structureMergeViewers= Structure Merge Viewer contentMergeViewers= Content Merge Viewer contentViewers= Content Viewer # # CompareUIPlugin # CompareUIPlugin.dialogTitle=Compare CompareUIPlugin.noActiveWorkbenchPage=Cannot find active workbench page CompareUIPlugin.compareFailed=Compare Failed CompareUIPlugin.openEditorError=Problems Opening Editor CompareUIPlugin.noDifferences=There are no differences between the selected inputs. CompareUIPlugin.targetIdAttributeMissing=target id attribute ''{0}'' missing CompareUIPlugin.contentTypeNotFound=content type ''{0}'' not found CompareUIPlugin.targetNotFound=target ''{0}'' not found CompareUIPlugin.unexpectedTag=expected tag ''{1}'', got ''{0}'' # # Compare Editor # defaultCompareEditor.name= Default Compare Editor CompareEditor.saveError.title= Save Error CompareEditor.cantSaveError= Cannot save contents ({0}) CompareEditor.invalidInput=Invalid input: not a CompareEditorInput CompareEditor.error.setinput.title=Problem opening input CompareEditor.error.setinput.message=Cannot open input: # # Commands # compareCategory.name= Compare compareCategory.description= Compare command category Command.copyRightToLeft.name= Copy from Right to Left Command.copyRightToLeft.description= Copy Current Change from Right to Left Command.copyLeftToRight.name= Copy from Left to Right Command.copyLeftToRight.description= Copy Current Change from Left to Right Command.copyAllRightToLeft.name= Copy All from Right to Left Command.copyAllRightToLeft.description= Copy All Changes from Right to Left Command.copyAllLeftToRight.name= Copy All from Left to Right Command.copyAllLeftToRight.description= Copy All Changes from Left to Right Command.selectNextChange.name= Select Next Change Command.selectNextChange.description= Select Next Change Command.selectPreviousChange.name= Select Previous Change Command.selectPreviousChange.description= Select Previous Change # # Context menu & actions # CompareWithMenu.label= Comp&are With CompareWithEachOtherAction.label= &Each Other CompareWithEachOtherAction.tooltip= Compare the Selected Resources TeamMenu.label= T&eam CompareWithPatchAction.label= &Apply Patch... CompareWithPatchAction.tooltip= Apply a Patch to the Selected Resources CompareWithHistoryAction.label= &Local History... CompareWithHistoryAction.tooltip= Compare the Selected Resource with Local History ReplaceWithMenu.label= Rep&lace With ReplaceFromHistoryAction.label= &Local History... ReplaceFromHistoryAction.tooltip= Replace the Selected Resource with Local History ReplaceWithPreviousFromHistoryAction.label= &Previous from Local History ReplaceWithPreviousFromHistoryAction.tooltip= Replace the Selected Resource with the Previous from Local History addFromHistoryAction.label= Restore from Local Histor&y... addFromHistoryAction.tooltip= Restore Deleted Files from Local History # # Preference Page # ComparePreferencePage.name= Compare/Patch ComparePreferencePage.generalTab.label= &General ComparePreferencePage.structureCompare.label= &Open structure compare automatically ComparePreferencePage.showMoreInfo.label= &Show additional compare information in the status line ComparePreferencePage.ignoreWhitespace.label= Ignore &white space ComparePreferencePage.saveBeforePatching.label= A&utomatically save dirty editors before patching ComparePreferencePage.filter.description= Enter member names that should be excluded from 'Compare With Each Other'.\nList is comma separated (e.g. '*.class, .project, bin/') ComparePreferencePage.filter.label= &Filtered Members: ComparePreferencePage.filter.invalidsegment.error= Filter is invalid: {0} ComparePreferencePage.textCompareTab.label= &Text Compare ComparePreferencePage.initiallyShowAncestorPane.label= Initially show a&ncestor pane ComparePreferencePage.showPseudoConflicts.label= Show &pseudo conflicts ComparePreferencePage.synchronizeScrolling.label= Synchronize &scrolling between panes in compare viewers ComparePreferencePage.useSingleLine.label= Connect &ranges with single line ComparePreferencePage.preview.label= Preview: ComparePreferencePage.ancestor.label= Common Ancestor ComparePreferencePage.left.label= Local ComparePreferencePage.right.label= Remote ComparePreferencePage.backgroundColor1.label= Bac&kground Color: ComparePreferencePage.backgroundColor2.label= S&ystem Default ComparePreferencePage.backgroundColor3.label= C&ustom # Compare editor contents for Compare preview page ComparePreferencePage.previewAncestor= 1\n2\n3\nconflict\n4\n5 ComparePreferencePage.previewLeft= 1\n2\noutgoing addition\n3\noutgoing change\n4\npseudo conflict\n5 ComparePreferencePage.previewRight= 1\nincoming addition\nincoming addition\n2\n3\nincoming change\n4\npseudo conflict\n5 ComparePreferencePage.colorAndFontLink=See '<a>Colors and Fonts</a>' preferences for text compare colors and fonts. textCompareAppearance.label=Text Compare compareIncomingColor.label= Incoming change color compareIncomingColor.description= The color used to indicate an incoming change in compare and merge tools. compareOutgoingColor.label= Outgoing change color compareOutgoingColor.description= The color used to indicate an outgoing change in compare and merge tools. compareConflictColor.label= Conflicting change color compareConflictColor.description= The color used to indicate a conflicting change in compare and merge tools. compareResolvedColor.label= Resolved change color compareResolvedColor.description= The color used to indicate a resolved change in merge tools. compareFontDefiniton.label= Compare text font compareFontDefiniton.description= The compare text font is used by textual compare/merge tools. preferenceKeywords.general=merge merging whitespace filter synchronize scolling ancestor conflict line pseudo # New UI #ComparePreferencePage.useSplines.label= Use splines in center panel #ComparePreferencePage.useResolveUI.label= Use new resolve UI CompareEditorInput.defaultTitle= Compare # # Toolbar actions # action.IgnoreWhiteSpace.label=Ignore White Space action.IgnoreWhiteSpace.tooltip=Ignore White Space Where Applicable action.IgnoreWhiteSpace.image=etool16/ignorews_edit.gif action.Next.label=Next Difference action.Next.tooltip=Go to Next Difference action.Next.image=elcl16/next_nav.gif action.Previous.label=Previous Difference action.Previous.tooltip=Go to Previous Difference action.Previous.image=elcl16/prev_nav.gif # # Built in Structure Creators # ZipStructureCreator.name=Zip Archive Compare # # Compare Dialog # CompareDialog.commitAction.label=Commit CompareDialog.saveErrorTitle=Save Error CompareDialog.saveErrorMessage=Cannot save # # Compare With Each Other # ResourceCompare.taskName=Operation in Progress... ResourceCompare.twoWay.title=Compare ({0}-{1}) ResourceCompare.twoWay.tooltip=Two-way compare of {0} with {1} ResourceCompare.threeWay.title=Compare ({0}-{1}-{2}) ResourceCompare.threeWay.tooltip=Three-way compare of {1} and {2} relative to common ancestor {0} # # DiffTreeViewer & DiffNodes # DiffTreeViewer.title= Structure Compare DiffNode.noName= <no name> DiffNode.nameFormat= {0} / {1} # # Differencing engine # Differencer.progressFormat= Comparing {0} # # Patch: rejected patch markers # rejectedPatchMarker.name= Rejected Patch # # ValidateEdit # ValidateEdit.error.unable_to_perform= Operation cannot be performed. ValidateEdit.error.fileModified= File ''{0}'' has been modified since the beginning of the operation. ValidateEdit.error.stillReadonly= File ''{0}'' is read-only. --- NEW FILE: about.html --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> <html> <head> <title>About</title> <meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> </head> <body lang="EN-US"> <h2>About This Content</h2> <p>February 24, 2005</p> <h3>License</h3> <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. For purposes of the EPL, "Program" will mean the Content.</p> <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p> </body> </html> --- NEW FILE: .classpath --- <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="compare/"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> </classpath> --- NEW FILE: old_buildnotes_compare_3_0.html --- <!doctype html public "-//w3c//dtd html 4.0 transitional//en"> <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta name="GENERATOR" content="Mozilla/4.75 [en] (WinNT; U) [Netscape]"> <meta name="Author" content="IBM"> <title>Eclipse Platform Release Notes - Desktop</title> </head> <body> <h1> Eclipse Platform Build Notes<br> Compare</h1> Eclipse Build Input June 17th 2004 (RC3) <h2> Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=37648">37648</a>: Exceptions after one of the compare viewer inputs got deleted<br> [...1518 lines suppressed...] 1GI5DN9: ITPUI:WIN2000 - Conflicting token deletions don't show up in text compare viewer<br> 1GI3KUR: ITPJUI:WIN2000 - Compare: double-click in versions list closes view<br> 1GFFR4B: ITPUI:WIN98 - local history is misleading<br> 1GBM0IL: ITPUI:WINNT - CompareEditorInput#save should throw CoreException<br> 1GI99LE: ITPUI:ALL - Compare viewer does not show last line when horizontal scroll bar is present<br> 1GBB34N: ITPJUI:WIN2000 - Compare Viewer doesn't scroll to last line<br> 1GGZ8DO: ITPJUI:WIN - MergeViewer invalid selection range<br> 1GIIBHM: ITPUI:WIN2000 - Problems when comparing zip files<br> 1GIKKOZ: ITPUI:ALL - alt copyright text in html doc needs update<br> 1GIURNB: ITPUI:ALL - property file of EditionSelectionDialog contains configuration options<br> 1GIUS6L: ITPUI:ALL - TextMergeViewer uses deprecated Thread.stop()<br> 1GI3HDZ: ITPJUI:ALL - Compare: conflicts with no ancestor does not show differences<br> 1GEUX0D: ITPJUI:ALL - not state aware toolbar button in compare<br> <h2> Problem reports closed</h2> 1GF9Y9C: ITPUI:WIN2000 - DCR: only get ancestor pane contents if pane is visible<br> </body> </html> --- NEW FILE: buildnotes_compare.html --- <!doctype html public "-//w3c//dtd html 4.0 transitional//en"> <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta name="Author" content="IBM"> <title>Eclipse Platform Release Notes - Desktop</title> </head> <body> <h1> Eclipse Platform Build Notes<br> 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> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=132275">132275</a>: Apply Patch Wizard problems<br> <h1><hr WIDTH="100%"></h1> Eclipse Build Input February 28th 2005 <h2>Problem reports fixed</h2> some artwork changed from *.gif to *.png<br> removed a deprecation<br> <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> <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> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=125997">125997</a>: Make EditionSelectionDialog.setHelpContextId API<br> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=126230">126230</a>: CompareEditor and ISaveableModelSource<br> <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> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=125149">125149</a>: Unexported package and exceptions ignored when creating IViewerCreator<br> <h1><hr WIDTH="100%"></h1> Eclipse Build Input December 13th 2005 <h2>Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=115395">115395</a>: TextStreamMerger always uses '\n' as line ending<br> <h1><hr WIDTH="100%"></h1> Eclipse Build Input November 22th 2005 <h2>Problem reports fixed</h2> Updated the version of org.eclipse.compare to 3.2.0.qualifier and added version ranges to the dependencies.<br> <h1><hr WIDTH="100%"></h1> Eclipse Build Input November 15th 2005 <h2>Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=116318">116318</a>: Ambiguous use of Assert and ListenerList<br> <h1><hr WIDTH="100%"></h1> Eclipse Build Input October 25th 2005 <h2>Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=110481">110481</a>: Ability for Apply Patch wizard to work with multiple-project patches<br> <h1><hr WIDTH="100%"></h1> Eclipse Build Input October 18th 2005 <h2>Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=112400">112400</a>: Change required due to ResourceMapping API<br> <h1><hr WIDTH="100%"></h1> Eclipse Build Input October 10th 2005 <h2>Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=110481">110481</a>: Ability for Apply Patch wizard to work with multiple-project patches<br> <h1><hr WIDTH="100%"></h1> Eclipse Build Input 3.2 M1 2005 <h2>Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=105230">105230</a>: [BIDI] need to add $nl$/ to icon paths for reversed icons<br> </body> </html> --- NEW FILE: component.xml --- <?xml version="1.0" encoding="UTF-8"?> <component xmlns="http://eclipse.org/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://eclipse.org/component ../component.xsd " name="Compare Support"> <plugin id="org.eclipse.compare" /> <package name="org.eclipse.compare"> <type name= "BufferedContent"/> <type name= "CompareConfiguration"/> <type name= "CompareEditorInput"/> <type name= "CompareUI" subclass="false" instantiate="false"/> <type name= "CompareViewerPane"/> <type name= "CompareViewerSwitchingPane"/> <type name= "EditionSelectionDialog" subclass="false"/> <type name= "HistoryItem" subclass="false"/> <type name= "ICompareNavigator"/> <type name= "IContentChangeListener"/> <type name= "IContentChangeNotifier"/> <type name= "IEditableContent"/> <type name= "IEncodedStreamContentAccessor"/> <type name= "IModificationDate"/> <type name= "IPropertyChangeNotifier"/> <type name= "IResourceProvider"/> <type name= "IStreamContentAccessor"/> <type name= "IStreamMerger"/> <type name= "ITypedElement"/> <type name= "IViewerCreator"/> <type name= "NavigationAction" subclass="false"/> <type name= "ResourceNode" subclass="false"/> <type name= "Splitter"/> <type name= "ZipFileStructureCreator"/> </package> <package name="org.eclipse.compare.contentmergeviewer"> <type name= "ContentMergeViewer"/> <type name= "IDocumentRange"/> <type name= "IMergeViewerContentProvider"/> <type name= "ITokenComparator"/> <type name= "TextMergeViewer"/> </package> <package name="org.eclipse.compare.rangedifferencer"> <type name= "IRangeComparator"/> <type name= "RangeDifference" subclass="false" instantiate="false"/> <type name= "RangeDifferencer" subclass="false"/> </package> <package name="org.eclipse.compare.structuremergeviewer"> <type name= "DiffContainer"/> <type name= "DiffElement"/> <type name= "Differencer"/> <type name= "DiffNode"/> <type name= "DiffTreeViewer" subclass="false"/> <type name= "DocumentRangeNode"/> <type name= "ICompareInput"/> <type name= "ICompareInputChangeListener"/> <type name= "IDiffContainer"/> <type name= "IDiffElement"/> <type name= "IStructureComparator"/> <type name= "IStructureCreator"/> <type name= "StructureDiffViewer" subclass="false"/> </package> <package name="org.eclipse.compare.patch"> <type name= "WorkspacePatcherUI" subclass="false" instantiate="false"/> </package> <component-depends unrestricted="true"/> </component> --- NEW FILE: plugin.xml --- <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.0"?> <plugin> <!-- Compare extension point definitions --> <extension-point id="streamMergers" name="%streamMergers" schema="schema/streamMergers.exsd"/> <extension-point id="structureCreators" name="%structureCreators" schema="schema/structureCreators.exsd"/> <extension-point id="structureMergeViewers" name="%structureMergeViewers" schema="schema/structureMergeViewers.exsd"/> <extension-point id="contentMergeViewers" name="%contentMergeViewers" schema="schema/contentMergeViewers.exsd"/> <extension-point id="contentViewers" name="%contentViewers" schema="schema/contentViewers.exsd"/> <!-- Extensions --> <extension point="org.eclipse.ui.themes"> <themeElementCategory label="%textCompareAppearance.label" id="org.eclipse.compare.contentmergeviewer.TextMergeViewer"> </themeElementCategory> <colorDefinition label="%compareIncomingColor.label" categoryId="org.eclipse.compare.contentmergeviewer.TextMergeViewer" value="COLOR_BLUE" id="INCOMING_COLOR"> <description> %compareIncomingColor.description </description> </colorDefinition> <colorDefinition label="%compareOutgoingColor.label" categoryId="org.eclipse.compare.contentmergeviewer.TextMergeViewer" value="COLOR_BLACK" id="OUTGOING_COLOR"> <description> %compareOutgoingColor.description </description> </colorDefinition> <colorDefinition label="%compareConflictColor.label" categoryId="org.eclipse.compare.contentmergeviewer.TextMergeViewer" value="COLOR_RED" id="CONFLICTING_COLOR"> <description> %compareConflictColor.description </description> </colorDefinition> <colorDefinition label="%compareResolvedColor.label" categoryId="org.eclipse.compare.contentmergeviewer.TextMergeViewer" value="COLOR_GREEN" id="RESOLVED_COLOR"> <description> %compareResolvedColor.description </description> </colorDefinition> <fontDefinition label="%compareFontDefiniton.label" defaultsTo="org.eclipse.jface.textfont" categoryId="org.eclipse.compare.contentmergeviewer.TextMergeViewer" id="org.eclipse.compare.contentmergeviewer.TextMergeViewer"> <description> %compareFontDefiniton.description </description> </fontDefinition> </extension> <extension id="rejectedPatchMarker" name="%rejectedPatchMarker.name" point="org.eclipse.core.resources.markers"> <super type="org.eclipse.core.resources.taskmarker"> </super> <persistent value="true"> </persistent> </extension> <extension point="org.eclipse.ui.editors"> <editor name="%defaultCompareEditor.name" icon="$nl$/icons/full/eview16/compare_view.gif" contributorClass="org.eclipse.compare.internal.CompareEditorContributor" class="org.eclipse.compare.internal.CompareEditor" id="org.jcommander.eclipsepatch.compare.CompareEditor"> </editor> </extension> <extension point="org.eclipse.ui.preferencePages"> <page name="%ComparePreferencePage.name" category="org.eclipse.ui.preferencePages.Workbench" class="org.eclipse.compare.internal.ComparePreferencePage" id="org.eclipse.compare.internal.ComparePreferencePage"> <keywordReference id="org.eclipse.compare.general"/> </page> </extension> <extension point="org.eclipse.ui.keywords"> <keyword label="%preferenceKeywords.general" id="org.eclipse.compare.general"/> </extension> <!-- commands and their bindings --> <extension point="org.eclipse.ui.commands"> <category name="%compareCategory.name" description="%compareCategory.description" id="org.eclipse.compare.ui.category.compare"> </category> <command name="%Command.copyRightToLeft.name" description="%Command.copyRightToLeft.description" categoryId="org.eclipse.compare.ui.category.compare" id="org.eclipse.compare.copyRightToLeft"> </command> <command name="%Command.copyLeftToRight.name" description="%Command.copyLeftToRight.description" categoryId="org.eclipse.compare.ui.category.compare" id="org.eclipse.compare.copyLeftToRight"> </command> <command name="%Command.copyAllRightToLeft.name" description="%Command.copyAllRightToLeft.description" categoryId="org.eclipse.compare.ui.category.compare" id="org.eclipse.compare.copyAllRightToLeft"> </command> <command name="%Command.copyAllLeftToRight.name" description="%Command.copyAllLeftToRight.description" categoryId="org.eclipse.compare.ui.category.compare" id="org.eclipse.compare.copyAllLeftToRight"> </command> <command name="%Command.selectNextChange.name" description="%Command.selectNextChange.description" categoryId="org.eclipse.compare.ui.category.compare" id="org.eclipse.compare.selectNextChange"> </command> <command name="%Command.selectPreviousChange.name" description="%Command.selectPreviousChange.description" categoryId="org.eclipse.compare.ui.category.compare" id="org.eclipse.compare.selectPreviousChange"> </command> </extension> <extension point="org.eclipse.ui.popupMenus"> <objectContribution objectClass="org.eclipse.core.resources.mapping.ResourceMapping" adaptable="true" id="org.eclipse.compare.MenuGroups"> <menu label="%ReplaceWithMenu.label" path="additions" id="replaceWithMenu"> <separator name="replaceWithGroup"> </separator> </menu> <menu label="%CompareWithMenu.label" path="additions" id="compareWithMenu"> <separator name="compareWithGroup"> </separator> </menu> <menu label="%TeamMenu.label" path="additions" id="team.main"> <separator name="group1"> </separator> </menu> </objectContribution> <objectContribution objectClass="org.eclipse.core.resources.IResource" adaptable="true" id="org.eclipse.compare.CompareAction"> <action label="%CompareWithEachOtherAction.label" tooltip="%CompareWithEachOtherAction.tooltip" class="org.eclipse.compare.internal.CompareAction" menubarPath="compareWithMenu/compareWithGroup" enablesFor="2+" id="compareWithEachOther"> </action> <action label="%CompareWithPatchAction.label" tooltip="%CompareWithPatchAction.tooltip" class="org.eclipse.compare.internal.patch.CompareWithPatchAction" menubarPath="team.main/group1" enablesFor="1" id="compareWithPatch"> </action> </objectContribution> <objectContribution objectClass="org.eclipse.core.resources.IFile" adaptable="true" id="org.eclipse.compare.ReplaceWithEditionAction"> <menu label="%ReplaceWithMenu.label" path="additions" id="replaceWithMenu"> <separator name="replaceWithGroup"> </separator> </menu> <action label="%ReplaceFromHistoryAction.label" tooltip="%ReplaceFromHistoryAction.tooltip" class="org.eclipse.compare.internal.ReplaceWithEditionAction" menubarPath="replaceWithMenu/replaceWithGroup" enablesFor="1" id="replaceFromHistory"> </action> <action label="%ReplaceWithPreviousFromHistoryAction.label" tooltip="%ReplaceWithPreviousFromHistoryAction.tooltip" class="org.eclipse.compare.internal.ReplaceWithPreviousEditionAction" menubarPath="replaceWithMenu/replaceWithGroup" enablesFor="1" id="replaceWithPreviousFromHistory"> </action> </objectContribution> <objectContribution objectClass="org.eclipse.core.resources.IFile" adaptable="true" id="org.eclipse.compare.CompareWithEditionAction"> <menu label="%CompareWithMenu.label" path="additions" id="compareWithMenu"> <separator name="compareWithGroup"> </separator> </menu> <action label="%CompareWithHistoryAction.label" tooltip="%CompareWithHistoryAction.tooltip" class="org.eclipse.compare.internal.CompareWithEditionAction" menubarPath="compareWithMenu/compareWithGroup" enablesFor="1" id="compareWithHistory"> </action> </objectContribution> <objectContribution objectClass="org.eclipse.core.resources.IContainer" adaptable="true" id="org.eclipse.compare.AddFromHistoryAction"> <action label="%addFromHistoryAction.label" tooltip="%addFromHistoryAction.tooltip" class="org.eclipse.compare.internal.AddFromHistoryAction" menubarPath="replaceWithMenu" enablesFor="1" id="addFromHistoryAction"> </action> </objectContribution> </extension> <extension point="org.jcommander.eclipsepatch.compare.streamMergers"> <streamMerger extensions="txt" class="org.eclipse.compare.internal.merge.TextStreamMerger" id="org.eclipse.compare.internal.merge.TextStreamMerger"> </streamMerger> <contentTypeBinding contentTypeId="org.eclipse.core.runtime.text" streamMergerId="org.eclipse.compare.internal.merge.TextStreamMerger"> </contentTypeBinding> </extension> <extension point="org.jcommander.eclipsepatch.compare.structureCreators"> <structureCreator extensions="zip" class="org.eclipse.compare.ZipFileStructureCreator" id="org.eclipse.compare.ZipFileStructureCreator"> </structureCreator> </extension> <extension point="org.jcommander.eclipsepatch.compare.contentMergeViewers"> <viewer extensions="class,exe,dll,binary,zip,jar" class="org.eclipse.compare.internal.BinaryCompareViewerCreator" id="org.eclipse.compare.BinaryCompareViewerCreator"> </viewer> <viewer extensions="txt" class="org.eclipse.compare.internal.TextMergeViewerCreator" id="org.eclipse.compare.TextMergeViewerCreator"> </viewer> <viewer extensions="gif,jpg,jpeg,png,bmp,ico,tif,tiff" class="org.eclipse.compare.internal.ImageMergeViewerCreator" id="org.eclipse.compare.ImageMergeViewerCreator"> </viewer> <contentTypeBinding contentTypeId="org.eclipse.core.runtime.text" contentMergeViewerId="org.eclipse.compare.TextMergeViewerCreator"> </contentTypeBinding> </extension> <extension point="org.jcommander.eclipsepatch.compare.contentViewers"> <viewer extensions="txt" class="org.eclipse.compare.internal.TextViewerCreator" id="org.eclipse.compare.TextViewerCreator"> </viewer> <contentTypeBinding contentTypeId="org.eclipse.core.runtime.text" contentViewerId="org.eclipse.compare.TextViewerCreator"> </contentTypeBinding> </extension> </plugin> --- NEW FILE: old_buildnotes_compare_3_1.html --- <!doctype html public "-//w3c//dtd html 4.0 transitional//en"> <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta name="GENERATOR" content="Mozilla/4.75 [en] (WinNT; U) [Netscape]"> <meta name="Author" content="IBM"> <title>Eclipse Platform Release Notes - Desktop</title> </head> <body> <h1> Eclipse Platform Build Notes<br> Compare</h1> Eclipse Build Input 3.1RC2 2005 <h2>Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=98828">98828</a>: CompareFilter bug filtering folders<br> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=67888">67888</a>: [accessibility] Go To Next Difference stops working on reuse of editor<br> <h1><hr WIDTH="100%"></h1> Eclipse Build Input May 12th 2005 <h2>Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93561">93561</a>: ResouceMapping changed to Internal<br> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=91005">91005</a>: reusing compare editor does not update title if filename stays the same<br> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93810">93810</a>: Method extractPair(String, char, int[]) in Patcher.java fails on single number in range<br> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93901">93901</a>: Applying patch with one line added inserts new line one line above<br> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=78653">78653</a>: Eclipse compare support does not appear to use file inspection correctly<br> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=78652">78652</a>: content type should be bound hierarchically<br> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93924">93924</a>: Add keywords to preference pages<br> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=94077">94077</a>: IndexOutOfBounds applying patch<br> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=91211">91211</a>: Apply patch doesn't work for files with missing line endings<br> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=92270">92270</a>: compare should use content-based content type matching<br> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=69920">69920</a>: Compare should show png, bmp, etc. as image<br> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=94420">94420</a>: [Preferences] Widget is disposed in Compare/Patch<br> <h1><hr WIDTH="100%"></h1> Eclipse Build Input April 19th 2005 <h2>Problem reports fixed</h2> Converted Compare plug-in folder to jar<br> Converted to new NLS scheme<br> <h1><hr WIDTH="100%"></h1> Eclipse Build Input April 12th 2005 <h2>Problem reports fixed</h2> Added MANIFEST.MF<br> <h1><hr WIDTH="100%"></h1> Eclipse Build Input March 29nd 2005 <h2>Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=87750">87750</a>: Java Compare references internal API from platform/compare and JDT/Core<br> <h1><hr WIDTH="100%"></h1> Eclipse Build Input March 22nd 2005 <h2>Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=87434">87434</a>: add a link in Synchronize/Compare to Compare/Patch<br> <h1><hr WIDTH="100%"></h1> Eclipse Build Input February 8th 2005 <h2>Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=84487">84487</a>: Patch to put menu path contributions on ResourceMappings<br> <h1><hr WIDTH="100%"></h1> Eclipse Build Input January 11th 2005 <h2>Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=81853">81853</a>: quote problems in property files (compare)<br> <h1><hr WIDTH="100%"></h1> Eclipse Build Input January 4th 2005 <h2>Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=80387">80387</a>: NPE opening compare editor<br> <h1><hr WIDTH="100%"></h1> Eclipse Build Input December 7th 2004 <h2>Problem reports fixed</h2> Eliminated all compiler warnings<br> Removed dependency on core.runtime.compatibility <h1><hr WIDTH="100%"></h1> Eclipse Build Input November 30th 2004 <h2>Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=79414">79414</a>: states with same time stamps may appear in the wrong order<br> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=79566">79566</a>: NPE when closing JUnit compare view<br> <h1><hr WIDTH="100%"></h1> Eclipse Build Input November 23rd 2004 <h2>Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=47786">47786</a>: Possible leak in TextMergeViewer<br> Added translatable attribute to extension point schemas. <h1><hr WIDTH="100%"></h1> Eclipse Build Input November 16th 2004 <h2>Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=78679">78679</a>: Prefs Filtered Members field does not restore defaults<br> <h1><hr WIDTH="100%"></h1> Eclipse Build Input November 9th 2004 <h2>Problem reports fixed</h2> (partial fix; awaits fix in jdt.ui): <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=77599">77599</a>: [5.0] Structure comparing of enums does not work<br> <h1><hr WIDTH="100%"></h1> Eclipse Build Input November 1st 2004 <h2>Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=65981">65981</a>: empty compare viewer has no focus<br> <h1><hr WIDTH="100%"></h1> Eclipse Build Input September 21th 2004 <h2>Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=74450">74450</a>: AbstractUIPlugin.initializeDefaultPreferences no longer called?<br> <h1><hr WIDTH="100%"></h1> Eclipse Build Input August 24th 2004 <h2>Problem reports fixed</h2> Eliminated compiler warnings <h1><hr WIDTH="100%"></h1> Eclipse Build Input July 27th 2004 <h2>Problem reports fixed</h2> Updated version number in plugin.xml and export script to 3.1 </body> </html> --- NEW FILE: build.properties --- ############################################################################### # 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 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html # # Contributors: # IBM Corporation - initial API and implementation ############################################################################### source.. = compare/ bin.includes = icons/,\ plugin.xml,\ .,\ plugin.properties,\ about.html,\ META-INF/ src.includes = about.html,\ schema/ |