CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-07-03 21:07:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

updated version to 0.4.1

Browse Source
This commit is contained in:
Timo Westkämper 2011-08-04 11:16:55 +00:00
parent 0b6b07c79e
commit 0cf7d1fd5f
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.mysema.codegen</groupId>
<artifactId>codegen</artifactId>
<version>0.4.0-SNAPSHOT</version>
<version>0.4.1</version>
<name>Codegen</name>
<description>Code generation and compilation for Java</description>
<parent>

9
src/main/java/com/mysema/codegen/model/SimpleType.java
View File

@ -20,7 +20,7 @@ public class SimpleType implements Type {
private final TypeCategory category;
private final String fullName, packageName, simpleName, localName;
private final String fullName, outerClassName, packageName, simpleName, localName;
private final List<Type> parameters;
@ -58,6 +58,11 @@ public class SimpleType implements Type {
}else{
this.localName = fullName;
}
if (fullName.substring(packageName.length()+1).contains(".")) {
this.outerClassName = fullName.substring(0, fullName.lastIndexOf('.'));
} else {
this.outerClassName = fullName;
}
this.primitiveClass = primitiveClass;
this.finalClass = finalClass;
this.parameters = parameters;
@ -169,7 +174,7 @@ public class SimpleType implements Type {
@Override
public String getRawName(Set<String> packages, Set<String> classes) {
if (packages.contains(packageName) || classes.contains(fullName)){
if (packages.contains(packageName) || classes.contains(fullName) || classes.contains(outerClassName)){
return localName;
}else{
return fullName;

3
src/main/java/com/mysema/codegen/support/ClassUtils.java
View File

@ -45,7 +45,8 @@ public final class ClassUtils {
return getName(cl.getComponentType(), packages, classes) + "[]";
} else if (cl.getPackage() == null
|| packages.contains(cl.getPackage().getName())
|| classes.contains(cl.getName())) {
|| classes.contains(cl.getName())
|| classes.contains(cl.getName().substring(0, cl.getName().lastIndexOf('.')))) {
if (cl.getPackage() != null){
String localName = cl.getName().substring(cl.getPackage().getName().length()+1);
return localName.replace('$', '.');