Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Cartaud2015-10-07 08:52:31 +0000
committerMathieu Cartaud2015-10-15 12:57:59 +0000
commitc27c77330fcff474deaaebe5ef5e772cc72f299c (patch)
tree9604b47670700f3fcd3e1830db2400898f41ac0e /plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/emfcomparercpmessages.properties
parentf578950d9fd83d188eacd4c957967cbf411d4e5d (diff)
downloadorg.eclipse.emf.compare-c27c77330fcff474deaaebe5ef5e772cc72f299c.tar.gz
org.eclipse.emf.compare-c27c77330fcff474deaaebe5ef5e772cc72f299c.tar.xz
org.eclipse.emf.compare-c27c77330fcff474deaaebe5ef5e772cc72f299c.zip
Extract EMFCompareConfiguration from EMFCompareRCPUIPlugin
- Extract graphs from EMFCompareConfiguration - Extract EMFCompareConfiguration from RCPUIPlugin - Give the StructureMergeViewerFilter through the TreeItemAdapterFactorySpec - The new URI Graph instance is now created by EMFCompareRCPPlugin who passes it to the ThreadedModelResolver and holds the associated graph view Change-Id: I713ae5d2f10f1498433cd373d24636e93d3bb4cf Also-by: Laurent Delaigue <laurent.delaigue@obeo.fr> Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr> Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/emfcomparercpmessages.properties')
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/emfcomparercpmessages.properties6
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/emfcomparercpmessages.properties b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/emfcomparercpmessages.properties
index 5c5605a9b..c17e9c04e 100644
--- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/emfcomparercpmessages.properties
+++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/emfcomparercpmessages.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2011, 2012 Obeo.
+# Copyright (c) 2011, 2015 Obeo.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -15,4 +15,6 @@ duplicate.extension = The extension {0} is registered twice
RCPMatchEngineFactory.INCORECT_USE_IDENTIFIER_ATTRIBUTE = Incorrect value of UseIdentifier stored in preferences
-logging.appender.error = Impossible to log to file {0}.\nException message is: {1} \ No newline at end of file
+logging.appender.error = Impossible to log to file {0}.\nException message is: {1}
+
+duplicate.graph.id.msg = A graph consumer is already registered for the given ID "{0}". Only one graph consumer can be registered for a given ID.

Back to the top