- Revision
- 1421
- Author
- rfscholte
- Date
- 2011-10-17 13:34:36 -0500 (Mon, 17 Oct 2011)
Log Message
Attempt to simplify Type constructor usage
Modified Paths
- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaTypeVariable.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaWildcardType.java
Diff
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java (1420 => 1421)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java 2011-10-17 16:59:37 UTC (rev 1420) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java 2011-10-17 18:34:36 UTC (rev 1421) @@ -357,7 +357,7 @@ { return null; } - DefaultJavaTypeVariable<G> result = new DefaultJavaTypeVariable<G>( null, typeVariableDef.getName(), genericDeclaration ); + DefaultJavaTypeVariable<G> result = new DefaultJavaTypeVariable<G>( typeVariableDef.getName(), genericDeclaration ); if ( typeVariableDef.getBounds() != null && !typeVariableDef.getBounds().isEmpty() ) {
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java (1420 => 1421)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java 2011-10-17 16:59:37 UTC (rev 1420) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java 2011-10-17 18:34:36 UTC (rev 1421) @@ -40,6 +40,12 @@ private int dimensions; private List<JavaType> actualArgumentTypes = Collections.emptyList(); + public Type( String name, JavaClassParent context ) + { + this.name = name; + this.context = context; + } + public Type(String fullName, String name, int dimensions, JavaClassParent context) { this.fullName = fullName; this.name = name;
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaTypeVariable.java (1420 => 1421)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaTypeVariable.java 2011-10-17 16:59:37 UTC (rev 1420) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaTypeVariable.java 2011-10-17 18:34:36 UTC (rev 1421) @@ -42,9 +42,9 @@ private D genericDeclaration; - public DefaultJavaTypeVariable( String fullName, String name, D genericDeclaration ) + public DefaultJavaTypeVariable( String name, D genericDeclaration ) { - super( fullName, name, 0, getContext( genericDeclaration ) ); + super( name, getContext( genericDeclaration ) ); this.genericDeclaration = genericDeclaration; }
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaWildcardType.java (1420 => 1421)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaWildcardType.java 2011-10-17 16:59:37 UTC (rev 1420) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaWildcardType.java 2011-10-17 18:34:36 UTC (rev 1421) @@ -41,10 +41,11 @@ super("?"); } - public DefaultJavaWildcardType(String name, String wildcardExpressionType, JavaClassParent context) { - super(null, name, 0, context); - this.wildcardExpressionType = wildcardExpressionType; - } + public DefaultJavaWildcardType( String name, String wildcardExpressionType, JavaClassParent context ) + { + super( name, context ); + this.wildcardExpressionType = wildcardExpressionType; + } public String getGenericValue() { String result = "";
To unsubscribe from this list please visit:
