?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: 24bd6b8) | patch
[467668] Fix Accept/Reject All buttons behaviour with shared models36/48436/23.1.0RC2
commit93ab38a616826ca9d9ed6703955330e840414c54
authorAxel Richard <axel.richard@obeo.fr>
Thu, 21 May 2015 12:45:41 +0000 (21 14:45 +0200)
committerAxel Richard <axel.richard@obeo.fr>
Tue, 26 May 2015 13:37:10 +0000 (26 15:37 +0200)
treec3ef845393cda4b059f5e4fa43a799b0ab321ed7tree | snapshot (tar.gz zip)
parent24bd6b8f6993255f21b71d9e99c9dbc14d31983dcommit | diff
[467668] Fix Accept/Reject All buttons behaviour with shared models

Change-Id: Ic13b0030a7894413765ba749193fea6b69017503
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
12 files changed:
plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/command/impl/MergeAllNonConflictingCommand.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/command/MergeAllCommandTests.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/command/data/MergeAllCommandInputData.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/command/data/modelLeft.ecore [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/command/data/modelOrigin.ecore [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/command/data/modelRight.ecore [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/suite/AllTests.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFResourceMappingMerger.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/AbstractMergeRunnable.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeAllNonConflictingRunnable.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/MergeViewerUtil.java diff | blob | blame | history
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/MergeDependenciesUtil.java diff | blob | blame | history
Eclipse foundation framework to comapre EMF models