Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/emfcomparercpuimessages.properties
AgeCommit message (Collapse)AuthorFilesLines
2017-06-26[514767] Provide preferences to configure comparison editor behaviorMartin Fleck1-2/+0
- Add preference for enabling the auto-selection of the first change - Add preference for enabling the auto-highlight of related changes - Add preference for setting the default expansion level of the tree - Move editor preference page to IDE UI (held no preferences previously) - Consider preference settings in SMV accordingly - Explicitly allow the creation of the NoSelectedItemViewer - Avoid unnecessary updates when selection did not change Bug: 514767 Change-Id: Iad7d26b3f3783e60268e8504add909151dc9cd5d Signed-off-by: Martin Fleck <mfleck@eclipsesource.com>
2017-03-08Fix verification in logging preference pageSimon Delisle1-0/+1
Previously, it was almost impossible to modify "Maximum file size" and "Maximum number of backup file". The verification was blocking any attempt to replace the value. With this fix we now check if these fields are valid and use the error message mechanism in Eclipse preference page to warn the user if these fields are invalid. Change-Id: I56ea1011ad0914e5a8144ed54cd909053526559c Signed-off-by: Simon Delisle <simon.delisle@ericsson.com>
2017-01-13Introduce ContentProviders for TreeContentMergeViewerStefan Dirix1-0/+5
This refactoring has two distinct goals: Clear separation of concerns in the code and allowing the user to customize the TreeContentMergeViewer. Currently the MergeViewerItem serves the dual use of wrapping the displayed model but is also responsible to determine its parents, children and stub elements. The later tasks are now separated to different ContentProviders. The content of the TreeContentMergeViewer is now determined by 'IMergeViewerItemContentProvider's which can be registered at the new extension point 'contentMergeViewerCustomization'. The default implementation uses the existing EMFCompare adapterFactory mechanism to determine the 'real' and 'stub' content of the TreeContentMergeViewer. Additionally the new 'ImergeViewerItemProvider's are used to determine the root elements of the tree, currently provided by the 'ICompareAccessors'. The new customizations are extensively used within the Papyrus customizations for EMFCompare. Change-Id: I5f3cc5143b71ed3f517e427868395a5e14638fea Signed-off-by: Alexandra Buzila <abuzila@eclipsesource.com> Signed-off-by: Stefan Dirix <sdirix@eclipsesource.com>
2016-09-12[495753] Fix preference pages inconsistent layoutsSimon Delisle1-10/+12
Reworked the layout of all preference pages to be more consistent and scalable. Bug: 495753 Change-Id: I3257de5507df50de0b8c7f75a80b39871462e1ff Also-by: Laurent Delaigue <laurent.delaigue@obeo.fr> Signed-off-by: Simon Delisle <simon.delisle@ericsson.com> Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
2016-06-03[493921] User can totally deactivate filtersLaurent Delaigue1-3/+8
Bug: 493921 Change-Id: I8f148aa1a7e19acf58389c0ffe8a4749774798ee Also-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr> Also-by: Philip Langer <planger@eclipsesource.com> Also-by: Laurent Delaigue <laurent.delaigue@obeo.fr> Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
2015-07-07[471010] Fix log4j config managementLaurent Delaigue1-2/+0
The log4j config initialization was made in rcp.ui which may not start before an EGit merge operation takes place, for instance. Moving this to rcp core solves the issue. Additionally, the preferences that indicate the max size of log files and the max number of log files to keep were systematically erased each time eclipse was restarted. Bug: 471010 Change-Id: Id05efc971853bd080425ffce7ab7b176b8744734 Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
2015-05-04Introduce logging with log4j.Laurent Delaigue1-1/+9
Preference page to allow users to activate logging and choose the target file. Logging is OFF by default, but configuration is saved and reloaded when eclipse is restarted. Change-Id: I2220d2d63e54b9afccea5b20042e698b58769059 Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
2014-07-18Adds Item provider preference page.Arthur Daussy1-0/+4
Creates a preference page to enable/disable adapter factories registered into EMF Compare. Change-Id: Ibaa61852769cc3a1710cc2bbd00bba30a7b1b391 Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
2014-07-07FeatureMaps: Handle FeatureMapChange differencesAxel Richard1-0/+1
FMC.add: an entry has been added on a side. FMC.delete: an entry has been deleted on a side. FMC.change: a key changed for the same value FMC.move: a value moved from a map to another Handle 2-way and 3-way, in detection, display and merge. Change-Id: I91ec59d8a779b46f1bc6633be21448669d98e044
2014-04-09Improves EMF Compare global preference page.Arthur Daussy1-0/+2
Removes useless buttons. Addd introduction label. Change-Id: I51bb0ee949a959ee6aa81596699576b85cd215d3 Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
2014-04-03fix englishLaurent Goubet1-1/+1
Change-Id: Ibab2798b3a96f4f9042edfbae9d573c25e5cc6fa
2014-04-02[429636] Add Group Synchronization behavior mechanism.Arthur Daussy1-4/+17
The user can now choose between several options to synchronize the current selected group in UI with preferences. Bug: 429636 Change-Id: I0027e89d63f6f667242d5f5c5e1429664993cc89 Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
2014-04-02[430372] Add synchronization behavior.Arthur Daussy1-31/+33
Add synchronization behavior between UI and preferences. Bug: 430372 Change-Id: I0518a645f173c122d8bd3499c6e9b864d46106f8 Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
2014-03-31[429636] Create preference page for groupsArthur Daussy1-0/+7
Create preference page to rank groups in order define which one will be used by default. Bug: 429636 Change-Id: If763cf54cef1f9f26c2714aca97b66e185f77270 Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
2014-03-26[430372] Preference page for filter.Arthur Daussy1-1/+3
Add a preference page for filters. Bug: 430372 Change-Id: I91d5c9c1d9b8086938c1cb0a49740d34ddeb94db Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
2014-03-24Remove useless preference tab.Arthur Daussy1-2/+0
Remove Filter and Group tab in editor preference pages since they have their on tab. Bug: 430372, 429636 Change-Id: I5697e9be7360b1f198b6f4d8b38cf686900dec66 Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
2014-03-19[427126] Layout correction for Windows OSArthur Daussy1-3/+3
Improve preference page layout four Windows OS. Bug: 427126 Change-Id: I1b17446437a1bbbc04075fdf4b0cb0cce79ac1f5 Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
2014-03-17Typo error in emfcomparercpuimessages.propertiesArthur Daussy1-3/+3
Change-Id: Id545135bff1eb3cbb3a0d7fe3d8a383dccf27f2b Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
2014-03-13[429636] Refactoring of IDifferenceGroupProviderArthur Daussy1-2/+0
Replace "defaultSelected" by a rank mechanism. Move description attribute to IDifferenceGroupProvider.Descriptor Bug: 429636 Change-Id: I5daab85c14a9c0bfc4856f84af2ac2b336481ac0 Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
2014-03-13[429441] Enable/Disable post processors.Arthur Daussy1-16/+17
Add UI to Enable/Disable post processors Add preference for post processors. Refactor preference page to be more generic. Bug: 429441 Change-Id: Ib9482e5bf23c378c20ac7bfcbe91cd4f7a5469a9 Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
2014-02-24[427126] Add match engne UI configurationArthur Daussy1-1/+15
Add the configuration for the match engine Add the extension point to register configuration Bug: 427126 Change-Id: I10dbd446cf92c0186bd736839d6d353f9395da2f Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
2014-02-19[427126] UI refactoring.Arthur Daussy1-1/+7
Improve UI. Bug: 427126 Change-Id: I455b1685809b393e74560f52721a1cae48bed2c4 Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
2014-02-18[427126] Add Match engine extension pointArthur Daussy1-2/+4
Bug: 427126 Change-Id: I0b3c066fc0e82ac41395521e830a5b5bcbd9015a Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
2014-02-18[427126] New extension pointsArthur Daussy1-4/+4
Introduce new extension point for Engines (Diff, Req, Equi, Conflict) that are register into EMF Compare framework. Those engines are used in workbench context. Bug: 427126 Change-Id: I1f597eebc74fa33e0cf6a0df9a6a6db8228b92b9 Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
2014-02-15Improve labelMikaël Barbero1-1/+1
Change-Id: I75f53136c79277b8a20e804b3d82523909e3f637
2014-02-14[426975] Add color preference for EMF Compare viewerArthur Daussy1-1/+14
Use theme to handle the color of EMF Compare viewer. Bug: 426975 Change-Id: Iaed37e2fac1edbb3ac8628e6b1d152a0fdd963c5 Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
2014-01-30Cleanup for version bumpingLaurent Goubet1-0/+18
- Bump versions to reflect minimal BREE change - Fix as many warnings as possible - Make sure our @since reflect the correct versions Change-Id: Ifb30b655f17ef2420ea5ca69c528910bd51e7649
2013-10-02Give up handlers/commands - Back to actionsAxel Richard1-1/+0
Limitations of handlers/commands don't allow us to do what we want. Actions do. Change-Id: I343122dd947b65f0d6130c0ba90df04890b7ec19
2013-05-31[402421] NotSerializableException when save the comparison modelAxel Richard1-0/+12
Display popup when catching the not serializable exception. Bug: 402421 Change-Id: I3743975da6b3aa3dd6cbce12254d4b4de3349ed4

    Back to the top