Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.compare/src/org/eclipse
AgeCommit message (Expand)AuthorFilesLines
2014-01-30Cleanup for version bumpingLaurent Goubet13-317/+282
2014-01-28[421609] ProximityEObjectMatcher detects match even when Distance function sa...cbrun1-2/+2
2013-11-19Fix condition bug in ProximityEObjectMatcher#createMatchesAxel Richard1-1/+1
2013-10-18[406402] - Fix conflicts are created after merging and savingAxel Richard1-3/+3
2013-10-11Introduce MergeMode and rewrite actions.Mikaël Barbero5-123/+303
2013-10-11Deprecate static factory method in favor of constant where possible.Mikaël Barbero1-13/+23
2013-09-30Improve performance of Comparison cross referencers.Mikaël Barbero4-170/+214
2013-09-27Update UML Specific AccessorsAxel Richard1-0/+19
2013-09-26[417790] Highlighting of required diffMikaël Barbero1-10/+6
2013-09-25Add javadoc to overlay class and simplify its implementation.Mikaël Barbero2-0/+22
2013-09-24[416400] - Fix IOWrappedException by adding a ConflictMergerAxel Richard2-1/+140
2013-09-23Eviction Strategy for Cachescbrun3-7/+65
2013-09-05Happy checkstyle!Mikaël Barbero1-58/+134
2013-08-19Fix regression introduced in a36c7e21f7243a0019d1a63cd2d997ec4a2d5826Mikaël Barbero1-1/+1
2013-08-14Fix potential IndexOutOfBoundExceptionMikaël Barbero1-14/+16
2013-07-29Add diagnostic to comparison object.Cedric Notot2-0/+75
2013-07-25[413606] Move differences are not display in the structure merge viewerAxel Richard1-1/+16
2013-07-24Tunes the Distance Weightscbrun2-16/+44
2013-07-24Avoiding Complexity Explosioncbrun4-60/+165
2013-07-23[413511] Do not include root of TreeIteratorMikaël Barbero1-1/+1
2013-07-22Fix IllegalArgumentException when merging in ReferenceChangeMergerCedric Notot1-2/+3
2013-07-16Merge "Refactoring of the mergers"Laurent Goubet6-583/+322
2013-07-16Refactoring of the mergersMikaël Barbero6-583/+322
2013-07-16Refactor Groups.Mikaël Barbero1-1097/+1097
2013-07-12[410737] preserve ordering even for equivalent differences.lgoubet2-790/+875
2013-07-12Missing implementations of Conflict derived methodsLaurent Goubet1-0/+58
2013-07-12Minor typoLaurent Goubet1-1/+1
2013-07-08[412316] Make CachingDistance publicVictor Roldan Betancort2-136/+136
2013-07-08[412315] Increase visibility of EditionDistance.getThresholdRatio(int)Victor Roldan Betancort1-633/+633
2013-07-08[412181] Flexible delegation on IdentifierEObjectMatcherVictor Roldan Betancort1-299/+317
2013-06-27[398361] Enhanced Model Merge UIAxel Richard5-943/+1260
2013-06-21Filling of the implication link with UML subsets.Cedric Notot11-1229/+1568
2013-06-20Missing copyrights, typoLaurent Goubet2-0/+20
2013-06-19Fix requirement link between a unit difference and a macroscopic change.Cedric Notot1-9/+43
2013-06-19Deprecate use of EMFCompare#createDefaultScope(...)Laurent Goubet1-0/+6
2013-06-18[409374] Consider RessourceAttachmentChanges in requirementsLaurent Goubet2-22/+51
2013-06-10[409503] Allow merging of ResourceAttachmentChanges in new resources.Laurent Goubet1-2/+10
2013-05-29Replace Guava's loading caches by HashMapcbrun2-41/+38
2013-05-29Replace Guava's Cache by simple HashMapcbrun1-12/+38
2013-05-29Avoid a few getMatch() callscbrun1-2/+2
2013-05-29Extract variable replacing eContainer() callscbrun1-2/+3
2013-05-29Make sure eContainer() has been matched beforecbrun1-26/+51
2013-05-27Use a single pass to filter and weight the features.Laurent Goubet1-18/+7
2013-05-27Single iteration and no useless temporary list to find match of EObjectLaurent Goubet1-17/+13
2013-05-24Use Sets instead of Lists when the collection is mostly used for lookupsLaurent Goubet1-10/+10
2013-05-24avoid reflective Class.isArray() in common cases.Laurent Goubet1-0/+4
2013-05-24Do not use loops to remove from a listLaurent Goubet1-12/+4
2013-05-24Unresponsive UI with large modelsLaurent Goubet1-11/+14
2013-05-24Minimize number of calls to EqualityHelperLaurent Goubet1-10/+26
2013-05-24Using a "maximum size" eviction strategy does not scale well.Laurent Goubet1-3/+2

Back to the top