tweaked message for logging duplicate extension values

5 files changed, 7 insertions, 7 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/property_files/jpa_core.properties b/jpa/plugins/org.eclipse.jpt.core/property_files/jpa_core.properties
index 47d23fe423..6489bc5aa1 100644
--- a/jpa/plugins/org.eclipse.jpt.core/property_files/jpa_core.properties
+++ b/jpa/plugins/org.eclipse.jpt.core/property_files/jpa_core.properties
@@ -40,7 +40,7 @@ ERROR_SYNCHRONIZING_CLASSES_COULD_NOT_VALIDATE=Error synchronizing classes.  Cou
 ERROR_WRITING_FILE=Could not write to persistence.xml
 REGISTRY_MISSING_ATTRIBUTE=Missing required attribute ''{0}'' for element ''{1}'' in extension ''{1}'' from plug-in ''{2}''.
 REGISTRY_INVALID_VALUE=Invalid value ''{0}'' for ''{1}'' in extension ''{2}'' from plug-in ''{3}''.
-REGISTRY_DUPLICATE=An extension of ''{0}'' with the id ''{1}'' is already registered.
+REGISTRY_DUPLICATE=An extension of ''{0}'' with the ''{1}'' value of ''{2}'' is already registered.
 REGISTRY_FAILED_CLASS_LOAD=Unable to load the class ''{0}'' declared for the extension point ''{1}'' in the plug-in ''{2}''.
 REGISTRY_FAILED_INTERFACE_ASSIGNMENT=Unable to assign the class ''{0}'' declared for the extension point ''{1}'' in the plug-in ''{2}'' to the interface ''{3}''.
 REGISTRY_FAILED_INSTANTIATION=Unable to instantiate the class ''{0}'' declared for the extension point ''{1}'' in the plug-in ''{2}''.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/XPointUtil.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/XPointUtil.java
index 5d5d2a18cf..2a07568079 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/XPointUtil.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/XPointUtil.java
@@ -77,9 +77,9 @@ public class XPointUtil {
 		return (Class<T>) clazz;
     }
 	
-	public static void logDuplicateExtension(String extensionPoint, String id) {
+	public static void logDuplicateExtension(String extensionPoint, String nodeName, String value) {
 		
-		log(JptCoreMessages.REGISTRY_DUPLICATE, extensionPoint, id);
+		log(JptCoreMessages.REGISTRY_DUPLICATE, extensionPoint, nodeName, value);
 	}
 	
 	public static void logMissingAttribute(
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libval/LibraryValidatorManager.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libval/LibraryValidatorManager.java
index 316519df69..098bf71d21 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libval/LibraryValidatorManager.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libval/LibraryValidatorManager.java
@@ -116,7 +116,7 @@ public class LibraryValidatorManager {
 			lvConfig.setId(findRequiredAttribute(element, ID_ATTRIBUTE));
 			
 			if (this.libraryValidatorConfigs.containsKey(lvConfig.getId())) {
-				logDuplicateExtension(QUALIFIED_EXTENSION_POINT_ID, lvConfig.getId());
+				logDuplicateExtension(QUALIFIED_EXTENSION_POINT_ID, ID_ATTRIBUTE, lvConfig.getId());
 				throw new XPointException();
 			}
 			
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JpaPlatformManagerImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JpaPlatformManagerImpl.java
index 967fcd97d5..fe81097e2e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JpaPlatformManagerImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JpaPlatformManagerImpl.java
@@ -114,7 +114,7 @@ public class JpaPlatformManagerImpl
 			desc.setId(findRequiredAttribute(element, ID_ATTRIBUTE));
 			
 			if (this.jpaPlatformGroupDescriptions.containsKey(desc.getId())) {
-				logDuplicateExtension(QUALIFIED_EXTENSION_POINT_ID, desc.getId());
+				logDuplicateExtension(QUALIFIED_EXTENSION_POINT_ID, ID_ATTRIBUTE, desc.getId());
 				throw new XPointException();
 			}
 			
@@ -140,7 +140,7 @@ public class JpaPlatformManagerImpl
 			desc.setId(findRequiredAttribute(element, ID_ATTRIBUTE));
 			
 			if (this.jpaPlatformDescriptions.containsKey(desc.getId())) {
-				logDuplicateExtension(QUALIFIED_EXTENSION_POINT_ID, desc.getId());
+				logDuplicateExtension(QUALIFIED_EXTENSION_POINT_ID, ID_ATTRIBUTE, desc.getId());
 				throw new XPointException();
 			}
 			
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/ResourceLocatorManager.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/ResourceLocatorManager.java
index 97768037a1..b3156193b5 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/ResourceLocatorManager.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/ResourceLocatorManager.java
@@ -122,7 +122,7 @@ public class ResourceLocatorManager {
 			rlConfig.setId(findRequiredAttribute(element, ID_ATTRIBUTE));
 			
 			if (this.resourceLocatorConfigs.containsKey(rlConfig.getId())) {
-				logDuplicateExtension(QUALIFIED_EXTENSION_POINT_ID, rlConfig.getId());
+				logDuplicateExtension(QUALIFIED_EXTENSION_POINT_ID, ID_ATTRIBUTE, rlConfig.getId());
 				throw new XPointException();
 			}