Log Message
Remove dynamic generics from AbstractBaseMethod
Modified Paths
- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/impl/ModelBuilder.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/AbstractBaseMethod.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaConstructor.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaMethod.java
Diff
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/impl/ModelBuilder.java (1459 => 1460)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/impl/ModelBuilder.java 2011-12-28 14:06:31 UTC (rev 1459)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/impl/ModelBuilder.java 2011-12-28 14:31:19 UTC (rev 1460)
@@ -39,6 +39,7 @@
import com.thoughtworks.qdox.model.JavaParameter;
import com.thoughtworks.qdox.model.JavaSource;
import com.thoughtworks.qdox.model.JavaType;
+import com.thoughtworks.qdox.model.JavaTypeVariable;
import com.thoughtworks.qdox.model.impl.AbstractBaseJavaEntity;
import com.thoughtworks.qdox.model.impl.DefaultJavaClass;
import com.thoughtworks.qdox.model.impl.DefaultJavaConstructor;
@@ -47,8 +48,8 @@
import com.thoughtworks.qdox.model.impl.DefaultJavaPackage;
import com.thoughtworks.qdox.model.impl.DefaultJavaParameter;
import com.thoughtworks.qdox.model.impl.DefaultJavaSource;
+import com.thoughtworks.qdox.model.impl.DefaultJavaType;
import com.thoughtworks.qdox.model.impl.DefaultJavaTypeVariable;
-import com.thoughtworks.qdox.model.impl.DefaultJavaType;
import com.thoughtworks.qdox.parser.structs.AnnoDef;
import com.thoughtworks.qdox.parser.structs.ClassDef;
import com.thoughtworks.qdox.parser.structs.FieldDef;
@@ -268,8 +269,8 @@
// typeParameters
if ( def.getTypeParams() != null )
{
- List<DefaultJavaTypeVariable<JavaConstructor>> typeParams =
- new LinkedList<DefaultJavaTypeVariable<JavaConstructor>>();
+ List<JavaTypeVariable<JavaConstructor>> typeParams =
+ new LinkedList<JavaTypeVariable<JavaConstructor>>();
for ( TypeVariableDef typeVariableDef : def.getTypeParams() )
{
typeParams.add( createTypeVariable( typeVariableDef, (JavaConstructor) currentConstructor ) );
@@ -324,8 +325,8 @@
// typeParameters
if ( def.getTypeParams() != null )
{
- List<DefaultJavaTypeVariable<JavaMethod>> typeParams =
- new LinkedList<DefaultJavaTypeVariable<JavaMethod>>();
+ List<JavaTypeVariable<JavaMethod>> typeParams =
+ new LinkedList<JavaTypeVariable<JavaMethod>>();
for ( TypeVariableDef typeVariableDef : def.getTypeParams() )
{
typeParams.add( createTypeVariable( typeVariableDef, (JavaMethod) currentMethod ) );
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/AbstractBaseMethod.java (1459 => 1460)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/AbstractBaseMethod.java 2011-12-28 14:06:31 UTC (rev 1459)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/AbstractBaseMethod.java 2011-12-28 14:31:19 UTC (rev 1460)
@@ -8,7 +8,6 @@
import com.thoughtworks.qdox.model.JavaClass;
import com.thoughtworks.qdox.model.JavaMethod;
import com.thoughtworks.qdox.model.JavaParameter;
-import com.thoughtworks.qdox.model.JavaParameterizedType;
import com.thoughtworks.qdox.model.JavaType;
/**
@@ -17,12 +16,12 @@
* @author Robert Scholte
*
*/
-public abstract class AbstractBaseMethod<T extends JavaClass & JavaParameterizedType>
+public abstract class AbstractBaseMethod
extends AbstractInheritableJavaEntity
{
private List<JavaParameter> parameters = Collections.emptyList();
- private List<T> exceptions = Collections.emptyList();
+ private List<JavaClass> exceptions = Collections.emptyList();
private boolean varArgs;
private String sourceCode;
@@ -67,7 +66,7 @@
this.varArgs = javaParameters.get( javaParameters.size() -1 ).isVarArgs();
}
- public void setExceptions( List<T> exceptions )
+ public void setExceptions( List<JavaClass> exceptions )
{
this.exceptions = exceptions;
}
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaConstructor.java (1459 => 1460)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaConstructor.java 2011-12-28 14:06:31 UTC (rev 1459)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaConstructor.java 2011-12-28 14:31:19 UTC (rev 1460)
@@ -7,7 +7,6 @@
import com.thoughtworks.qdox.model.JavaClass;
import com.thoughtworks.qdox.model.JavaConstructor;
import com.thoughtworks.qdox.model.JavaParameter;
-import com.thoughtworks.qdox.model.JavaParameterizedType;
import com.thoughtworks.qdox.model.JavaType;
import com.thoughtworks.qdox.model.JavaTypeVariable;
@@ -16,8 +15,8 @@
* @author Robert
* @since 2.0
*/
-public class DefaultJavaConstructor<T extends JavaClass & JavaParameterizedType>
- extends AbstractBaseMethod<T> implements JavaConstructor
+public class DefaultJavaConstructor
+ extends AbstractBaseMethod implements JavaConstructor
{
private List<JavaTypeVariable<JavaConstructor>> typeParameters = Collections.emptyList();
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaMethod.java (1459 => 1460)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaMethod.java 2011-12-28 14:06:31 UTC (rev 1459)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaMethod.java 2011-12-28 14:31:19 UTC (rev 1460)
@@ -32,9 +32,9 @@
import com.thoughtworks.qdox.model.JavaType;
import com.thoughtworks.qdox.model.JavaTypeVariable;
-public class DefaultJavaMethod<T extends JavaClass & JavaParameterizedType> extends AbstractBaseMethod<T> implements JavaMethod {
+public class DefaultJavaMethod extends AbstractBaseMethod implements JavaMethod {
- private T returns = (T) DefaultJavaType.VOID;
+ private JavaClass returns = DefaultJavaType.VOID;
private List<JavaTypeVariable<JavaMethod>> typeParameters = Collections.emptyList();
/**
@@ -58,7 +58,7 @@
* @param returns the return type
* @param name the name of this method
*/
- public DefaultJavaMethod(T returns, String name) {
+ public DefaultJavaMethod(JavaClass returns, String name) {
this.returns = returns;
setName(name);
}
@@ -171,7 +171,7 @@
*
* @param returns the return type
*/
- public void setReturns(T returns)
+ public void setReturns(JavaClass returns)
{
this.returns = returns;
}
To unsubscribe from this list please visit:
