diff options
| author | Philip Langer | 2015-02-28 19:20:24 +0000 |
|---|---|---|
| committer | Axel RICHARD | 2015-03-02 14:23:10 +0000 |
| commit | 40d061bf59466ddfedbbdc4426aa7f74f3996c35 (patch) | |
| tree | d66c0aa258e646b15e59cd6a6e6331831294f363 /plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/emfcomparemessages.properties | |
| parent | 01ea4a0e47ca488514e9556921bfb343d2b25504 (diff) | |
| download | org.eclipse.emf.compare-40d061bf59466ddfedbbdc4426aa7f74f3996c35.tar.gz org.eclipse.emf.compare-40d061bf59466ddfedbbdc4426aa7f74f3996c35.tar.xz org.eclipse.emf.compare-40d061bf59466ddfedbbdc4426aa7f74f3996c35.zip | |
[460778] Improves duplicate ID warning in IdentifierEObjectMatcher
We now add -- if available -- the URI of the resource containing the
EObject that has the duplicate ID to the warning. Also, we externalized
the warning String.
Bug: 460778
Change-Id: I08f270910a2cc45eeffb77785402ae71498b67b6
Signed-off-by: Philip Langer <planger@eclipsesource.com>
Diffstat (limited to 'plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/emfcomparemessages.properties')
| -rw-r--r-- | plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/emfcomparemessages.properties | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/emfcomparemessages.properties b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/emfcomparemessages.properties index 5c696e52e..df835be7d 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/emfcomparemessages.properties +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/emfcomparemessages.properties @@ -1,5 +1,5 @@ ################################################################################ -# Copyright (c) 2006, 2015 Obeo. +# Copyright (c) 2006, 2015 Obeo and others. # 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 @@ -7,6 +7,7 @@ # # Contributors: # Obeo - initial API and implementation +# Philip Langer - adds message for duplicate ID in IdentifierEObjectMatcher ################################################################################ ## ! note ! double the apostrophes if you need one in the printed String @@ -35,3 +36,6 @@ DefaultEquiEngine.monitor.eq = Computing equivalences... DefaultMatchEngine.monitor.match.resourceSet = Matching given resource sets... DefaultMatchEngine.monitor.match.resource = Matching given resources... DefaultMatchEngine.monitor.match.eobject = Matching given EObjects... + +IdentifierEObjectMatcher.duplicateId = Duplicate ID {0} found on the {1} side. +IdentifierEObjectMatcher.duplicateIdWithResource = Duplicate ID ''{0}'' found on the {1} side in resource ''{2}''. |