Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-02-03[421609] ProximityEObjectMatcher detects match even when Distance function ↵2.1.3RC22.1.32.1cbrun1-2/+2
sais no Fix the javadoc so that adopters don't get misleaded. Java, doing autoboxing, will allow Integer.MAX_VALUE but we do expect Double.MAX_VALUE Change-Id: I36f19fc78798d5f312cad3e4e0f67ffdcf858dc8
2014-02-03[421609] ProximityEObjectMatcher match even when Distance function sais nocbrun2-1/+75
Introduce a test to make sure the Proximity index will never return a "closest" EObject if it uses a distance which always return the MAX. Change-Id: I279c21dab920b75d312fbf41528dcc40f1d8cdfc Conflicts: plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java
2014-02-03fixing git tests failuresLaurent Goubet1-1/+1
Change-Id: Ic56f6156d3ad11a8a02e7eacf4f0db5e0a10c610 Conflicts: plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/egit/CompareGitTestCase.java
2014-01-30[426871] Externalize plugin.xml strings forKarla Rubio4-13/+28
org.eclipse.emf.compare.ide.ui and org.eclipse.emf.compare.rcp.ui Change-Id: Ifacdd944266ac5ef714837943c579455835b8228 Signed-off-by: Karla Rubio <karla.rubiosopan@servexternos.isban.es> Conflicts: plugins/org.eclipse.emf.compare.ide.ui/plugin.properties plugins/org.eclipse.emf.compare.rcp.ui/plugin.xml
2014-01-22bumping versions to reflect changes in built artefacts2.1.3RC1Laurent Goubet65-117/+117
Change-Id: I2a1fa6f28c750ff67d8718e2306f7ad68fbaf8ca
2013-10-09Second go at trying to disabling maven descriptorsLaurent Goubet1-0/+10
2013-10-03Update Helios target platform2.1.2RC12.1.2Laurent Goubet1-2/+2
2013-10-03Make sure we remain compatible with HeliosLaurent Goubet1-347/+363
2013-10-03Update signing procedureLaurent Goubet2-98/+73
Change-Id: I4a0df181d15831d55ef47135a1b5e637237e47e7
2013-10-03Disabling maven descriptor (see also 401040)Laurent Goubet1-0/+10
Change-Id: I1ec838c7a4927439499c5de096c4936ea9043d06
2013-10-03Ensure that !EMFResourceMapping.equals(SimpleResourceMapping)Mikaël Barbero4-166/+699
hashCode() and equals() of ResourceMapping only delegate to model objects. This is wrong as our own implementation for EMF should not be equals to simple resource implementation if we want to override default behavior. Change-Id: I5a51c09df4dc88a3db72d53b1e7d1dc7af8b0e0a
2013-10-03Remove minimum require bundle version on ecore tools.Mikaël Barbero3-3/+1
2013-10-03Updating version numbers for 2.1.2Laurent Goubet42-872/+872
2013-10-03[412075] Restore binary compatibility with Helios.Axel Richard3-3/+52
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: I5b8e0e52a60d91be6d94b20ddcb403087480cfff
2013-08-19Update version number to 2.1.1 (Kepler SR1)2.1.1RC22.1.1RC12.1.1Mikaël Barbero65-117/+117
Change-Id: Ie12380a25166b017b16dec848a75e4914df8d9d5
2013-08-19Backport fix of a36c7e2 and 2bee5f8 (potential IOO BoundException)Mikaël Barbero1-14/+16
2013-08-19Workaround bug 293926 only when installed on 3.7 and previous ↵Mikaël Barbero1-1/+16
releases(cherry picked from commit a18ee80862fa1d6f6824a5ecf17ed770ae405d33)
2013-08-19Activate by default the "by side" group(cherry picked from commit ↵Mikaël Barbero1-1/+1
019610c770efbf18ede3f9a3f021e7271996e4b4)
2013-08-19Do not contribute more than one content merge viewer for Diagrams.Mikaël Barbero12-452/+59
(cherry picked from commit e731fc2b441f5616e7025c3082b1b4d66c680465) Conflicts: plugins/org.eclipse.emf.compare.diagram.ide.ui/plugin.xml
2013-08-19Use EMF Compare's AdapterFactory registry in content merge viewer.Mikaël Barbero2-2/+4
Change-Id: Iec1ec4d9e78231f424e6ab1c4044cc451f33961a Signed-off-by: Mikaël Barbero <mikael.barbero@obeo.fr> (cherry picked from commit 75b44a619abc4b1694386a0c4d964b3a2e4f4c80)
2013-08-19[411663] Prevent comparison between an object and one of its container.Axel Richard2-161/+182
Bug: 411663 Change-Id: Ibea41f025cf8113f5c4a1c8153079c41bd8b0980(cherry picked from commit 22322cb221a2bbd8a559d919538e92087d92b745)
2013-08-19Tunes the Distance Weightscbrun2-18/+46
A few issues have been identified and are fixed with this commit : - subsequent diffs for multi-valued features adds up a lot leading to no-match. - the default weight for "having the same parent" (getParentWeight) is too low in the general case. With these changes I ends up with only 3 results which are different from EMF Compare 1.x and each of them is better. Change-Id: Idee429fcf1558046504a3986c76f8f0eb8f7b882 (cherry picked from commit ac327e08adec64c7015e8ed6652d5fae85b18535) Conflicts: plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EditionDistance.java
2013-08-19Avoiding Complexity Explosioncbrun4-60/+165
This commit introduces a new mechanism to limit the CPU complexity of the match by content algorithm when there are many EObjects of the same type to match. It introduces a new interface EObjectIndex's might implement : MatchAheadOfTime. If an index implements this interface it will be asked by the Matcher, from time to time, to provide elements to be matched whereas the whole scope has not been processed yet. The default implementation in ProximityIndex checks for the number of elements kept in its storage and depending on this number decides to return elements to match ahead or not. This effectively cut the CPU complexity on models having for instance 10K elements of the same type, this has a drawback though : when this mechanism is triggered, we can no longer guarantee the match will be the "best match ever" as some elements have been matched before all the candidates where known. ProximityEObjectMatcher.NB_ELEMENTS_BETWEEN_MATCH_AHEAD = 10 000 means every 10 000 elements the matcher will ask the indexes for elements to match ahead. ProximityIndex.SEARCH_WINDOW = 1000 means a given index (which holds all the elements of a given type) will only return elements to match ahead if it has more than 1000 elements to match already. These values means the match ahead will have no impact on models which have less than 10 000 elements or which don't have more than 1000 elements of the same kind. Matching guava.uml (50K elements) goes from 50s to 11s to match the model 10 times. Change-Id: I0f9c6f536336aea1742389c991e3c672a67a154c (cherry picked from commit 58056c73a4fc086d5face4aa385115ba74fcedfe)
2013-08-19Minor typoLaurent Goubet1-1/+1
(cherry picked from commit 96fa7a6d5d86973bcbc3ef81377904deff4a576f)
2013-08-19Include schemas in source build.Laurent Goubet1-16/+16
Change-Id: Icb63a8db9a5c4de132497f382079d83310550ca6 (cherry picked from commit c5334363fbcebb121faa627a4b7ae0ea953bdf2b)
2013-08-19[412088] NPE in CVS Team Support due to EMFResourceMappingVictor Roldan Betancort1-9/+4
Bug: 412088 Change-Id: I7b48dd1f08a1a5fcd3a6f70f6b88981f3ab38dfd (cherry picked from commit fa51d2e0021b3b7f33d7de4a5da2129aed1cff84) Conflicts: plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFResourceMapping.java Signed-off-by: Victor Roldan Betancort <vroldan@opencanarias.com>
2013-08-19[412315] Increase visibility of EditionDistance.getThresholdRatio(int)Victor Roldan Betancort1-27/+33
to protected Bug: 412315 Change-Id: I99f87b747fa56839d6cb6d6ed279e3038e15472c (cherry picked from commit a7b3710ac2b23224fd5119dd7feae6d4aa6996ca) Conflicts: plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EditionDistance.java Signed-off-by: Victor Roldan Betancort <vroldan@opencanarias.com>
2013-08-19[412181] Flexible delegation on IdentifierEObjectMatcherVictor Roldan Betancort1-299/+317
Bug: 412181 (cherry picked from commit 65a5fcaeca6223fa08861ebbd0b22c465fe2b5d3) Signed-off-by: Victor Roldan Betancort <vroldan@opencanarias.com>
2013-08-19Always use latest EGit.Laurent Goubet1-1/+1
Change-Id: Ieac48abc0e0a838421611a2e04545174fb67873f (cherry picked from commit 6b0a6155f6a6b89921c7f9ffb5ba01c41f86ad2e)
2013-08-19add Kepler final target platform definitionMikaël Barbero2-507/+541
Change-Id: Ibce1c36be781700746439640e830a26bcd762289 (cherry picked from commit 90f2d0fd5e0dc7f8b51de5a9076c8fe478d1a486)
2013-08-19[409374] Consider RessourceAttachmentChanges in requirementsLaurent Goubet2-22/+51
Bug: 409374 Change-Id: If46473e6c76335c6f221d7d48e55c0aea225edb7 (cherry picked from commit be943cac6f92d75296b4ccd141124bc8e8556de9)
2013-06-14[410738] add p2.inf to still provide org.eclipse.emf.compare.ui and allow ↵2.1.0aMikaël Barbero1-0/+3
clean update
2013-06-10[410197] undo/redo actions not available when opening text compare.2.1.0Laurent Goubet3-10/+54
Creating and registering the actions on focus changes events of the text merge viewers is not enough to enable them when the viewers do not have focus (at selection). Bug: 410197 Change-Id: Ibd171928217d560f9247f7c3926ec34113af66d7
2013-06-10Merge "Fix label provider for UMLDiff." into 2.1Laurent Goubet1-3/+48
2013-06-10Fix label provider for UMLDiff.Cedric Notot1-3/+48
It allows to benefit from the add of overlay images (when the diff is merged for example). Change-Id: Iede0298f93fa8436a1004201874d082cd8550b85
2013-06-10Fix requirement link between a unit difference and a macroscopic change.Cedric Notot4-13/+84
It is required to build a requirement link between a unit difference and a macroscopic change to delete all impacted objects (in a macro object) by a delete of a unit object. For example, the delete of a UML Class involves the delete of the "element" reference coming from a GMF Node. This last difference is embedded in a macroscopic change (the delete of the set of the related GMF nodes representing a graphical object). So, the delete of the unit UML Class requires the delete of the macroscopic graphical object. This link is built in the same way as the one between 2 macroscopic changes. Change-Id: I2dac280c573ac7805a0080b0044c749bfab5fc02
2013-06-10[410073] Cache the groups instead of recomputing them every single time.Laurent Goubet1-4/+12
Since groups lack a proper implementation of equals(), recomputing them prevents the structure viewer from preserving its expanded state. That is not a major hindrance per se, but it also causes concurrent modification exceptions in the current state of the dual command stack. Bug: 410073 Change-Id: Ib29d00be0f734e6db7fb743e509657aff6c2cd88
2013-06-10Removing useless codeLaurent Goubet2-11/+5
2013-06-10Merge "[410036] Fix bug on CascadingFilter" into 2.1Laurent Goubet1-2/+7
2013-06-07[410036] Fix bug on CascadingFilterAxel Richard1-2/+7
When merge a delete diff, the subdiffs were not hidden anymore. Bug: 410036 Change-Id: Iebdf04ace1a5ede5bf6a9801c24b43452f847422
2013-06-07[409503] Allow merging of ResourceAttachmentChanges in new resources.Laurent Goubet3-19/+31
Bug: 409503 Change-Id: I97415ee866f3f38a37378fbf7a58f57d4c177814
2013-06-07[410072] Properly save right content from textual viewers.Laurent Goubet1-5/+5
Bug: 410072 Change-Id: I493dcb94118ca55d3d544239c6c57bfb23eba860
2013-06-07[410071] ArrayIndexOutOfBounds selecting a difference after "merge all"Axel Richard2-3/+3
Fix: access to list only if it's not empty Bug: 410071 Change-Id: If5df1a864e72bb845f36319f9ee80ce692704e2c
2013-06-04[409514] ConcurrentModificationException selecting a diagram differenceCedric Notot1-78/+25
Bug: 409514 Change-Id: I644468a4cfa106160e9c82bba62240125b3e3493
2013-06-04Move Save Comparison Model Handler from RCP UI to IDE UI PluginAxel Richard10-95/+84
-Delete dependency to org.eclipse.compare in RCP UI Plugin -Delete dependency to org.eclipse.core.expressions in RCP UI Plugin -Add dependency to org.eclipse.core.expressions in IDE UI Plugin Change-Id: I5ef8432d1cfa3fcbcc60053da48ba75e7abcc8a3
2013-05-31Merge "[396260] The structure merge viewer should not unload all resources" ↵Mikael Barbero1-5/+14
into 2.1
2013-05-31[396260] The structure merge viewer should not unload all resourcesAxel Richard1-5/+14
When comparing EObjects from a resource, the resource involved doesn't need to be unload by EMF Compare. Bug: 396260 Change-Id: I04ebc11483c8b4046f02bc75ef347d4e0d16be24
2013-05-31[402421] NotSerializableException when save the comparison modelAxel Richard3-1/+109
Display popup when catching the not serializable exception. Bug: 402421 Change-Id: I3743975da6b3aa3dd6cbce12254d4b4de3349ed4
2013-05-31[406406] Fix Decorators may be shifted in relation to the focused objectCedric Notot1-1/+4
Bug : 406406 Change-Id: Ib4946ecaf768827896f1a5c179ef24dade4366c5
2013-05-31[409293] Fix for Exporting comparison model fails after a mergeAxel Richard1-0/+2
Disable export comparison model action when editor is dirty. Bug: 409293 Change-Id: If7f828e2cc375e7e109274cc2826f719d73ba2c0

Back to the top