[qdox-scm] [1329] trunk/qdox/src/main/java/com/thoughtworks/qdox/model: Add JavaModelUtils for shared functions

[rfscholte]

Title: [1329] trunk/qdox/src/main/java/com/thoughtworks/qdox/model: Add JavaModelUtils for shared functions

Revision

1329

Author

rfscholte

Date

2011-09-10 17:24:46 -0500 (Sat, 10 Sep 2011)

Log Message

Add JavaModelUtils for shared functions

Modified Paths

• trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaPackage.java
• trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaSource.java

Added Paths

trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaModelUtils.java

Diff

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaPackage.java (1328 => 1329)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaPackage.java	2011-09-10 22:18:06 UTC (rev 1328)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaPackage.java	2011-09-10 22:24:46 UTC (rev 1329)
@@ -89,7 +89,7 @@
         
         for ( JavaClass candidateCls : classes )
         {
-            result = getClassByName( candidateCls, name );
+            result = JavaModelUtils.getClassByName( candidateCls, name );
             if ( result != null ) 
             {
                 result = candidateCls;
@@ -99,30 +99,6 @@
         return result;
     }
 	
-	private static JavaClass getClassByName(JavaClass cls, String name) 
-    {
-        JavaClass result = null;
-        if ( cls.getFullyQualifiedName().equals( name ) ) 
-        {
-            result = cls;
-        }
-        else if ( cls.getName().equals(name)) 
-        {
-            result = cls;
-        }
-        else {
-            for ( JavaClass innerCls : cls.getClasses() )
-            {
-                result = getClassByName( innerCls, name );
-                if ( result != null ) 
-                {
-                    break;
-                }
-            }
-        }
-        return result;
-    }
-
     public JavaPackage getParentPackage()
     {
         String parentName = name.substring( 0, name.lastIndexOf( '.' ) );

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaSource.java (1328 => 1329)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaSource.java	2011-09-10 22:18:06 UTC (rev 1328)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaSource.java	2011-09-10 22:24:46 UTC (rev 1329)
@@ -337,7 +337,7 @@
         
         for ( JavaClass candidateCls : classes )
         {
-            result = getClassByName( candidateCls, name );
+            result = JavaModelUtils.getClassByName( candidateCls, name );
             if ( result != null ) 
             {
                 result = candidateCls;
@@ -347,30 +347,6 @@
         return result;
     }
     
-    private static JavaClass getClassByName(JavaClass cls, String name) 
-    {
-        JavaClass result = null;
-        if ( cls.getFullyQualifiedName().equals( name ) ) 
-        {
-            result = cls;
-        }
-        else if ( cls.getName().equals(name)) 
-        {
-            result = cls;
-        }
-        else {
-            for ( JavaClass innerCls : cls.getClasses() )
-            {
-                result = getClassByName( innerCls, name );
-                if ( result != null ) 
-                {
-                    break;
-                }
-            }
-        }
-        return result;
-    }
-
 	/* (non-Javadoc)
      * @see com.thoughtworks.qdox.model.JavaSource#getJavaClassLibrary()
      */

Added: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaModelUtils.java (0 => 1329)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaModelUtils.java	                        (rev 0)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaModelUtils.java	2011-09-10 22:24:46 UTC (rev 1329)
@@ -0,0 +1,35 @@
+package com.thoughtworks.qdox.model;
+
+public final class JavaModelUtils
+{
+
+    private JavaModelUtils()
+    {
+        // 
+    }
+    
+    public static JavaClass getClassByName( JavaClass cls, String name )
+    {
+        JavaClass result = null;
+        if ( cls.getFullyQualifiedName().equals( name ) )
+        {
+            result = cls;
+        }
+        else if ( cls.getName().equals( name ) )
+        {
+            result = cls;
+        }
+        else
+        {
+            for ( JavaClass innerCls : cls.getClasses() )
+            {
+                result = getClassByName( innerCls, name );
+                if ( result != null )
+                {
+                    break;
+                }
+            }
+        }
+        return result;
+    }
+}

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email