Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-01-28Improve performance of ProjectModelResolverAxel Richard1-1/+4
The method ResourceUtil.getContentTypes(IFile) was called several times for the same IFile. Reduces calls to 1 per IFile. Change-Id: I44f5fb54301016af2fa08d69bd7260941ea16502
2013-11-12[401816] Refresh the workspace after saving the comparison model2.2.0M3Axel Richard1-0/+26
Bug: 401816 Change-Id: Ic2cb4e878fc0ec97e6b68218b9e23747ae744059
2013-11-12[421083] Fix Difference Group providers are shared between comparisons.Axel Richard1-1/+2
The DifferenceGroupProviderRegistry now registers IDifferenceGroupProvider.Descriptors instead of IDifferenceGroupProviders Bug: 421083 Change-Id: Ica04105c76de14d7e2b47c2d586c057fb1431059
2013-11-12[417360] Fix NPE when comparison is not between ResourceSetsMikaël Barbero3-12/+24
Bug: 417360 Change-Id: I9a7e0a22677d6982b38fbb6f64782838ec944c64
2013-11-12[421048] Redraw center part of content merge viewer when resizing editorAxel Richard2-1/+15
Bug: 421048 Change-Id: I78461e2b7ec097ae1591729ba45fe9f6843a4902
2013-11-05[420705] Fix NPE on comparison containing only filtered diffsAxel Richard1-0/+6
Bug: 420705 Change-Id: Ia2bf86bca9d6bb50592241fd49cd9d6e1c65ef35
2013-11-05Fix regression in ComparisonEditorInput with new way of grouping.Mikaël Barbero1-1/+5
Change-Id: I26d505f7670215b6a2c3924428b42c93a8f5e794
2013-10-22Fix center control drawing and icon displayMikaël Barbero1-7/+15
Change-Id: Ib4a19a2bac2c7e22842a4e73803c5294d34ab446
2013-10-21Use navigatable instead of navigator.Mikaël Barbero6-82/+29
We don't want to call next on content merge viewer when calling next on structure merge viewer. Change-Id: I43b05dd040d43307d1670b34eec68dd33e6cf209
2013-10-20Add progress bar to structure merge viewer during computationMikaël Barbero3-14/+287
Change-Id: Ib6240f24126945559c4d2639f1759f6a8a526585
2013-10-20Fix redraw() not propagated under windowsAxel Richard1-3/+12
Change-Id: I387ac74c45d5efe76a04ddc43afe75c5d310051f
2013-10-20Improve title message : manage pseudo conflicts diffsAxel Richard1-10/+32
Change-Id: I1acdf483fbf9742df4447ed22dc3bf93745b4503
2013-10-18Use generic type instead of ControlMikaël Barbero1-1/+1
Change-Id: I43fdabf929d86cb18a2e43e960168ce2a3f6ddf5
2013-10-18Fix regression on undo/redo support.Mikaël Barbero3-45/+18
Change-Id: Iae76f073da5339af6607953cb84e75cf671337ea
2013-10-18[330566] Apply workaround for bug 330566 (MacOS X SWT bug)Mikaël Barbero1-2/+19
See http://www.eclipse.org/forums/index.php/t/198780/ for the workaround. Bug: 330566 Change-Id: I68c4d270634adb3179226c3f507e6c93f5eb76ca
2013-10-18Fix navigation to next and previous changes.Mikaël Barbero5-202/+161
Change-Id: I969f11f095817338e32e1473cd03825d6e5508c2
2013-10-18Remove unnecessary DiffTreeViewer subclass.Mikaël Barbero5-272/+315
Change-Id: I9c017faaa8c616c27ab0cbc625dd479b2fd9daed
2013-10-18Use IEMFCompareConfiguration where possibleMikaël Barbero4-14/+14
Change-Id: I148200b373e4b3398233b394328e5dcd532638a1
2013-10-18Fix bug about merge all. Replace an OR by an ANDMikaël Barbero1-2/+2
Change-Id: I10316aaf3d1d247bf1365b5070fee650e8b0300e
2013-10-18Improve title messageMikaël Barbero1-13/+27
Change-Id: If96ecdf28a4ba446f4358e18bfdb94279a49c6e7
2013-10-18Merge all actions has to be updated on editing domain changeMikaël Barbero1-2/+6
Change-Id: Ib03370b66845f328e68f63956d75fa9740af8f9a
2013-10-18Do not add all diff to acc without testing it is filtered from viewerMikaël Barbero1-7/+3
Change-Id: I75033d1f34f37b3f65f069c1ef4461525f1beac2
2013-10-18Do not run async to prevent SWTException: widget has been disposed.Mikaël Barbero1-1/+1
Change-Id: I871db337c578bcb26ca89701b1a606eef10b6345
2013-10-18remove deprecated constructors.Mikaël Barbero2-22/+2
Change-Id: I247bf2634cec67b0fab380734c6a9541f61e7c84
2013-10-18Factorize out the cache of the computation of required differences.Mikaël Barbero8-378/+2040
Change-Id: Id85703c12ab2f053b421f94bf26a958ec8b96437
2013-10-18Minimize the number of events to dispatch.Mikaël Barbero6-467/+358
Change-Id: I02664fc2a594672cb237c1809c8a5d895f011d31
2013-10-18Fix initialization order of group providerMikaël Barbero2-9/+13
Change-Id: Ib4821bccbcc0b2eb99e594ffedd0f54f4b7c67f7
2013-10-18Rewrite viewer wrapper delegation logic.Mikaël Barbero4-429/+589
The decorated viewer is not leaked anymore through #input and event Change-Id: I50e2737a1f9921a5b0b41a4104f4162d35f58309
2013-10-18Use eventbus for IEMFCompareConfiguration.Mikaël Barbero14-630/+470
It simplifies event handling a lot. Change-Id: I622ecee5fa94ffb9a8f20bd1c5175cdf64e1054f
2013-10-18Comparison fails when files have spaces in their namesLaurent Goubet2-2/+2
Bug: 416983 Bug: 417424 Change-Id: I1f0a3490503cca4e6536aa3c17b5bfa0e947b230
2013-10-11Extract Toolbar in its own class.Mikaël Barbero3-342/+295
Change-Id: Id8c59c82c9db080b8e4937067ec5f42c03b28484
2013-10-11Fire changes when not one of the IEMFCompareConfiguration's one.Mikaël Barbero1-0/+2
Change-Id: Ic3fc12d61f0aeed266bb8692f0b2ef42ddaebad8
2013-10-11Add ComparisonScope to IEMFCompareConfigurationMikaël Barbero2-0/+32
Change-Id: I6926dcb1a4be5bb0ad6d737edeff63408b544e72
2013-10-11Move INavigatable to its own class.Mikaël Barbero3-255/+269
And only register it on EMFCompareStrutureMergeViewer's control and not EMFCompareDiffTreeViewer's tree. Change-Id: Ibd6abaa4e93cf4ed953cfa2af8e833040b583349
2013-10-11Externalize isFiltered utility method.Mikaël Barbero2-28/+47
Change-Id: I082310f159f27a62f24bab0f8ac276bcbe106299
2013-10-11Add support for reflective invokeMikaël Barbero1-1/+107
Change-Id: I362b0070cf7849c9719b8292fe2586b74ca0a245
2013-10-11Avoid the refresh of structure merge viewer to collapse the tree.Mikaël Barbero2-110/+1
Change-Id: Ie1d1421c9a01824ead8e0ac8a10f6d54977b34b9
2013-10-11Introduce MergeMode and rewrite actions.Mikaël Barbero22-1599/+645
This simplifies implementation of merge actions and all UI related to merge. Change-Id: I3330c7de23abbca9744d4082b11e2b30b26e9e2f
2013-10-11Make merge action listener to selection instead of SMV constantsMikaël Barbero14-381/+205
Change-Id: I88fb2e54ada0f51a549608591a29f63f5859b634
2013-10-11Enhanced EMFCompareConfigurationMikaël Barbero42-562/+776
- Define a listener interface on it with simpler API. - Create a forwarding compare configuration class (decorator pattern) to let wrap existing CompareConfiguration class and implement interfaces like IEMFCompareConfiguration. Change-Id: I7e2d1c377c32e175480e1b11d680a30748c742c7
2013-10-11Fix wrong call to async in safe sync methodMikaël Barbero1-2/+2
Change-Id: I7753b262e90192a6bea7072ce99095f4dfd4956a
2013-10-11[405273] - Fix UI does not detect invalid modelsAxel Richard3-3/+62
A message is logged, a pop-up is display with the error and the editor is closed. Bug: 405273 Change-Id: I4af6ea8c7dbff903d694ebe214323ee2bffe68bf
2013-10-04Remove storage of adapter factory property sheet adapter factory.Mikaël Barbero1-5/+0
It was never used. Change-Id: Idbc5f41e5ff594750bef27df77eef2ada7e6187f
2013-10-04[418601] - Fix invalid thread access when editing text valueAxel Richard2-1/+1
Bug: 418601 Change-Id: I4652a945de68b6af72e26f6b2b091c10717c9f13
2013-10-03[418600] Fix Undo/Redo menu items not availableAxel Richard5-13/+22
Bug: 418600 Change-Id: Ie3a5569c5e64872f0e4a5e887e7d362bf3ce5aa2
2013-10-03Factorized out filtering code.Mikaël Barbero6-57/+37
It is now the exact same code that is used in SMV and CMV. The only difference in CMV is that it also display prime refining differences. Change-Id: If66fbb319aadf5037fd18ef35ac90d6c14b3d2d2
2013-10-03[412075] Restore binary compatibility with Helios.Axel Richard2-2/+49
Compatible implementation of the org.osgi.framework.Version.compareTo(Version) method to avoid binary incompatibility with OSGi frameworks before they were compiled with Java 5. Bug: 412075 Change-Id: Ife2793de783d4baba8e0a3cb3aa835ae76e79f1a
2013-10-03Introduce IEMFCompareConfiguration.Mikaël Barbero4-246/+455
This avoids implementing property change listeners everywhere. Change-Id: Ie48052e7f9a18d8ce1fe3b2237649de032e15787
2013-10-02Give up handlers/commands - Back to actionsAxel Richard42-1296/+1402
Limitations of handlers/commands don't allow us to do what we want. Actions do. Change-Id: I343122dd947b65f0d6130c0ba90df04890b7ec19
2013-10-01Fix potential NPEMikaël Barbero1-12/+17
Change-Id: I386f6b62a7215ace6ab04951a21c3f8aea48eddc

Back to the top