Skip to main content

Tentative IP Log for modeling.emfcompare

This tentative IP Log is generated dynamically from automatically collected project information. This information has not been vetted for accuracy by the Eclipse Foundation and may not represent the true state of the IP of this project(s). Please refer to the official approved IP Log(s) associated with the official release(s) of this project(s) for more information.

Licenses

  • Eclipse Public License v1.0

Third-Party Code

Pre-Req Dependencies

CQThird-Party CodeLicenseUse
5460Google Collections Version: 1.0 (PB Orbit CQ3679)Apache License, 2.0unmodified binary
6518Guava Version: 10.0.1 (PB Orbit CQ6121)Apache License, 2.0unmodified binary
7056Guava Version: 11.0.2Apache License, 2.0unmodified source & binary
8824google-diff-match-patch Version: r106 (PB CQ7404)Apache License, 2.0modified source
9271DaisyDiff Version: 1.2Apache License, 2.0, Eclipse Public License (Two Files)modified binary
9311Neko HTML Version: 1.9.14 (PB Obit CQ4806)Apache License, 2.0unmodified binary
9312Apache Xerces Version: 2.8 (PB CQ2093)Apache License, 2.0unmodified source & binary

Exempt Pre-Req and Works With Dependencies

No Exempt Pre-Req or Works With dependencies

Committers

Past and Present Active
Name Organization  
Mikael Barbero Eclipse Foundation
Cedric Brun OBEO
Mathieu Cartaud OBEO
Arthur Daussy OBEO
Laurent Delaigue OBEO
Stefan Dirix Innoopract GmbH
Moritz Eysholdt TypeFox GmbH
Laurent Goubet OBEO
Patrick Konemann itemis AG
Philip Langer Innoopract GmbH
Jonathan Musset OBEO
Cedric Notot OBEO
Axel RICHARD OBEO

Contributors and Their Contributions

