[336296] fix validation of virtual attribute mappings 2 - fix messages

1 files changed, 10 insertions, 7 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaNamedContextNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaNamedContextNode.java
index 2ba2391fba..3bfbc00698 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaNamedContextNode.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaNamedContextNode.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2011 Oracle. 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 http://www.eclipse.org/legal/epl-v10.html.
@@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.context;
 /**
  * Named context node that may have collisions with or override other nodes
  * with the same name defined elsewhere in the persistence unit
- * (e.g. sequence generators).
+ * (e.g. sequence/table generators, named/named native queries).
  * <p>
  * Provisional API: This interface is part of an interim API that is still
  * under development and expected to change significantly before reaching
@@ -31,12 +31,13 @@ public interface JpaNamedContextNode<T>
 
 
 	// ********** validation **********
-
+// TODO bjv - get rid of these methods - validation is done in the persistence unit instead
+// of in a distributed fashion...
 	/**
 	 * Return whether the node "overrides" the specified node
 	 * within the nodes' persistence unit.
 	 * (e.g. a query defined in <code>orm.xml</code>
-	 * "overrides" one defined in a Java annotation).
+	 * "overrides" one with the same name defined in a Java annotation).
 	 * 
 	 * @see #duplicates(Object)
 	 */
@@ -44,9 +45,11 @@ public interface JpaNamedContextNode<T>
 
 	/**
 	 * Return whether the node is a "duplicate" of the specified node.
-	 * Two nodes are duplicates if they both have the same,
-	 * non-null name and neither node "overrides" the other.
-	 * 
+	 * Two nodes are duplicates if<ul>
+	 * <li>they both have the same, non-empty name
+	 * <li>neither node "overrides" the other
+	 * <li>they both are in the same persistence unit
+	 * </ul>
 	 * @see #overrides(Object)
 	 */
 	boolean duplicates(T other);