You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by jr...@apache.org on 2009/05/26 22:24:43 UTC
svn commit: r778873 - in /openjpa/trunk/openjpa-kernel/src/main:
java/org/apache/openjpa/meta/AccessCode.java
resources/org/apache/openjpa/meta/localizer.properties
Author: jrbauer
Date: Tue May 26 20:24:43 2009
New Revision: 778873
URL: http://svn.apache.org/viewvc?rev=778873&view=rev
Log:
OPENJPA-926 Localize exception message
Modified:
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AccessCode.java
openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/meta/localizer.properties
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AccessCode.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AccessCode.java?rev=778873&r1=778872&r2=778873&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AccessCode.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AccessCode.java Tue May 26 20:24:43 2009
@@ -209,8 +209,10 @@
if (fCode == cCode)
return cCode;
else
- throw new IllegalStateException("Can not merge field " +
- toFieldString(fCode) + " to class " + toClassString(cCode));
+ throw new IllegalStateException(
+ (_loc.get("access-cannot-merge",
+ toFieldString(fCode),
+ toClassString(cCode)).toString()));
}
}
return cCode;
Modified: openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/meta/localizer.properties
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/meta/localizer.properties?rev=778873&r1=778872&r2=778873&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/meta/localizer.properties (original)
+++ openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/meta/localizer.properties Tue May 26 20:24:43 2009
@@ -25,6 +25,8 @@
based access style or explicitly declare an access style.
access-illegal-merge: Field "{0}" with "{1}" is not compatible with "{2}" \
used by its declaring class.
+access-cannot-merge: Cannot merge field access "{0}" with class \
+ access "{1}".
meta-reflect: Using reflection for metadata generation.
gen-meta: Generating default metadata for type "{0}".
load-cls: Loading metadata for "{0}" under mode "{1}".