Author: hthomann
Date: Thu Apr 18 17:28:44 2013
New Revision: 1469482
URL: http://svn.apache.org/r1469482
Log:
OPENJPA-2060: AnnotationProcess failed to generate metadata for List<String>[]
attribute in entity. Back-ported Albert Lee's trunk changes to 2.1.x.
Modified:
openjpa/branches/2.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/util/SourceCode.java
Modified:
openjpa/branches/2.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/util/SourceCode.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/util/SourceCode.java?rev=1469482&r1=1469481&r2=1469482&view=diff
==============================================================================
---
openjpa/branches/2.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/util/SourceCode.java
(original)
+++
openjpa/branches/2.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/util/SourceCode.java
Thu Apr 18 17:28:44 2013
@@ -622,7 +622,7 @@ public class SourceCode {
String pkg = name.getPackageName();
if (pkg.length() == 0 || pkg.equals(getPackage().name))
return;
- out.println("import "+ name.getFullName() + SEMICOLON);
+ out.println("import "+ name.fullName + SEMICOLON);
}
public boolean equals(Object other) {
@@ -774,6 +774,11 @@ public class SourceCode {
arrayMarker = arrayMarker + "[]";
name = getComponentName(name);
}
+ int start = name.indexOf("<");
+ int stop = name.lastIndexOf(">");
+ if (start != -1 && stop != -1) {
+ name = name.substring(0, start) + name.substring(stop + 1);
+ }
this.fullName = name;
int dot = fullName.lastIndexOf(DOT);
simpleName = (dot == -1) ? fullName : fullName.substring(dot+1);
@@ -817,7 +822,7 @@ public class SourceCode {
* Compares by fully-qualified name.
*/
public int compareTo(ClassName other) {
- return fullName.compareTo(other.fullName);
+ return getFullName().compareTo(other.getFullName());
}
public boolean isValidTypeName(String s) {
