Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2020-12-10Bug 552352 - Using SWAP in Compare editor loses changes and dirty statusR4_6_maintenanceNiraj Modi1-2/+12
- Back-port fix to 4.6.3+ branch Change-Id: I7376effc5cbbf93ab005fc6528b3ba792660e09a Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
2019-11-22Bug 544913 - [Accessibility] LTK refactoring: Some information can't beNiraj Modi2-3/+5
read in preview Change-Id: I884522fbe45902e0a1d41389fa31b523f121377f Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
2019-10-14Bug 531945 - Use of ICompareFilters causes inaccurate comparison offsetsNiraj Modi1-5/+5
Change-Id: Iadf625e3133122326e0ce99113ff378ff792d26d Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
2019-08-23Bug 544868 (Part-2)- [Accessibility] Compare editor and accessibility:Niraj Modi2-3/+3
the column is read wrong when swapping left and right view - minor version update Change-Id: I703c462266809d17dcb16441b259afb7f52367c1 Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
2019-08-23Bug 544868 - [Accessibility] Compare editor and accessibility: theNiraj Modi1-3/+9
column is read wrong when swapping left and right view - Manual back-port to R4_6_maintenance Change-Id: I54a9229e954f7a22dfe4278916ab0b278b82a0be Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
2018-08-16Bug 532617 - Replace headstream instead of branchKalyan Prasad Tatavarthi10-19/+84
Change-Id: Id5354c26cd755ef1735176d2db42a7df663dd787 Signed-off-by: Kalyan Prasad Tatavarthi <kalyan_prasad@in.ibm.com>
2017-01-03Bug 509708 - Don't try to create an image from a null descriptor.M20170201-0400M20170126-1300M20170126-0400M20170125-0400M20170118-0830M20170118-0500M20170118-0430M20170111-0400M20170105-1300M20170104-1200M20170104-0545M20170104-0400M20170103-1700M20170103-1405Andrey Loskutov2-3/+9
Elements in the outline can be "virtual" without real direction of the change (e.g. "Compilation Unit" root node). Such elements are created from RangeDifferences with "NOCHANGE" kind (so the DocumentMerger.Diff.fDirection is zero), and therefore they do not have an image descriptor configured in CompareConfiguration.fgImages array. Also increment service segment after patch. Change-Id: I82645b097fe49a3d61e2e7934a0190a718a9ec35 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2017-01-03Bug 501580 - "Swap left and right": use consistent termsSergey Prigogin1-3/+3
Change-Id: I5c2b1b674e3f0ac71a8b5cc1f40a4a0c6a9f027e
2017-01-03Bug 509614 - Changes made in Compare editor are not saved when the leftSergey Prigogin3-6/+6
and the right panes are swapped Change-Id: I2b6e84ec94f62379eef48a699720964b042d5f1d
2017-01-03Bug 509575 - Update parent pom to 4.6.3Sravan Kumar Lakkimsetti16-16/+16
Change-Id: I759a87407abb1786d699b3079bf732d5a1ec723c Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
2016-10-24Bug 504708 - Addition/removal icon in structure compare is wrongM20161110-0200M20161109-0400M20161102-0400Sergey Prigogin1-10/+12
Change-Id: I6f814da1c77f82a0dec908bd3e60ae2f5ef4a849
2016-10-03Bug 502554: Update parent pom to 4.6.2M20161026-0400M20161019-0640M20161019-0400M20161013-0730M20161012-1220M20161012-1050M20161012-0900M20161012-0600M20161006-1230M20161005-1200Markus Keller16-16/+16
Change-Id: Ia503dfde1ff8068daa4aa9fa644bdca6ab08d340 Signed-off-by: Markus Keller <markus_keller@ch.ibm.com>
2016-10-02Bug 213780 - Compare With direction should be configurableSergey Prigogin1-2/+2
Minor Javadoc correction. Change-Id: Ia46d4101ca6a49d4de202ade02a888339d008c51
2016-10-02Bug 213780 - Compare With direction should be configurableConrad Groth16-450/+669
add a preference to swap the left and right side of the merge viewer. This fix just swaps the left and right input for display. The model values for left and right are not changed. Change-Id: I4aa47e2e0389a0f1e8745e89b964296eb0b67678 Signed-off-by: Conrad Groth <info@conrad-groth.de>
2016-06-28Bug 496465: Prep for 4.6.1 (Neon.1) maintenance buildsR4_6_1M20160914-1200M20160907-1200M20160907-0400M20160831-0700M20160831-0400M20160829-0800M20160824-0059M20160817-0420M20160810-1300M20160803-1700M20160803-1000M20160727-1700M20160727-1000M20160721-0445M20160720-1000M20160715-0900M20160713-1359M20160713-1000Markus Keller16-16/+16
Change-Id: If6c7b985d3905853212597862832aa92bd42d61e Signed-off-by: Markus Keller <markus_keller@ch.ibm.com>
2016-05-18Bug 382972: [HiDPI] Update UI for Retina display on Mac and other high ↵Y20160526-1000Y20160519-1000R4_6I20160606-1100I20160603-1000I20160602-1000I20160601-2000I20160601-1000I20160531-2330I20160531-2000I20160530-2000I20160529-2000I20160528-1500I20160527-2000I20160525-2000I20160524-2000I20160523-2000I20160522-2000I20160521-1500I20160520-2000I20160519-1730I20160519-1100I20160518-2000Markus Keller46-0/+0
resolution displays Change-Id: Ie2f3ca9aee6789640b7ef22143577a7665f4bf1c Signed-off-by: Markus Keller <markus_keller@ch.ibm.com>
2016-05-12Bug 492251 - Enable the gerrit.createchangeid propertyY20160513-1000I20160517-2000I20160516-2000I20160515-2000I20160514-1500I20160513-2000I20160512-1000Stefan Xenos1-0/+6
Change-Id: I2dfd923fa340ec1d06858ece6a42ba550454fa7d Signed-off-by: Stefan Xenos <sxenos@gmail.com>
2016-04-26Bug 492468: Move the projects in the team git repository to Java 1.8 (2)Y20160505-1000Y20160428-1430Y20160428-1000I20160511-2000I20160511-0400I20160510-2000I20160509-2000I20160508-2000I20160507-1500I20160506-2000I20160506-1030I20160506-0830I20160505-2000I20160504-2000I20160504-0035I20160503-2000I20160502-2000I20160501-2000I20160430-2000I20160429-2300I20160429-2000I20160428-0800I20160427-2000I20160427-1200I20160427-0800I20160427-0400I20160426-2330I20160426-2000I20160426-1615I20160426-1430I20160426-1245Markus Keller1-2/+1
Change-Id: I243202a9c6906b0a7155506d8e5700d895c40a35 Signed-off-by: Markus Keller <markus_keller@ch.ibm.com>
2016-04-22Bug 490992 - don't log error if ~/.ssh/known_hosts doesn't existI20160426-1105I20160426-1045I20160426-1000I20160426-0800I20160426-0130I20160426-0030I20160425-2230I20160425-2000I20160425-1300I20160425-0800I20160424-2245I20160424-2000Thomas Wolf1-3/+6
Not having a known_hosts file is not an error. Change-Id: I75938b6e07b26fc9a6b3bd0b3867a51e63b9fb2d Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2016-04-18Bug 490012 - Remove the "strictly compatible JRE" per-project override from ↵Y20160421-1000I20160419-0800Stefan Xenos11-83/+1
all projects in the Eclipse SDK Change-Id: If95f33af16bd637283389d55d11f1461addd2050 Signed-off-by: Stefan Xenos <sxenos@gmail.com>
2016-04-12Bug 491533 - Run remove unnecessary whitespace cleanup onY20160414-1000I20160417-1112Lars Vogel314-4412/+4423
org.eclipse.team.ui Change-Id: I422dc120f97d04250967609c7d423377ec11bf01 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
2016-04-12Bug 491484 - Add @Override to org.eclipse.team.uiLars Vogel133-133/+1152
Change-Id: I1d158ffc0d865a25cdca12c5595d36edab7ac557 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
2016-04-12Bug 491484 - Add @Override to org.eclipse.team.ui Lars Vogel108-62/+833
Split the generated cleanup up to avoid a silly CQ for that. Change-Id: Ice9f06131ae1500b6882b463eca12bfe507055ca Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
2016-04-12Bug 491484 - Add @Override to org.eclipse.team.uiLars Vogel42-3/+297
Part II of the automatic cleanup Change-Id: I1b6c7cf8bba164644afb7b623d3ae59549736895 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
2016-04-04Revert "Bug 490012 - Switch "strictly compatible JRE" to warning"Y20160407-1000I20160412-0800I20160405-0800Szymon Ptaszkiewicz11-11/+73
This reverts commit 87f3b9b8652edd636453f33ab7ba9adf862a3012.
2016-04-01Bug 490835 - [History View] Local history page is stickySergey Prigogin1-3/+12
Change-Id: I43b060e937e5cb25c65142187a810369d8b9566a
2016-04-01Bug 490832 - Remove Utils.getAdapter(Object, Class, boolean) in favor ofSergey Prigogin3-30/+8
Adapters.adapt Change-Id: I2a768d0c779f43570f0ca86b499f664ee5efb2c6
2016-03-23Bug 489805 - Enable "Use compliance from execution environment"Stefan Xenos15-42/+75
Change-Id: I679af51793430003b1d8a4af083594bad01318a6 Signed-off-by: Stefan Xenos <sxenos@gmail.com>
2016-03-22Bug 489805 - Move the team git repository to Java 1.8Stefan Xenos76-228/+182
Fixes compiler warnings. This reverts commit b8821710ffb03f8e7573be209e1ab14e27ba04b4. Change-Id: I64b54428dc8500ab05427d505bb801e46511916b Signed-off-by: Stefan Xenos <sxenos@gmail.com>
2016-03-22Revert "Bug 489805 - Move the projects in the team git repository to Java 1.8"Dani Megert60-115/+147
This reverts commit 622d3b5a9d07990762e58029bd8dffbd2e7df773.
2016-03-21Bug 489805 - Move the projects in the team git repository to Java 1.8I20160322-0800Stefan Xenos60-147/+115
Change-Id: Id5519b91445802de6c62d310b30a0cf486152f64 Signed-off-by: Stefan Xenos <sxenos@gmail.com>
2016-03-20Bug 490012 - Switch "strictly compatible JRE" to warningStefan Xenos11-73/+11
Change-Id: I4993997dd7880d06ab28d39e0331d922a3c96367 Signed-off-by: Stefan Xenos <sxenos@gmail.com>
2016-03-16Bug 489482: Improve/simplify the Oomph-based setup.I20160316-1200I20160316-0800Ed Merks1-3/+2
https://bugs.eclipse.org/bugs/show_bug.cgi?id=489482 Change-Id: I773edcdc22711d22dfaaed07947584a2440dfe05 Signed-off-by: Ed Merks <ed.merks@gmail.com>
2016-03-15Bug 489519 - Oomph configuration for platform teamI20160315-2000Stefan Xenos1-4/+9
Fix a number of bugs in the oomph configuration Change-Id: I0423740c6fedf42a436955f186bbbb3af35db0bf Signed-off-by: Stefan Xenos <sxenos@gmail.com>
2016-03-13Bug 489519 - Create oomph configuration for platform teamI20160315-0800I20160314-2000I20160314-1400I20160314-0800Stefan Xenos2-0/+164
Signed-off-by: Stefan Xenos <sxenos@gmail.com>
2015-12-25Bug 336079 - "Show Line Numbers" menu in compare editor should beY20160310-0830Y20160310-0800Y20160303-0800I20160313-2000I20160308-0800I20160301-1230I20160301-0800I20160223-0800I20160216-1400I20160216-0800I20160209-0800I20160202-1000I20160202-0800I20160128-2000I20160127-2000I20160127-0800I20160126-2000I20160126-0800I20160125-2000I20160125-0800I20160125-0400I20160124-2000I20160119-0800I20160112-1800I20160112-0800I20160105-1000I20160105-0800I20151229-0800Tobias Melcher1-3/+13
checked initially Change-Id: I3a4171702b82bedee70349a01a017108a1d7a70e Signed-off-by: Tobias Melcher <tobias.melcher@sap.com>
2015-11-19Bug 448968 - NPE in ContentMergeViewer$ContentMergeViewerLayout.layoutI20151222-0800I20151215-0800I20151213-2000I20151209-2300I20151209-2000I20151209-0800I20151208-2000I20151208-0800I20151207-2000I20151207-0800I20151206-2000I20151203-1230I20151203-0800I20151201-1100I20151201-0800I20151124-1000I20151124-0800Stefan Xenos2-9/+12
Half of the fix for the NPE in JavaReconciler. The other half lives in JDT UI). The JDT fix makes the source viewer disposal happen earlier, which causes some values to be null during teardown which weren't null previously. This adds the null checks but not the code which reorders the events. Change-Id: I3cf940afd2c87533d87e4d0c981256eb0da46f70 Signed-off-by: Stefan Xenos <sxenos@gmail.com>
2015-11-19Bug 448968 - NPE in ContentMergeViewer$ContentMergeViewerLayout.layoutStefan Xenos1-2/+9
Further improvements to the diagnostic logging. Change-Id: I5b788a9d7e470ebb913c9c69f46c28e2c88af3fd Signed-off-by: Stefan Xenos <sxenos@gmail.com>
2015-11-18Bug 448968 - NPE in ContentMergeViewer$ContentMergeViewerLayout.layoutStefan Xenos1-3/+11
Further improvements to the diagnostic logging. Change-Id: I03875fad063e251c08f84268ff57dec78d405336 Signed-off-by: Stefan Xenos <sxenos@gmail.com>
2015-11-17Bug 448968 - Add diagnostic logging to help identify the root cause.Stefan Xenos7-10/+132
Signed-off-by: Stefan Xenos <sxenos@gmail.com> Change-Id: I390e9c5a7d9357d9e27dcc7048ec9568efef8975
2015-10-30Bug 480557 - Command contributions to the Team menu don't workI20151117-0800I20151110-0800I20151103-0800Sergey Prigogin1-1/+71
Change-Id: I2f56fce84070b5e84dcddb1858365b689e392d31
2015-09-28Bug 200785: Find/Replace in compare editors does not support regular expressionsI20151029-1100I20151028-2000I20151028-0800I20151027-2000I20151027-0800I20151026-2000I20151026-0800I20151025-2000I20151020-0800I20151014-1100I20151013-0800I20151006-0800I20150929-0800Markus Keller1-1/+94
Change-Id: Ia241c2d55400c79d32b9042afd226b51a25218a6 Signed-off-by: Markus Keller <markus_keller@ch.ibm.com>
2015-09-02Bug 475427 - [compare] No syntax highlighting when IDocument is passedPascal Rapicault1-0/+1
in as input Change-Id: If494d46cf5a4ff969976db649d85665e13d10d19 Signed-off-by: Pascal Rapicault <pascal@rapicorp.com>
2015-07-31Increased bundle version for NeonI20150818-0800I20150811-1400I20150805-2000I20150805-0800I20150804-2000I20150804-0800I20150803-2000I20150803-0800I20150802-2000Dani Megert6-6/+6
2015-07-31Bug 470344 - Replace new Boolean with Boolean.valueOfAlex Blewitt13-31/+44
Using `new Boolean()` results in the creation of a new object on the heap, when the flyweight `Boolean.TRUE` and `Boolean.FALSE` are available. Java 1.4 added a `Boolean.valueOf()` which can be used in place of `new Boolean()` but which will use the existing flyweight values instead. Globally change `new Boolean(...)` to `Boolean.valueOf(...)` and replace constant valued expressions with their flyweight counterparts. In-line `Boolean.valueOf(true)` with `Boolean.TRUE`, c.f. false. Bug: 470344 Change-Id: I673669144881f738006b8567e99e5760e851ad07 Signed-off-by: Alex Blewitt <alex.blewitt@gmail.com>
2015-07-15Bug 464072 - [Search] Refresh on Access ignored during text searchI20150728-0800I20150721-0800Sergey Prigogin1-3/+7
Allow IFileStore to return EFS.ERROR_NOT_EXISTS instead of EFS.ERROR_READ when the file doesn't exist when called from the SyncFileWriter.readFirstLine method. Change-Id: Ibb125dcceea3e0dd47a6dbfae2cc867b2bd8fefa
2015-07-11Bug 464072 - [Search] Refresh on Access ignored during text searchI20150714-0800Sergey Prigogin1-4/+9
Allow IFileStore to return EFS.ERROR_NOT_EXISTS instead of EFS.ERROR_READ when the file doesn't exist. Change-Id: I614cc4023f2fbddcd4d0ac4bb9221744ced3482e Signed-off-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
2015-07-03Bug 469765 - Prep for 4.6 (Neon) and 4.5 (Mars) maintenance buildsI20150707-0800Szymon Ptaszkiewicz16-32/+32
2015-05-05Fixed bug 466408: Split 'org.eclipse.compare.patch' packages do not have ↵R4_5I20150603-2000I20150602-2000I20150601-2000I20150531-2000I20150529-2000I20150528-0700I20150527-2010I20150526-2010I20150525-2000I20150524-2000I20150522-2000I20150521-1715I20150521-1400I20150521-1100I20150520-2000I20150519-2000I20150519-1000I20150519-0030I20150518-2000I20150517-2000I20150516-1500I20150515-2000I20150514-2000I20150514-1000I20150513-2000I20150512-2100I20150512-2000I20150511-2130I20150511-2000I20150510-2000I20150509-1500I20150508-2000I20150507-2000I20150506-2000I20150505-2000Dani Megert1-0/+2
identical certificate
2015-04-20Fixed bug 447565: Easy way to skip diff capping once when comparing a big ↵I20150504-2000I20150503-2000I20150502-1500I20150501-2000I20150430-1445I20150429-2000I20150429-1330I20150429-1230I20150429-1030I20150429-0800I20150428-2000I20150428-0800I20150428-0100I20150427-2000I20150427-0800I20150426-2000I20150422-1000I20150421-0800Markus Keller5-38/+86
document Signed-off-by: Markus Keller <markus_keller@ch.ibm.com>

Back to the top