Public Git Hosting - EMFCompare2.git/commit

commit	e15a381dbb924bf89731c0f81977f591d4deb492
author	Axel Richard <axel.richard@obeo.fr>
	Tue, 20 Jan 2015 10:14:16 +0000 (20 11:14 +0100)
committer	Axel Richard <axel.richard@obeo.fr>
	Tue, 20 Jan 2015 10:14:16 +0000 (20 11:14 +0100)
tree	916b0a2d663dc2215f47b94f238516c45e742ce7	tree \| snapshot (tar.gz zip)
parent	3b995916d9b320683a78268f17ef5b9cd498da9f	commit \| diff

Revert "DRAFT - Intermediate Proxies Resolution"

This reverts commit 3b995916d9b320683a78268f17ef5b9cd498da9f.

37 files changed:

plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/contentmergeviewer/diagram/DiagramContentMergeViewer.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/contentmergeviewer/diagram/DiagramContentMergeViewerCreator.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchItemProviderSpec.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/compareconfiguration/EMFCompareConfigurationTest.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/configuration/EMFCompareConfiguration.java	[moved from plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/impl/EMFCompareConfiguration.java with 89% similarity]	diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/configuration/ForwardingCompareConfiguration.java	[moved from plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/impl/ForwardingCompareConfiguration.java with 98% similarity]	diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/TextFallbackCompareViewerCreator.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/label/LabeledViewerCreator.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewer.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewerContentProvider.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewerCreator.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/EMFCompareTextMergeViewer.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/EMFCompareTextMergeViewerContentProvider.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/EMFCompareTextMergeViewerCreator.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewerContentProvider.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewerCreator.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/editor/AbstractEMFCompareEditorInput.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/editor/ComparisonEditorInput.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/editor/ComparisonScopeEditorInput.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/AbstractCompareHandler.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ThreadedModelResolver.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/AbstractStructuredViewerWrapper.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/CompareToolBar.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerCreator.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/EMFCompareRCPUIPlugin.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ContainmentReferenceChangeAccessorImpl.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/MatchAccessor.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/MergeViewerItem.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/BasicDifferenceGroupImpl.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/match/impl/EllipsisMatch.java	[deleted file]	blob \| blame \| history
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/MatchUtil.java		diff \| blob \| blame \| history

Eclipse foundation framework to comapre EMF models

RSS Atom