Skip to main content
summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.compare/compare
AgeCommit message (Collapse)AuthorFilesLines
2013-07-09Bug 412579 - [Backport][Edit] "Copy Current from Right to Left" doesn'tM20130724-0800M20130717-0800M20130710-0800Malgorzata Janczarska2-4/+51
work when triggered after Undo
2013-05-14Updated copyright dateI20130514-2000Dani Megert144-144/+144
2013-05-08Fixed bug 407436: 'Overwrite' causes NPE in Compare editorI20130512-2000I20130511-1500I20130510-2000I20130509-2000I20130508-2000Dani Megert1-2/+4
2013-04-23Fixed bug 405290: Undo-ing to the point where the compare editor is not ↵I20130430-0800I20130430-0031I20130429-2000I20130429-0800I20130428-2000Piotr Aniola1-2/+13
dirty leaves you with no easy way to recalculate diffs
2013-04-19Fixed bug 406012: Fix ambiguous invocation of either an outer or inherited ↵Dani Megert1-20/+28
method
2013-04-18Fix ambiguous invocation of either an outer or inherited methodTomasz Zarna1-1/+1
Found by FindBugs: An inner class is invoking a method that could be resolved to either a inherited method or a method defined in an outer class. By the Java semantics, it will be resolved to invoke the inherited method, which is intended. To make the intention clear to other readers of your code and to FindBugs that you want to invoke the inherited method, not the method in the outer class, invoke it by invoking the method on super (i.e. super.setEnabled(..)). Change-Id: If00f20701b6221ec0cc0c10485a43dc09a86afb4
2013-04-17Mark ICompareFilter with @noreference and fix bundle versionsDani Megert1-3/+1
2013-04-17Merge "Bug 382427 - Mechanism to inject line compare strategies into merge ↵Malgorzata Janczarska16-69/+1094
and structure viewers"
2013-04-16Use read-only everywhereDani Megert1-3/+3
2013-04-15Bug 382427 - Mechanism to inject line compare strategies into merge andJeremy Flicker16-69/+1094
structure viewers Change-Id: Iec597bd9582933b90f67de94547b4ccdaef9a319
2013-03-26Revert "Bug 216407 - [Edit] "Copy Current from Right to Left" doesn't work ↵Dani Megert1-13/+4
when triggered after Undo" This reverts commit 57c9a3c07c972dd980fa8b106c4b1b94156f9651.
2013-02-28Bug 216407 - [Edit] "Copy Current from Right to Left" doesn't work whenv20130228-095449Piotr Aniola1-4/+13
triggered after Undo
2013-02-27Revert "Fixed bug 309124: [compare] Java Source Compare does not show ↵I20130227-2000Dani Megert1-115/+96
whitespace characters in folder compare and in Compare With > Git Index" This reverts commit 51464728dbc3bb8f52da74ee420b9648150e22ea.
2013-02-20Fixed bug 309124: [compare] Java Source Compare does not show whitespaceI20130224-2000I20130223-1500I20130222-2000Manju Mathew1-96/+115
characters in folder compare and in Compare With > Git Index
2013-02-04[Edit] Enable center arrow buttons when editable and for both sidesv20130204-150810I20130205-0800Robin Stocker1-36/+85
With this, the [>] and [<] buttons can also be used for non-conflicting situations, just like the toolbar buttons "Copy Current Change ..." can. It's useful e.g. in EGit to partially stage changes. It also enables using them when both sides are editable, by showing a [>] button and a [<] button below it. In the compare editor opened from EGit's Staging view, this is the case where the left side is the workspace file and the right side is the index. Bug: 398594 Change-Id: I392b181fc4bc7e31502e6edf9b59e4b8b27b8074
2013-01-02Bug 383893 - Casting to ContentMergeViewer breaks Viewer contributionsv20130102-134006I20130127-2000I20130122-0800I20130115-1300I20130115-0800I20130108-0800Piotr Aniola1-7/+13
to EP org.eclipse.compare.contentMergeViewers, with an org.eclipse.compare.IViewerCreator, that provides just an org.eclipse.jface.viewers.Viewer
2012-08-08Additional fix for bug 123787: [Patch] Apply Patch error handlingv20120808-124256I20120814-0800I20120812-1736I20120810-1300I20120808-2000Dani Megert1-0/+5
for invalid formats
2012-07-03[Navigation] "Previous change" button doesn't work properlyMalgorzata Janczarska1-5/+4
Bug: 202435 Change-Id: I35ecbca8d0a22a9e41dc45b3b55a8ee781712542 Signed-off-by: Tomasz Zarna <Tomasz.Zarna@pl.ibm.com>
2012-06-14Fixed bug 123787: [Patch] Apply Patch error handling for invalid formatsDani Megert2-53/+71
2012-03-06Applying a Git patch needs too much user workv20120306-1149Tomasz Zarna4-6/+75
Bug: 358527 Change-Id: I544dbf9e3bc274e776dfa17473a02fe2141aa6d5
2012-02-28bug 361814:[Apply Patch]IAE: Path must include project and resource namev20120228-1212Tomasz Zarna3-52/+62
2011-12-02bug 365073: Patcher#applyAll doesn't expect null progress monitorv20111202-1634Tomasz Zarna1-1/+4
2011-11-23bug 312893: Flushing content merge viewer resets dirty flag for av20111123-1704Malgorzata Janczarska1-1/+4
Saveable that is not being saved
2011-11-02bug 361192: Incorrect parent shell selected when a compare dialog isTomasz Zarna1-2/+4
opened by a dialog
2011-10-25Fixed bug 361793: Apply Patch uses wrong line delimiter for new textDani Megert1-15/+51
files when pasting via clipboard
2011-10-13bug 359032: Move plugins under bundles/org.eclipse.compare/plugins/ toTomasz Zarna170-0/+39698
bundles/
2008-07-16Bug 207704 Decouple org.eclipse.compare from UIMichael Valenta168-36686/+0
2008-07-16bug 240294: Unused class in source codeTomasz Zarna1-33/+0
2008-07-15Bug 207704 Decouple org.eclipse.compare from UII200807151044Michael Valenta30-2843/+170
2008-06-03bug 235330: Copyright update for 3.4Tomasz Zarna18-18/+18
2008-05-28bug 234237: Wrong patch is appliedTomasz Zarna1-9/+44
2008-05-21bug 232822: NPE in the Apply Patch wizardTomasz Zarna1-1/+0
2008-05-15bug 228004: Compare editor leaks various elementsTomasz Zarna1-2/+13
2008-04-30Updated copyrightsTomasz Zarna1-1/+1
2008-04-25bug 228857: Do not use (s) in UITomasz Zarna1-1/+1
2008-04-22bug 224588: [Patch] Provide an information how many lines does the patch changeTomasz Zarna6-29/+216
2008-04-21Bug 224691 Compare Editor warns about unsaved changes when editor save ↵Michael Valenta1-4/+5
actions are active
2008-04-21bug 227585: TextMergeViewer.isCurrentDiff(Diff) leaks a non-API typeTomasz Zarna1-2/+2
2008-04-18Bug 227826 ApplyPatchOperation#parsePatch doesn't respect the storage encodingMichael Valenta1-1/+23
2008-04-18Bug 226587 NPE upon save allMichael Valenta1-0/+2
2008-04-17bug 227522: ContentMergeViewer#getToolBarManager(Composite) misses @since tagTomasz Zarna1-0/+1
2008-04-16bug 227150: Simplification in ContentMergeViewer#setRightDirty and ↵Tomasz Zarna1-3/+3
setLeftDirty and tests
2008-04-10Bug 226587 NPE upon save allMichael Valenta1-9/+10
2008-04-02bug 225122: Adopt API Tooling by CompareTomasz Zarna10-0/+16
2008-03-31Bug 224591 'Compare With > Each Other' logs 'Ignored attempt to add saveable ↵Michael Valenta1-1/+20
that was already registered'
2008-03-14Bug 177524 [Edit] Saveable * was not added using a saveables lifecycle event.Michael Valenta1-8/+19
2008-03-10bug 221146: [Patch] "Apply patch" should sort hunks by insertion pointsTomasz Zarna1-1/+25
2008-03-03bug 205761: [Patch] Indicate the fuzz factor used to matchTomasz Zarna7-1/+47
2008-03-03bug 208022: [Apply Patch] cancel save modified resource does not cancel ↵Tomasz Zarna1-12/+16
apply patch
2008-02-28bug 217070: [Apply Patch] Show matched hunks in Apply Patch wizardTomasz Zarna11-36/+115

Back to the top