Ref Size Description
Alex Lagarde (obeo.fr)
377776 16651 bytes Merging issues : PositionEAdapter are not removed by EFactory.eAdd()
Attachment 214612: An updated version of the EFactory that unregisters the PositionEAdapter
357942 356 bytes Merging Issue with models generated in CDO-native mode
Comment
Alexander Nyßen (itemis.de)
301112 227292 bytes Introduce IMatchScope to allow restriction of MatchEngine's search room (choice between resource/resourceSet comparison) and to fix false-positives in combination with external filters and fragments
Attachment 166753: Revised pach, adopted to current EMF Compare HEAD as of 02-05-2010
Alexandra Buzila (gmail.com)
1799b4 14 lines [448464] Source list incorrectly determined when undoing changes
23bd60 206 lines [446252] Issue with feature ordering when merging FeatureMaps
537aab 52 lines [450360] Warning for duplicate IDs
8b51e7 71 lines Fixed typos in the Tutorial, Developer guide, Logical model
Alexandra Buzila (eclipsesource.com)
0c92d4 101 lines [470332] Resolving a conflict causes loss of previous changes
104573 4755 lines [467677] Detection of binary identical resources
28c8d6 117 lines [457117] Race condition on save
389e4e 7 lines [471157] StackOverflow in ThreeWayComparisonGroupProvider
46cf1f 7 lines [462938] Merge dialog freezes when merging submodel changes
4f2ddd 654 lines [470147] Logical model resolution of remote side fails
5f1df3 76 lines [483798] Introduce Papyrus label providers for UML models with Profiles
92ca6a 3 lines [487306] SyncModel error diagnostics not displayed
bb0362 61 lines [469105] No changes for comparison with previous from History view
d27f86 133 lines [484557] ResourceAttachment vs Attribute conflicts
db3c0a 660 lines [487119] Improve diagnostics handling in comparison viewer
f0c44d 654 lines [470147] Logical model resolution of remote side fails
f6103d 4755 lines [467677] Detection of binary identical resources
f79331 244 lines [478620] Cherry pick operation hangs
Ali Akar (gmail.com)
297305 6094 bytes Externalize the creation of org.eclipse.emf.compare.ui.ModelCompareInput
Attachment 154095: A patch file for project "org.eclipse.emf.compare.ui"
297463 2733 bytes NPE when comparing two objects under the same container/file
Attachment 154216: Proposed patch
Andreas Mayer (gmx.net)
356097 5012 bytes NPE and wrong change description in compare editor if an UpdateReference has neither a left nor a right target
Attachment 202396: Patch for UpdateReferenceItemProvider r1.22
Andreas Mayer (gmx.de)
0e06ce 304 lines [469853] Unresponsive merge viewer with reference changes that yield
26b297 304 lines [469853] Unresponsive merge viewer with reference changes that yield
Andreas Scharf (cs.uni-kassel.de)
379740 5272 IllegalArgumentException in EMFCompareEObjectCopier
Comment
Arthur Daussy (obeo.fr)
04d237 20 lines [429441] User doc update: Post processors configuration
066b35 25 lines Correction of 2 checkstyle errors.
0dac45 134 lines Regenates .edit code for DiagramCompare metamodel with EMF 2.10.
1941ae 206 lines New tests: Test ItemRegistry
1963a2 11 lines Correction of unit tests for
1be723 1 lines Add a description to "Diagram Refined elements".
1cb225 47 lines [430372] Documentation update.
2040c1 723 lines New tests: Test MatchEngineFactoryRegistryWrapper
21f730 4 lines Engines preference page: Correct message dialog
2924be 3 lines Avoid unnecessary dialog when commiting non fragmented dialog.
2b85e0 3 lines [427126] Build correction.
2fe3cd 60 lines [427126] User doc update: Engine configuration
3282c8 19 lines Prevent changing group twice for only one selection.
39d97b 1888 lines StereotypedElementChangePostProcessor unit tests.
43eb89 6 lines Typo error in emfcomparercpuimessages.properties
46d1f6 3 lines Avoid unnecessary dialog when commiting non fragmented dialog.
471ed0 1 lines Add description for "UML refined element" filter.
488740 9 lines Item providers preference page documentation.
48f2a7 192 lines Use stateful item providers for Diagram extensions.
4ad0c2 392 lines Adds Item provider preference page.
4b3ecc 575 lines [429636] Add Group Synchronization behavior mechanism.
4c6021 570 lines Test integration of profiles in EMF Compare.
4c6ac2 306 lines Use stateful item providers for UML extensions.
4dde60 12 lines Correction on UMLDifferencesOrderTest.
54e2b5 577 lines [430682] Refactoring of IModelResolver
565825 2 lines [429441] Extend UML Post process ui.
5a448b 296 lines Generates UMLCompare source code with EMF 2.10
5ad347 1623 lines [427126] Add match engne UI configuration
5ce26c 2327 lines [427126] New extension points
5f3de9 18 lines [427126] Layout correction for Windows OS
606c02 7 lines [427126] Add default constructor to DefaultDiffEngine
61f6b1 23 lines [430682] User Doc: Model resolution
6474b0 398 lines Customizes the way StereotypeAttributeChange and StereotypeRefenceChange
68812e 8 lines Updates external adapter factories.
695994 215 lines Filters EMF compare adapter factories using preferences.
6fd6dc 798 lines [427126] Add Match engine extension point
705a95 539 lines Cutomization of the way stereotyped elements are displayed.
7330d4 402 lines [434828] Test Merge Conflict Diff With Conflicting Diff With RequiredBy
752b61 374 lines [430682] New test: Test ModelResolverManager
7ba319 34 lines Improvements and corrections on MatchEngineRegistryWrapper.
7f88ae 74 lines [430682] Improves ModelResolverManager
7fe7bf 281 lines [427126] UI refactoring.
83af1e 12 lines Improvements and corrections on ItemRegistry
8538ce 698 lines [429636] Refactoring of IDifferenceGroupProvider
8df473 8 lines Correct typo error on IMPL_CLASS_DESCRIPTOR_ATTR in
931d5b 472 lines EMF Compare tutorial: Tutorial part 1
9872f0 2 lines [430682] Correction on ModelResolutionPreferencePage
98a5c7 1 lines Correct Helios compatibilty break.
9972b5 73 lines Use width hint in preference pages
9ac30d 472 lines EMF Compare tutorial: Tutorial part 1
9efd97 2 lines Typo error in developer documentation.
9f2311 6 lines Correct the order of processing post processors.
9f9d0b 1296 lines UI improvement: Prevents freezing UI during groups building.
a0520c 980 lines Regenerates EMF Compare static test profile.
a303c5 218 lines Adds UMLStereotypedElementChange post processor.
a3ed4c 502 lines Adds custom stereotypes icons.
a8a838 367 lines [430372] Preference page for filter.
aab629 30 lines [429636] Documentation update: Groups
abba5e 562 lines [434827] Wrong overlay icon after merge
ad7dfc 244 lines Tutorial part 2 : Git
b0d00f 2 lines Add description and label to "Diagram post processor"
b0e324 468 lines [430372] Add synchronization behavior.
b1b44d 2343 lines Add Stereotyped element change to the UML Compare meta model.
b594af 6 lines [432033] Do not reset Group and filter after saving.
b6e456 365 lines Unit tests for DecoratorUMLProfileItemProviderAdapterFactory
b6e924 17 lines Improves EMF Compare global preference page.
b86d4f 919 lines [426975] Add color preference for EMF Compare viewer
b90eb5 301 lines [430682] Preference page for Model Resolving mechanism
c210a5 13 lines Fix @ since
c3e8a2 5 lines [435612] Prevents memory between selection in TreeMergeViewer
c69ed4 5 lines [434714] Add EMF Content type to model provider
ca75fd 6 lines Corrects possible NPE on resource resolving.
cb1438 2 lines Add @noimplement and @noextend to IMatchEngine.Factory.Registry
cbde4c 13 lines Groups and Filters preference page: Lines up label with combo.
ccd48a 83 lines [430372] Refactor filters.
ce47ba 45 lines Improves preference page UI.
cf3ca4 15943 lines EMF Compare tutorial: EXTlibrary plugins
d014f0 39 lines Remove useless preference tab.
d023c7 2070 lines Name refactoring.
d34461 408 lines [435365] CascadingFilter shouldn't filter out changes in moved objects
dc8ef9 6 lines Corrects possible NPE on resource resolving.
dee08b 12 lines Remove Google API leak.
e4f7d8 966 lines [434822] Conflict between move and delete
e61de1 22 lines Correct order on post processors.
e67835 15943 lines EMF Compare tutorial: EXTlibrary plugins
e735ec 2166 lines Unit test for MDT Papyrus differences order.
e931f7 2048 lines [429441] Enable/Disable post processors.
eb3ab4 33 lines [431785] Correct synchronization mechanism
eddddc 2166 lines Unit test for MDT Papyrus differences order.
f3ba6d 1184 lines UML differences order test.
fc3f44 2233 lines [429636] Create preference page for groups
358225 32840 bytes [EMF Compare] Extension point for IPAF registration
Attachment 204929: New patch
360757 702543 bytes Integration of SysML language into EMF Compare
Attachment 205811: Plugins for SysML integration after refactoring from observation
360757 16548 bytes Integration of SysML language into EMF Compare
Attachment 206472: Feature for SysML Integration
361379 1196 bytes [EMF Compare UML] Change priority of Diff and Match engine of UML plugin
Attachment 205508: Patch to modify priority
361531 5047 bytes [EMF Compare UML] Add modification in org.eclipse.emf.compare.uml2.tests
Attachment 205622: Modification of the visibility of getDiagramKindPath()
361531 3244 bytes [EMF Compare UML] Add modification in org.eclipse.emf.compare.uml2.tests
Attachment 205740: Make AbstractUMLCompareTest usable for heritage
361666 3406 bytes [EMF Compare UML] Update Reference difference target to the wrong targets when target is a stereotype
Attachment 205735: Possible correction
358122 1888 bytes [EMF Compare UI] Enable to handle all descriptors in UI
Comment
Axel Richard (obeo.fr)
01c0f0 84 lines [399724] fix bug on items order in the structure merge viewer
1ec144 3907 lines [398360] Provide content merge viewer for resource attachment changes
4ee5ec 10397 lines [399456] Managed enhance readability of Resource Attachment Change
6f9601 903 lines [401440] Adjust API to be able to read the description of a difference.
6fb047 79 lines [401873] Display unresolved differences number next to groups names.
7ea9ec 6042 lines [398358] Extension point for filters and groups
81974f 89 lines [401854] Expand and collapse buttons on structure and content merge
9be62b 7 lines [399270] Disable save comparison model button
9da022 3219 lines [401659] New filters and trees under groups
a65a3a 2649 lines [403187] Ordering post processors
c8c4ba 4515 lines [402536] Merge sub diffs when filter "Sub diffs elements" is active.
db9933 580 lines [398099] enhanced labels in structural viewer
dedaab 3912 lines [403055] Provide a match engine extension mechanism.
eac77a 637 lines [399456] Managed enhance readability of Resource Attachment Change for
Benjamin Klatt (fzi.de)
397428 1022 bytes IllegalStateException in ReferencesCheck.createNonConflictingReferencesUpdate()
Attachment 225205: Patch to fix the IllegalStateException
Benjamin Muskalla (tasktop.com)
351763 1289 bytes NPE when using EMF compare inside dialog
Attachment 199453: proposed patch
C. Thompson (gmail.com)
387048 324960 bytes *.ecorediag File diffs do not properly display class names
Attachment 220225: Patch for bug
Cedric Notot (obeo.fr)
351593 3806 bytes Merge StereotypeApplication : required ProfileApplication should also be merged
Attachment 205141: Fix for regression
357916 5779 bytes The merge of a difference extension has no effect
Attachment 203477: Correction of the bug
359421 13237 bytes API to open emf compare editor with initialization of selection
Attachment 204290: Open editor with selection API
359540 10285 bytes API to query the viewer for the list of visible changes
Attachment 204359: Patch for the API
359590 239805 bytes Some improvements
Attachment 204398: The patch
360560 71218 bytes API to open a view with a differences tree and a given filtering and ordering
Attachment 204959: Patch for API (view management)
361344 1816614 bytes Duplication of model root in the difference view
Attachment 206142: Fix
361614 13213 bytes API to get viewer with a differences tree and a given filtering and ordering
Attachment 205693: The patch for this new feature
361674 6722 bytes Exceptions are thrown when getVisibleDiffElements(CompareEditor) API is called
Attachment 205738: Bug fix
362043 1267 bytes Only the last selected filter is taken into account
Attachment 205971: Fix
370723 4416 bytes Regression on setSelection() API
Attachment 210583: Patch
370727 12607 bytes It is not possible to call the ModelComparator.compare() API inside an existing thread UI
Attachment 210587: Patch
370728 973 bytes Papyrus Diagram comparison on notation files
Attachment 210589: Patch
Csaba Koncz (gmail.com)
199745 17955 bytes When merging a reference change emf compare may loose the order of the references.
Attachment 172214: Code changes
199745 28587 bytes When merging a reference change emf compare may loose the order of the references.
Attachment 172215: test cases
199745 32886 bytes When merging a reference change emf compare may loose the order of the references.
Attachment 176980: Test cases with copyright and test methods for rightToLeft merging
199745 5912 bytes When merging a reference change emf compare may loose the order of the references.
Attachment 176989: code fixes for rightToLeft merging
Dimitris Kolovos (cs.york.ac.uk)
238423 4695 bytes Selecting the matching engine
Attachment 105912: Patch for org.eclipse.emf.compare.ui
238423 9919 bytes Selecting the matching engine
Attachment 105913: Patch for org.eclipse.emf.compare.match
Ed Willink (willink.me.uk)
365528 287 bytes Inccurate org.eclipse.emf.compare.uml2 plugin.xml
Comment
Eike Stepper (esc-net.de)
390845 2775 bytes Make it easier to customize FilterComparisonScope
Attachment 221729: Patch of FilterComparisonScope
390846 3572 bytes Make it easier to customize DefaultMatchEngine
Attachment 221731: DefaultMatchEngine Patch
Gonzague Reydet (gmail.com)
270730 115481 bytes Match & Diff engine association using content-type instead of file extension
Attachment 152873: Patch implementing the engine association within content-type and namespace
295858 2228 bytes ReferenceOrderChanges generated for elements with close URIs
Attachment 152855: Patch that seems to fix the issue
295883 22319 bytes Need for API extensibility
Attachment 152876: The needed API modifications
296905 7507 bytes IndexOutOfBoundsException when comparing proxies with segment-less URIs
Attachment 156526: Add a test case to my previous patch
305479 9397 bytes Enable applications to use custom implementations of ModelCompareInput
Attachment 164024: Updated patch to use interface instead of abstract class
Hajo Eichler (gmx.de)
199248 27952 bytes Using diff.edit code instead of own Label/ContentProvider
Attachment 75851: Extended Patch for using edit code
Jan Reimann (gmail.com)
ae83e9 783 lines Support comparison through Subversive
fe5f4a 783 lines Support comparison through Subversive
308306 1507 bytes Comparing textual representations of models returns null as IContentDescription
Attachment 164019: null check patch for EclipseModelUtils
308351 1717 bytes ClassCastException in ModelContentPreviewViewer when pressing back button
Attachment 164081: patch containing an instanceof check
308446 2506 bytes Comparison of in-memory models needs independence of Resource
Attachment 164183: fixes my copy paste error
316429 4517 bytes Comparing a model with resource with an in-memory model results in an empty right pane
Attachment 171616: solves the bug at two places
Karla Rubio (servexternos.isban.es)
f03564 41 lines [426871] Externalize plugin.xml strings for
f6f925 49 lines [426871] Externalize plugin.xml strings for
Laurent Delaigue (obeo.fr)
0bd794 28 lines Fixed some spelling mistakes and tried to improve readability.
29a9ac 8 lines [458502] NPE in EMFCompareStructureMergeViewer.
316108 18 lines Happy boy-scout: Fixed findbugs warning.
5cc3f7 164 lines Improved developer guide and fixed typos.
617848 27 lines [458802] NPE when IComparisonScope computes empty comparison.
a1a723 106 lines [458544] Impossible to save value of text att if left not editable.
bd36b7 96 lines [458818] NPE when conflict on multi-valued attrib. (move vs delete)
e9a3d2 1841 lines [457034] ProximityEObjectMatcher should support cancellation
Laurent Goubet (obeo.fr)
199244 53598 bytes [EMF Compare][PATCH]potential NPE with compare editor + export API
Attachment 75662: The herein described patch
199246 45980 bytes [EMF Compare][PATCH]potential NPE with compare editor + export API *v0.7 maintenance*
Attachment 75666: The herein described patch
200335 100391 bytes [EMF Compare][PATCH]Slight performance optimization
Attachment 76288: The described patch
200368 865499 bytes [EMF Compare][PATCH]Diff Extension draft
Attachment 76304: The described patch
203565 1176840 bytes [EMF Compare][PATCH]Fix for Bug 199060 - properties not shown
Attachment 78531: patch for Bug 199060
259081 43316 bytes no engine overriding possible in standalone mode
Attachment 120677: patch adding an engine registry for the match engines
259081 84519 bytes no engine overriding possible in standalone mode
Attachment 122522: patch adding an engine registry for the diff engines
280279 45285 bytes EMF Compare graduation
Attachment 139175: Patch to change version numbering all around
Mariot Chauvin (gmail.com)
279079 5452 bytes NullPointerException in ResourceSimilarity#computeURISimilarity
Attachment 138265: patch and test for head
Martin Taal (elver.org)
299641 2752 bytes EAttribute which have an array instanceclass (EStringArray for example) are not compared on the content of the array but on the .equals of the array
Attachment 156110: diff for solving this reported issue
Mathieu Cartaud (obeo.fr)
06ff04 29 lines Reactivate org.eclipse.emf.compare.tests test suite
1b2326 2 lines [475935] Fix potential IllegalStateException in MergeViewerItem
1df79e 2 lines Fix git related tests
230f8d 168 lines Add debug logging for merge actions
2d0c03 174 lines Add a proposal for the modification of Compare UI tooltips.
2f390a 7 lines [478032] Fix accept/reject dropdown icon
32d90b 5374 lines Model Merge Tool + classes to do model merges with EGit
3510da 182 lines [411485] Fix the CMV display for moves beteen two containers
47daad 93 lines [464386] Add commit short id to make label more distinguishible - test
54f662 3300 lines Implementation of contextual tooltips
5cb671 5675 lines Implementation of contextual tooltips
619e3f 48 lines [UI tests] Fix papyrus RCPTT tests
62ead5 162 lines Use JGit provided progress monitor
635a21 12 lines Fix bugs caused by an EGit update
67d53a 8 lines [487306] Use only relevant diagnostic to compute traversals
755f4b 2784 lines Scalable conflict detector
7c180e 132 lines [487561] Fix missing conflict on resource uncontrol
7f78ba 129 lines [UI tests] Fix papyrus RCPTT tests
80edfe 28 lines Remove useless method in ResourceAttachmentChangeConflictSearch
857767 4 lines [485538] Fix ClassCastException in MergeResolutionManager
89fd95 49 lines Fix RCPTT bugs
8c1af5 10613 lines [UI tests] Add tests involving Papyrus & Egit
93c4ec 99 lines [486093] Don't create log file if logs are off
987f32 336 lines [477769] Papyrus linked ResourceAttachmentChanges
a59daa 293 lines [487561] Fix issue on resource attachment move conflict detection
a68638 43 lines Fix label issues when using the MergeTool on merge conflicts
ac24a1 261 lines [487011] Fix wrong conflict detection
ae6fc1 16 lines Add missing test suite for Neon build
c1fc71 194 lines [464386] Add commit short id to make label more distinguishible
c317b7 90 lines [411485] Fix the CMV display for move between two containers
cbcf4c 7 lines [473190] Fix NPE in the CompareStructureMergeViewer
cce332 713 lines [485266] Fix merge consequences for delete/move conflicts
d2e962 36 lines Fix error in Git tests setup
e2355c 7 lines [478032] Fix accept/reject dropdown icon
ed08cb 16 lines Set maximum version to 4.2.0 for EGit bundles
eee88a 8 lines Improve progress monitor to allow cancelling
ef3555 13 lines Fix error in the setup of EGit related tests
f742ef 4 lines Add Google GSON in target platform (required by JGit)
Matt Seashore (gmail.com)
226565 1087 bytes [Compare] Getting RemoteRemoveModelElement instead of RemoteAddModelElement with 3 way compare
Attachment 95551: An initial attempt at a fix for the bug
Michael Borkowski (eclipsesource.com)
012159 91 lines RevisionedURIConverterTest inner classes as mockito mocks
1576a8 477 lines [470268] Add test classes for RenameDetector and SimilarityComputer
1b857b 135 lines [467191] Add label for comparing equivalent models
2b4232 150 lines [467576] Correct Handling of Proxies in ReqEngine
334a01 1822 lines [470268] Consider potential renames in model resolution
523a44 40 lines Upgrade to Mockito 1.9
542422 133 lines Additional Unit Tests for Navigatable
a5e2b8 4 lines Add Mockito Dependency to org.eclipse.emf.compare.tests
a777aa 584 lines [462863] Extension Point for detecting complete merge resolutions
addd97 690 lines [462237] Merge Viewer: Jump to next unresolved difference after merging
b058ef 330 lines Adds Mockito Dependency
d65872 294 lines Unit Tests for {Local,Remote}MonitoredCreationListener
db9f81 188 lines DependencyGraphUpdaterTest using Mockito
dbc6bd 150 lines [467576] Correct Handling of Proxies in ReqEngine
f57895 6 lines [462863] UI Messages for EGit bundle
ffcdfc 320 lines [462863] Staging Prompt after Resolving Conflicts
Mikaël Barbero (eclipse.org)
343404 24379 bytes Support for textual comparison of textual EAttribute
Attachment 195381: the new patch
345451 112490 bytes Filtering and grouping facilities in the Compare editor
Attachment 195382: the patch
351593 118421 bytes Merge StereotypeApplication : required ProfileApplication should also be merged
Attachment 203002: the generic patch
351593 0 bytes Merge StereotypeApplication : required ProfileApplication should also be merged
Attachment 203003: the uml2 patch (bigger 'cause of unit tests updates)
351593 1065 bytes Merge StereotypeApplication : required ProfileApplication should also be merged
Attachment 203134: the new icons not added in previous patch
352981 562170 bytes UML Comparison Engine doesnt handle conflictual UpdateAttribute and UpdateReference
Attachment 200258: The new fixtures as patch to the tests plug-in
357079 18130 bytes Enhancements for filtering and grouping facilities
Attachment 202986: the patch
346607 1616 bytes IMatchScope are not used to filter out model roots in GenericMatchEngine
Comment
Moritz Eysholdt (typefox.io)
240201 9113 bytes Provide Model Diff Viewer for the LTK's Refactoring Wizard
Attachment 106972: Ecore-Rename-ENamedElement-Refactoring
240201 5669 bytes Provide Model Diff Viewer for the LTK's Refactoring Wizard
Attachment 109418: An Implementation for org.eclipse.ltk.ui.refactoring.changePreviewViewers with (c)
262928 949865 bytes Contributing a patch format to EMF Compare
Attachment 124981: EpatchImplementation-0.2
Patrick Konemann (itemis.de)
297812 321539 bytes Contribution of Model-independent Differences as a feature for patching EMF models
Attachment 169079: a patch describing changes v3 to v4
Philip Langer (eclipsesource.com)
01ae07 4237 lines [451365] Adds specific handling of opaque action, behavior & expression
02ca3d 6 lines [451048] Avoids IllegalArgumentException for custom diff types
580ddc 54 lines Adds test case exposing unsuccessful merge reported in Bug 441172
5c9631 282 lines [443504] Fix computation of ignored elements when finding insertion idx
87c8a4 352 lines [440679] Avoids NPE when performing a move
881b8d 4 lines Adds year of contribution to copyright header
9457eb 164 lines [448120] Adds FeatureMapChangeSpec with a useful toString() method
964e97 167 lines [441258] Prevents IllegalArgumentException on merging moves
9bd8b7 361 lines [440679] Avoids NPE when performing a move
a07b98 52 lines Fixes some minor typos in developer and user docs
ae0083 52 lines Fixes some minor typos in developer and user docs
b32dfe 244 lines [446739] Fixes obtaining the target feature in three-way merge of a move
b6b708 169 lines [413520] Fixes IndexOutOfBoundsException on merging opposite references
c2dcc7 169 lines [413520] Fixes IndexOutOfBoundsException on merging opposite references
d8a83a 4429 lines [446947] Adds support for three-way merging multi-line String attributes
fece70 69 lines [442439] Fixes DiffUtil.getSourceList for moved and reordered elements
pkonemann (imm.dtu.dk)
0e0dc5 5 lines Library test fixed.
183dba 21 lines Bugfix: Hidden diff elements were transformed twice.
493aad 2893 lines removing obsolete plugins; contents moved to .transform.
67b216 21 lines Bugfix: Whenever a diff element hides another diff element, the mpatch
c5dab7 4 lines Adding missing plugin dependencies for UML and EACHONCE models.
ff5c8c 5 lines Library test fixed.
Stefan Dirix (eclipsesource.com)
01ea4a 107 lines [460675] Fix differences for noncontained FeatureMapEntries with moved
0c29d5 182 lines [466552] Increase priorities of conflict mergers
0d5159 101 lines [460923] Do not filter FeatureMapChanges on removed Elements
1b4a8d 366 lines [454579] Fix Nullpointer when element is moved out of FeatureMap
4cb1d5 181 lines [450949] Avoid shortcuts in DefaultDiffEngine for certain FeatureMaps
5a9983 830 lines [475401] Add three-way tests for RootIDMatchingStrategy
5cba21 57 lines [474030] Fix SWTException when CompareDialog is canceled
6972d4 72 lines [455255] Fix determination of TargetFeature in DiffUtil
701e90 415 lines [461697] Add SaveParameter Hook for Papyrus model files
7493d3 57 lines [474030] Fix SWTException when CompareDialog is canceled
7c8ace 23 lines [461011] Allow customization of parent determination while matching
854707 394 lines [453218] Add missing FeatureMapChanges concerning Moves
88d73a 603 lines [475401] Modify RootIDMatchingStrategy to only return unique mappings
892571 110 lines [475401] Sort resources before matching in StrategyResourceMatcher
8cb4a0 1196 lines [473985] Enable comparison dialog in pure e4
92029f 470 lines [457652] Give xmi:ids higher priority than attribute ids
9ac0fb 91 lines [460780] Add LoadOnDemand-Policy for UML2 metamodel.
aaffc0 617 lines [474723] Introduce IEMFComparisonSource to support custom comparisons
bf9717 302 lines [461291] Avoid matching proxies with actual objects in
c16948 6 lines [474696] Include adapterFactory schema in the build
c29c58 110 lines [464904] Ensure NotLoadingResourceSet looks at all proxies
c2fbb9 2 lines Update Matching Chapter in Developer Documentation
ca91e6 980 lines Add Util Class to read Model Extension Point of Papyrus.
d5a1d6 329 lines [452147] Fix handling of diffs for interlocked one-to-one refs
d8b87c 859 lines [466607] Enhance EMFModelProvider to consider multiple resources at once
db376e 124 lines [473730] Ignore type descriptions within URIs
f6833a 86 lines [460902] Fix Dependency Calculation for FeatureMap Add and Delete
f72b3c 74 lines [453749] Fix NullPointer when handling Non-Containment FeatureMaps
Stefan Dirix (gmail.com)
021ae0 163 lines Improve Tutorial
3f1c4f 480 lines [441172] Fix merge order of equivalent diffs for one-to-one opposites
Stephane Bouchet (intel.com)
318854 39398 bytes [releng] buckminster releng projects
Attachment 173400: buckminster releng files
353612 4943 bytes [patch] modified UI for better integration of custom tabs
Attachment 200741: patch
357106 1528 bytes [ui] change the order of tab folder creation
Attachment 203004: patch
357625 961 bytes [ui] fix potential NPE
Attachment 203334: patch to fix potential NPE
Tatiana Fesenko (cea.fr)
323796 1147 bytes [SaveDeltaWizard] Allow to override existing file and suggest containing resource
Attachment 177596: Proposed patch for "Allow to override existing resources"
Tobias Jaehnel (gmail.com)
241385 19129 bytes Graphical Differencing for GMF modellers
Attachment 124211: GMF Compare V0.2
Victor Roldan Betancort (opencanarias.com)
257e53 616 lines [412181] Flexible delegation on IdentifierEObjectMatcher
3e260b 272 lines [412316] Make CachingDistance public
62a9ec 60 lines [412315] Increase visibility of EditionDistance.getThresholdRatio(int)
65a5fc 616 lines [412181] Flexible delegation on IdentifierEObjectMatcher
6ecb0f 13 lines [412088] NPE in CVS Team Support due to EMFResourceMapping
a7b371 1266 lines [412315] Increase visibility of EditionDistance.getThresholdRatio(int)
fa51d2 346 lines [412088] NPE in CVS Team Support due to EMFResourceMapping
352727 37807 bytes Make StatisticBasedSimilarityChecker.hasSameUri(EObject, EObject) protected
Attachment 200083: patch v1
352729 2182 bytes Export internal packages and mark them as x-internal:=true
Attachment 200082: patch v1
Vygantas Gedgaudas (nomagic.com)
368841 8350 bytes Wrong three-way diff produced when object that is referenced from other objects in the model is deleted
Attachment 209629: Test cases

Repositories

The information contained in this log was generated by using commit information from the following repositories:


© 2016 The Eclipse Foundation Inc. All rights reserved.
Made available to its Members for their internal use.

Adjust the set of projects included in this IP Log.

To modify an ip log you must be logged in as a committer.

 

Help & Documentation: Learn how this IP log is generated and how to correct errors.

Back to the top