- Revision
- 1385
- Author
- rfscholte
- Date
- 2011-10-09 05:05:41 -0500 (Sun, 09 Oct 2011)
Log Message
Rename DefaultWildcardType to DefaultJavaWildcardType to follow naming convention
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/TypeAssembler.java (1384 => 1385)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/TypeAssembler.java 2011-10-09 10:01:07 UTC (rev 1384) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/TypeAssembler.java 2011-10-09 10:05:41 UTC (rev 1385) @@ -6,7 +6,7 @@ import com.thoughtworks.qdox.model.JavaClassParent; import com.thoughtworks.qdox.model.JavaType; import com.thoughtworks.qdox.model.Type; -import com.thoughtworks.qdox.model.WildcardType; +import com.thoughtworks.qdox.model.impl.DefaultJavaWildcardType; import com.thoughtworks.qdox.parser.structs.TypeDef; import com.thoughtworks.qdox.parser.structs.WildcardTypeDef; @@ -37,7 +37,7 @@ if ( typeDef instanceof WildcardTypeDef ) { WildcardTypeDef wildcard = (WildcardTypeDef) typeDef; - result = new WildcardType( wildcard.getName(), wildcard.getWildcardExpressionType(), context ); + result = new DefaultJavaWildcardType( wildcard.getName(), wildcard.getWildcardExpressionType(), context ); } else {
Copied: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaWildcardType.java (from rev 1384, trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultWildcardType.java) (0 => 1385)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaWildcardType.java (rev 0) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaWildcardType.java 2011-10-09 10:05:41 UTC (rev 1385) @@ -0,0 +1,77 @@ +package com.thoughtworks.qdox.model.impl; + +import com.thoughtworks.qdox.model.JavaClassParent; +import com.thoughtworks.qdox.model.JavaWildcardType; +import com.thoughtworks.qdox.model.Type; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + +/** + * This class supports both the 'super' and 'extends' wildcards. + * For <?> you must use the normal Type, because ? itself can't be generic + * + * @author Robert Scholte + * + */ +public class DefaultJavaWildcardType extends Type implements JavaWildcardType { + + /** + * A wildcardExpression is either <code>super</code> or <code>extends</code> or <code>null</code> + */ + private String wildcardExpressionType = null; + + public DefaultJavaWildcardType() { + super("?"); + } + + public DefaultJavaWildcardType(String name, String wildcardExpressionType, JavaClassParent context) { + super(null, name, 0, context); + this.wildcardExpressionType = wildcardExpressionType; + } + + public String getGenericValue() { + String result = ""; + if( wildcardExpressionType != null ) + { + result += "? " + wildcardExpressionType+ " "; + } + result += super.getGenericValue(); + return result; + } + + @Override + public String getFullyQualifiedName() + { + return "?"; + } + + @Override + public String getGenericFullyQualifiedName() + { + String result = ""; + if( wildcardExpressionType != null ) + { + result += "? " + wildcardExpressionType+ " "; + } + result += super.getFullyQualifiedName(); + return result; + } +}
Deleted: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultWildcardType.java (1384 => 1385)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultWildcardType.java 2011-10-09 10:01:07 UTC (rev 1384) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultWildcardType.java 2011-10-09 10:05:41 UTC (rev 1385) @@ -1,77 +0,0 @@ -package com.thoughtworks.qdox.model.impl; - -import com.thoughtworks.qdox.model.JavaClassParent; -import com.thoughtworks.qdox.model.JavaWildcardType; -import com.thoughtworks.qdox.model.Type; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - - -/** - * This class supports both the 'super' and 'extends' wildcards. - * For <?> you must use the normal Type, because ? itself can't be generic - * - * @author Robert Scholte - * - */ -public class DefaultWildcardType extends Type implements JavaWildcardType { - - /** - * A wildcardExpression is either <code>super</code> or <code>extends</code> or <code>null</code> - */ - private String wildcardExpressionType = null; - - public DefaultWildcardType() { - super("?"); - } - - public DefaultWildcardType(String name, String wildcardExpressionType, JavaClassParent context) { - super(null, name, 0, context); - this.wildcardExpressionType = wildcardExpressionType; - } - - public String getGenericValue() { - String result = ""; - if( wildcardExpressionType != null ) - { - result += "? " + wildcardExpressionType+ " "; - } - result += super.getGenericValue(); - return result; - } - - @Override - public String getFullyQualifiedName() - { - return "?"; - } - - @Override - public String getGenericFullyQualifiedName() - { - String result = ""; - if( wildcardExpressionType != null ) - { - result += "? " + wildcardExpressionType+ " "; - } - result += super.getFullyQualifiedName(); - return result; - } -}
To unsubscribe from this list please visit:
