[qdox-scm] [1379] trunk/qdox/src/test/java/com/thoughtworks/qdox/model: Move default implementation of JavaPackage to separate package

Sun, 09 Oct 2011 02:38:09 -0700

Title: [1379] trunk/qdox/src/test/java/com/thoughtworks/qdox/model: Move default implementation of JavaPackage to separate package

Diff

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java (1378 => 1379)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java	2011-10-09 09:27:03 UTC (rev 1378)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java	2011-10-09 09:38:03 UTC (rev 1379)
@@ -32,7 +32,6 @@
 import com.thoughtworks.qdox.model.DefaultJavaConstructor;
 import com.thoughtworks.qdox.model.DefaultJavaField;
 import com.thoughtworks.qdox.model.DefaultJavaMethod;
-import com.thoughtworks.qdox.model.DefaultJavaPackage;
 import com.thoughtworks.qdox.model.DefaultJavaParameter;
 import com.thoughtworks.qdox.model.DefaultJavaSource;
 import com.thoughtworks.qdox.model.DocletTag;
@@ -47,6 +46,7 @@
 import com.thoughtworks.qdox.model.JavaType;
 import com.thoughtworks.qdox.model.Type;
 import com.thoughtworks.qdox.model.TypeVariable;
+import com.thoughtworks.qdox.model.impl.DefaultJavaPackage;
 import com.thoughtworks.qdox.parser.structs.AnnoDef;
 import com.thoughtworks.qdox.parser.structs.ClassDef;
 import com.thoughtworks.qdox.parser.structs.FieldDef;

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/library/AbstractClassLibrary.java (1378 => 1379)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/library/AbstractClassLibrary.java	2011-10-09 09:27:03 UTC (rev 1378)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/library/AbstractClassLibrary.java	2011-10-09 09:38:03 UTC (rev 1379)
@@ -28,10 +28,10 @@
 import com.thoughtworks.qdox.builder.ModelBuilder;
 import com.thoughtworks.qdox.builder.ModelBuilderFactory;
 import com.thoughtworks.qdox.model.DefaultDocletTagFactory;
-import com.thoughtworks.qdox.model.DefaultJavaPackage;
 import com.thoughtworks.qdox.model.JavaClass;
 import com.thoughtworks.qdox.model.JavaPackage;
 import com.thoughtworks.qdox.model.JavaSource;
+import com.thoughtworks.qdox.model.impl.DefaultJavaPackage;
 import com.thoughtworks.qdox.parser.structs.ClassDef;
 import com.thoughtworks.qdox.writer.ModelWriterFactory;

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java (1378 => 1379)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java	2011-10-09 09:27:03 UTC (rev 1378)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java	2011-10-09 09:38:03 UTC (rev 1379)
@@ -27,9 +27,9 @@
 import java.util.List;
 
 import com.thoughtworks.qdox.builder.ModelBuilder;
-import com.thoughtworks.qdox.model.DefaultJavaPackage;
 import com.thoughtworks.qdox.model.JavaClass;
 import com.thoughtworks.qdox.model.JavaPackage;
+import com.thoughtworks.qdox.model.impl.DefaultJavaPackage;
 import com.thoughtworks.qdox.parser.JavaLexer;
 import com.thoughtworks.qdox.parser.ParseException;
 import com.thoughtworks.qdox.parser.impl.BinaryClassParser;

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/library/SourceLibrary.java (1378 => 1379)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/library/SourceLibrary.java	2011-10-09 09:27:03 UTC (rev 1378)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/library/SourceLibrary.java	2011-10-09 09:38:03 UTC (rev 1379)
@@ -32,10 +32,10 @@
 import java.util.List;
 
 import com.thoughtworks.qdox.builder.ModelBuilder;
-import com.thoughtworks.qdox.model.DefaultJavaPackage;
 import com.thoughtworks.qdox.model.JavaClass;
 import com.thoughtworks.qdox.model.JavaPackage;
 import com.thoughtworks.qdox.model.JavaSource;
+import com.thoughtworks.qdox.model.impl.DefaultJavaPackage;
 import com.thoughtworks.qdox.parser.JavaLexer;
 import com.thoughtworks.qdox.parser.ParseException;
 import com.thoughtworks.qdox.parser.impl.JFlexLexer;

Deleted: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaPackage.java (1378 => 1379)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaPackage.java	2011-10-09 09:27:03 UTC (rev 1378)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaPackage.java	2011-10-09 09:38:03 UTC (rev 1379)
@@ -1,149 +0,0 @@
-package com.thoughtworks.qdox.model;
-
-/*
- * 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.
- */
-
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-
-import com.thoughtworks.qdox.library.ClassLibrary;
-
-/**
- * The default implementation of {@link JavaPackage}, representing a {@link Package}.
- * 
- * @since 1.9
- */
-public class DefaultJavaPackage extends AbstractBaseJavaEntity implements JavaPackage {
-
-    private ClassLibrary classLibrary;
-	private String name;
-	private List<JavaClass> classes = new LinkedList<JavaClass>();
-
-	/**
-	 * 
-	 * @param name the name of the package, should never be <code>null</code>
-	 */
-    public DefaultJavaPackage(String name) {
-		this.name= name;
-    }
-
-    /**
-     * Equivalent of {@link Package#getName()}
-     * 
-     * @return the name of the package
-     */
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getCodeBlock() {
-		return getModelWriter().writePackage(this).toString();
-	}
-	
-	public void setClassLibrary( ClassLibrary classLibrary )
-    {
-        this.classLibrary = classLibrary;
-    }
-
-	public void addClass(JavaClass clazz) {
-		classes.add(clazz);
-	}
-
-    /* (non-Javadoc)
-     * @see com.thoughtworks.qdox.model.JavaPackage#getClasses()
-     */
-	public Collection<JavaClass> getClasses() {
-	    //avoid infinitive  recursion
-	    if (this == classLibrary.getJavaPackage( name )) {
-	        return classes;
-	    }
-	    else {
-	        return classLibrary.getJavaPackage( name ).getClasses();
-	    }
-	}
-	
-	public JavaClass getClassByName(String name) 
-    {
-        JavaClass result = null;
-        
-        for ( JavaClass candidateCls : classes )
-        {
-            result = JavaModelUtils.getClassByName( candidateCls, name );
-            if ( result != null ) 
-            {
-                result = candidateCls;
-                break;
-            }
-        }
-        return result;
-    }
-	
-    public JavaPackage getParentPackage()
-    {
-        String parentName = name.substring( 0, name.lastIndexOf( '.' ) );
-        return classLibrary.getJavaPackage( parentName );
-    }
-
-    public List<JavaPackage> getSubPackages() {
-        String expected = name + ".";
-        Collection<JavaPackage> jPackages = classLibrary.getJavaPackages();
-        List<JavaPackage> retList = new LinkedList<JavaPackage>();
-        for (JavaPackage jPackage : jPackages) {
-            String pName = jPackage.getName();
-            if (pName.startsWith(expected) && !(pName.substring(expected.length()).indexOf(".") > -1)) {
-                retList.add(classLibrary.getJavaPackage( pName ));
-            }
-        }
-        return retList;
-    }
-
-    public boolean equals( Object o )
-    {
-        if ( this == o )
-        {
-            return true;
-        }
-        if ( !( o instanceof JavaPackage ) )
-        {
-            return false;
-        }
-
-        JavaPackage that = (JavaPackage) o;
-
-        return ( name.equals( that.getName() ) );
-    }
-
-    public int hashCode() {
-        return 11 + name.hashCode();
-    }
-    
-    /**
-     * Equivalent of {@link Package#toString()}
-     * 
-     * @return the string representation of the package.
-     */
-    public String toString() {
-    	return "package " + name;
-    }
-}

Copied: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaPackage.java (from rev 1329, trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaPackage.java) (0 => 1379)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaPackage.java	                        (rev 0)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/impl/DefaultJavaPackage.java	2011-10-09 09:38:03 UTC (rev 1379)
@@ -0,0 +1,153 @@
+package com.thoughtworks.qdox.model.impl;
+
+/*
+ * 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.
+ */
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+import com.thoughtworks.qdox.library.ClassLibrary;
+import com.thoughtworks.qdox.model.AbstractBaseJavaEntity;
+import com.thoughtworks.qdox.model.JavaClass;
+import com.thoughtworks.qdox.model.JavaModelUtils;
+import com.thoughtworks.qdox.model.JavaPackage;
+
+/**
+ * The default implementation of {@link JavaPackage}, representing a {@link Package}.
+ * 
+ * @since 1.9
+ */
+public class DefaultJavaPackage extends AbstractBaseJavaEntity implements JavaPackage {
+
+    private ClassLibrary classLibrary;
+	private String name;
+	private List<JavaClass> classes = new LinkedList<JavaClass>();
+
+	/**
+	 * 
+	 * @param name the name of the package, should never be <code>null</code>
+	 */
+    public DefaultJavaPackage(String name) {
+		this.name= name;
+    }
+
+    /**
+     * Equivalent of {@link Package#getName()}
+     * 
+     * @return the name of the package
+     */
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getCodeBlock() {
+		return getModelWriter().writePackage(this).toString();
+	}
+	
+	public void setClassLibrary( ClassLibrary classLibrary )
+    {
+        this.classLibrary = classLibrary;
+    }
+
+	public void addClass(JavaClass clazz) {
+		classes.add(clazz);
+	}
+
+    /* (non-Javadoc)
+     * @see com.thoughtworks.qdox.model.JavaPackage#getClasses()
+     */
+	public Collection<JavaClass> getClasses() {
+	    //avoid infinitive  recursion
+	    if (this == classLibrary.getJavaPackage( name )) {
+	        return classes;
+	    }
+	    else {
+	        return classLibrary.getJavaPackage( name ).getClasses();
+	    }
+	}
+	
+	public JavaClass getClassByName(String name) 
+    {
+        JavaClass result = null;
+        
+        for ( JavaClass candidateCls : classes )
+        {
+            result = JavaModelUtils.getClassByName( candidateCls, name );
+            if ( result != null ) 
+            {
+                result = candidateCls;
+                break;
+            }
+        }
+        return result;
+    }
+	
+    public JavaPackage getParentPackage()
+    {
+        String parentName = name.substring( 0, name.lastIndexOf( '.' ) );
+        return classLibrary.getJavaPackage( parentName );
+    }
+
+    public List<JavaPackage> getSubPackages() {
+        String expected = name + ".";
+        Collection<JavaPackage> jPackages = classLibrary.getJavaPackages();
+        List<JavaPackage> retList = new LinkedList<JavaPackage>();
+        for (JavaPackage jPackage : jPackages) {
+            String pName = jPackage.getName();
+            if (pName.startsWith(expected) && !(pName.substring(expected.length()).indexOf(".") > -1)) {
+                retList.add(classLibrary.getJavaPackage( pName ));
+            }
+        }
+        return retList;
+    }
+
+    public boolean equals( Object o )
+    {
+        if ( this == o )
+        {
+            return true;
+        }
+        if ( !( o instanceof JavaPackage ) )
+        {
+            return false;
+        }
+
+        JavaPackage that = (JavaPackage) o;
+
+        return ( name.equals( that.getName() ) );
+    }
+
+    public int hashCode() {
+        return 11 + name.hashCode();
+    }
+    
+    /**
+     * Equivalent of {@link Package#toString()}
+     * 
+     * @return the string representation of the package.
+     */
+    public String toString() {
+    	return "package " + name;
+    }
+}

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/library/AbstractClassLibraryTest.java (1378 => 1379)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/library/AbstractClassLibraryTest.java	2011-10-09 09:27:03 UTC (rev 1378)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/library/AbstractClassLibraryTest.java	2011-10-09 09:38:03 UTC (rev 1379)
@@ -6,9 +6,9 @@
 import junit.framework.TestCase;
 
 import com.thoughtworks.qdox.model.DefaultJavaClass;
-import com.thoughtworks.qdox.model.DefaultJavaPackage;
 import com.thoughtworks.qdox.model.JavaClass;
 import com.thoughtworks.qdox.model.JavaPackage;
+import com.thoughtworks.qdox.model.impl.DefaultJavaPackage;
 
 public class AbstractClassLibraryTest
     extends TestCase

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/library/JavaClassContextTest.java (1378 => 1379)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/library/JavaClassContextTest.java	2011-10-09 09:27:03 UTC (rev 1378)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/library/JavaClassContextTest.java	2011-10-09 09:38:03 UTC (rev 1379)
@@ -3,11 +3,11 @@
 import junit.framework.TestCase;
 
 import com.thoughtworks.qdox.model.DefaultJavaClass;
-import com.thoughtworks.qdox.model.DefaultJavaPackage;
 import com.thoughtworks.qdox.model.DefaultJavaSource;
 import com.thoughtworks.qdox.model.JavaClass;
 import com.thoughtworks.qdox.model.JavaPackage;
 import com.thoughtworks.qdox.model.JavaSource;
+import com.thoughtworks.qdox.model.impl.DefaultJavaPackage;
 
 public class JavaClassContextTest
     extends TestCase

Deleted: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaPackageTest.java (1378 => 1379)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaPackageTest.java	2011-10-09 09:27:03 UTC (rev 1378)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaPackageTest.java	2011-10-09 09:38:03 UTC (rev 1379)
@@ -1,17 +0,0 @@
-package com.thoughtworks.qdox.model;
-
-import static org.mockito.Mockito.*;
-
-import com.thoughtworks.qdox.library.ClassLibrary;
-
-public class DefaultJavaPackageTest extends JavaPackageTest<DefaultJavaPackage>
-{
-
-    public DefaultJavaPackage newJavaPackage( String name )
-    {
-        DefaultJavaPackage result = new DefaultJavaPackage( name );
-        result.setClassLibrary( mock(ClassLibrary.class) );
-        return result;
-    }
-
-}

Copied: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaPackageTest.java (from rev 1303, trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaPackageTest.java) (0 => 1379)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaPackageTest.java	                        (rev 0)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/impl/DefaultJavaPackageTest.java	2011-10-09 09:38:03 UTC (rev 1379)
@@ -0,0 +1,18 @@
+package com.thoughtworks.qdox.model.impl;
+
+import static org.mockito.Mockito.*;
+
+import com.thoughtworks.qdox.library.ClassLibrary;
+import com.thoughtworks.qdox.model.JavaPackageTest;
+
+public class DefaultJavaPackageTest extends JavaPackageTest<DefaultJavaPackage>
+{
+
+    public DefaultJavaPackage newJavaPackage( String name )
+    {
+        DefaultJavaPackage result = new DefaultJavaPackage( name );
+        result.setClassLibrary( mock(ClassLibrary.class) );
+        return result;
+    }
+
+}

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to