Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.compare.uml2
AgeCommit message (Expand)AuthorFilesLines
2022-03-22Remove log4j 1 dependencylgoubet2-18/+1
2021-02-23Open ranges to accept Guava 30.1lgoubet1-3/+3
2019-11-05Switch EMF Compare to Guava 27lgoubet1-3/+3
2019-07-17[522080] [UML] Add-add conflicts in stereotype application not detectedChristian W. Damus1-2/+222
2019-07-16Shortcut the UMLPostProcessor's subset implications when possiblelgoubet1-4/+10
2018-02-05[522064] Profile-application version check too restrictive in three-wayChristian W. Damus2-14/+88
2018-02-02Add progress reporting for post processorsPhilip Langer2-8/+46
2018-01-30Bump plugin and feature versions for Photon3.3.3M5lgoubet2-2/+2
2018-01-24Removing the Papyrus plugins and features from the EMF Compare gitlgoubet1-1/+1
2017-11-22[519021] Check attribute of Multiplicity change before getting containerMartin Fleck1-8/+14
2017-09-07[516060] Opaque Action Body conflict resolution results in wrong bodyMartin Fleck1-2/+6
2017-09-01[518755] Mark resources as conflicting on errors during the comparisonPhilip Langer1-1/+1
2017-08-31[519025] Only consider references when finding stereotype base elementsMartin Fleck1-8/+6
2017-05-23[Performance] Loop invariants and other redundant method call and castsPhilip Langer1-3/+3
2017-05-12[516520] Avoid unnecessary notifications of comparison modelPhilip Langer1-6/+10
2017-05-11Compatibility with guava 21Laurent Goubet1-3/+3
2017-03-14Improve final state and MergeData when mergingLaurent Delaigue1-9/+17
2017-01-24Depend on JDK-7Laurent Delaigue3-9/+19
2017-01-24Fix useless TODO markers in different placesLaurent Delaigue1-2/+2
2017-01-20Merge algorithm refactoringLaurent Delaigue2-20/+56
2017-01-16Replace HashSet by LinkedHashSet in o.e.e.compare.uml2Laurent Delaigue15-37/+37
2017-01-13[508665] Delete EnumerationLiteral classifier changes from comparisonPhilip Langer1-2/+59
2016-10-13[501864] Refactoring of group providers & filtersLaurent Delaigue1-3/+2
2016-09-28[501864] Do not add refined diffs to conflicts of refining diffsPhilip Langer1-115/+66
2016-07-01[495259] Add support for UML profile migration scenariosMartin Fleck1-4/+20
2016-06-15Switch to Eclipse mars.2Mathieu Cartaud14-53/+71
2016-06-10[479449] Introduce MultiplicityElementChangesAlexandra Buzila15-59/+911
2016-01-08Add debug logging for merge actionsMathieu Cartaud2-2/+21
2016-01-05[484577] Make sure 'requires' are on the same sideLaurent Delaigue9-27/+51
2015-06-22ComparisonUtil.getComparison(diff) where neededLaurent Delaigue3-10/+13
2015-06-18Fix UML DanglingStereotypeApplication detectionAxel Richard1-3/+15
2015-06-18Add new UML DanglingStereotypeApplication conceptAxel Richard30-824/+1562
2015-04-27[463785] Add new concept in EMF Compare: ResourceLocationChangeAxel Richard2-6/+44
2015-03-16Removes unused @param tag (checkstyle)Philip Langer1-2/+0
2015-03-10[458147] Three-way merging for rejecting opaque element body changesPhilip Langer1-37/+149
2014-12-19[455677] Fixes insertion index of opaque element body values additionsPhilip Langer3-91/+196
2014-12-19[451365] Removes conflicts and implications of refining diffsPhilip Langer2-6/+23
2014-12-07[451365] Adds specific handling of opaque action, behavior & expressionPhilip Langer15-0/+1909
2014-10-10Modify merge to handle implications properlyLaurent Goubet4-1/+82
2014-10-02Bumping minor for all plugins/features changed since Luna SR13.1.0M2Axel Richard2-2/+2
2014-09-15[443330] Avoid getting a "Profile version change" error.Arthur Daussy1-5/+24
2014-07-18created parent module for bundles and features to factorize pom definitionsMikaël Barbero1-12/+3
2014-07-17Reworked Maven buildMikaël Barbero1-0/+9
2014-07-17remove unneeded directives in some pom.xmlMikaël Barbero1-9/+0
2014-07-07Test integration of profiles in EMF Compare.Arthur Daussy1-1/+1
2014-07-07Use stateful item providers for UML extensions.Arthur Daussy1-13/+13
2014-07-07Unit tests for DecoratorUMLProfileItemProviderAdapterFactoryArthur Daussy1-1/+1
2014-07-01Bump versions to 3.1.0 on masterLaurent Goubet1-1/+1
2014-06-26Adds UMLStereotypedElementChange post processor.Arthur Daussy3-1/+217
2014-06-23Add Stereotyped element change to the UML Compare meta model.Arthur Daussy22-894/+1193

Back to the top