[qdox-scm] [1413] trunk/qdox/src/main/java/com/thoughtworks/qdox/model: Move JavaClassParent to c.t.q.model.impl, it's not a model interface but an impl helper interface

Fri, 14 Oct 2011 14:20:10 -0700

Title: [1413] trunk/qdox/src/main/java/com/thoughtworks/qdox/model: Move JavaClassParent to c.t.q.model.impl, it's not a model interface but an impl helper interface

Diff

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/TypeAssembler.java (1412 => 1413)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/TypeAssembler.java	2011-10-14 20:42:32 UTC (rev 1412)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/TypeAssembler.java	2011-10-14 21:20:07 UTC (rev 1413)
@@ -3,10 +3,10 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import com.thoughtworks.qdox.model.JavaClassParent;
 import com.thoughtworks.qdox.model.JavaType;
 import com.thoughtworks.qdox.model.Type;
 import com.thoughtworks.qdox.model.impl.DefaultJavaWildcardType;
+import com.thoughtworks.qdox.model.impl.JavaClassParent;
 import com.thoughtworks.qdox.parser.structs.TypeDef;
 import com.thoughtworks.qdox.parser.structs.WildcardTypeDef;

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaClass.java (1412 => 1413)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaClass.java	2011-10-14 20:42:32 UTC (rev 1412)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaClass.java	2011-10-14 21:20:07 UTC (rev 1413)
@@ -22,6 +22,7 @@
 import java.util.List;
 
 import com.thoughtworks.qdox.library.ClassLibrary;
+import com.thoughtworks.qdox.model.impl.JavaClassParent;
 
 /**
  * Equivalent of {@link java.lang.Class}, providing the most important methods.

Deleted: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaClassParent.java (1412 => 1413)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaClassParent.java	2011-10-14 20:42:32 UTC (rev 1412)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaClassParent.java	2011-10-14 21:20:07 UTC (rev 1413)
@@ -1,46 +0,0 @@
-package com.thoughtworks.qdox.model;
-
-import com.thoughtworks.qdox.library.ClassLibrary;
-
-/*
- * 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.
- */
-/**
- * @deprecated this interface will be hidden for the model interfaces
- */
-public interface JavaClassParent {
-
-    /**
-     * Resolve a type-name within the context of this source or class.
-     * @param typeName name of a type
-     * @return the fully-qualified name of the type, or null if it cannot
-     *     be resolved
-     */
-    String resolveType(String typeName);
-    
-    String resolveCanonicalName(String typeName);
-    
-    String resolveFullyQualifiedName(String typeName);
-
-    JavaSource getParentSource();
-
-    JavaClass getNestedClassByName(String name);
-    
-    ClassLibrary getJavaClassLibrary(); 
-    
-}

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaSource.java (1412 => 1413)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaSource.java	2011-10-14 20:42:32 UTC (rev 1412)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaSource.java	2011-10-14 21:20:07 UTC (rev 1413)
@@ -23,6 +23,7 @@
 import java.util.List;
 
 import com.thoughtworks.qdox.library.ClassLibrary;
+import com.thoughtworks.qdox.model.impl.JavaClassParent;
 
 /**
  * The root of every JavaModel, even for those based on binary classes.

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java (1412 => 1413)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java	2011-10-14 20:42:32 UTC (rev 1412)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java	2011-10-14 21:20:07 UTC (rev 1413)
@@ -28,6 +28,7 @@
 import com.thoughtworks.qdox.library.ClassLibrary;
 import com.thoughtworks.qdox.model.impl.DefaultJavaClass;
 import com.thoughtworks.qdox.model.impl.DefaultJavaTypeVariable;
+import com.thoughtworks.qdox.model.impl.JavaClassParent;
 
 public class Type implements JavaClass, JavaType, JavaParameterizedType, Serializable {

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaClass.java (1412 => 1413)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaClass.java	2011-10-14 20:42:32 UTC (rev 1412)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaClass.java	2011-10-14 21:20:07 UTC (rev 1413)
@@ -31,7 +31,6 @@
 import com.thoughtworks.qdox.model.BeanProperty;
 import com.thoughtworks.qdox.model.DocletTag;
 import com.thoughtworks.qdox.model.JavaClass;
-import com.thoughtworks.qdox.model.JavaClassParent;
 import com.thoughtworks.qdox.model.JavaConstructor;
 import com.thoughtworks.qdox.model.JavaField;
 import com.thoughtworks.qdox.model.JavaMethod;

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaWildcardType.java (1412 => 1413)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaWildcardType.java	2011-10-14 20:42:32 UTC (rev 1412)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaWildcardType.java	2011-10-14 21:20:07 UTC (rev 1413)
@@ -1,6 +1,5 @@
 package com.thoughtworks.qdox.model.impl;
 
-import com.thoughtworks.qdox.model.JavaClassParent;
 import com.thoughtworks.qdox.model.JavaWildcardType;
 import com.thoughtworks.qdox.model.Type;

Copied: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/JavaClassParent.java (from rev 1367, trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaClassParent.java) (0 => 1413)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/JavaClassParent.java	                        (rev 0)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/JavaClassParent.java	2011-10-14 21:20:07 UTC (rev 1413)
@@ -0,0 +1,48 @@
+package com.thoughtworks.qdox.model.impl;
+
+import com.thoughtworks.qdox.library.ClassLibrary;
+import com.thoughtworks.qdox.model.JavaClass;
+import com.thoughtworks.qdox.model.JavaSource;
+
+/*
+ * 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.
+ */
+/**
+ * @deprecated this interface will be hidden for the model interfaces
+ */
+public interface JavaClassParent {
+
+    /**
+     * Resolve a type-name within the context of this source or class.
+     * @param typeName name of a type
+     * @return the fully-qualified name of the type, or null if it cannot
+     *     be resolved
+     */
+    String resolveType(String typeName);
+    
+    String resolveCanonicalName(String typeName);
+    
+    String resolveFullyQualifiedName(String typeName);
+
+    JavaSource getParentSource();
+
+    JavaClass getNestedClassByName(String name);
+    
+    ClassLibrary getJavaClassLibrary(); 
+    
+}

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to