- Revision
- 633
- Author
- rfscholte
- Date
- 2009-08-17 04:54:22 -0500 (Mon, 17 Aug 2009)
Log Message
QDOX-176: method getPackageName() added to JavaClass
Modified Paths
Diff
Modified: trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaClass.java (632 => 633)
--- trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaClass.java 2009-07-23 19:33:00 UTC (rev 632) +++ trunk/qdox/src/java/com/thoughtworks/qdox/model/JavaClass.java 2009-08-17 09:54:22 UTC (rev 633) @@ -215,6 +215,17 @@ return (getParentSource() != null ? getParentSource().getPackage() : javaPackage); } + /** + * If this class has a package, the packagename will be returned. + * Otherwise an empty String. + * + * @return + */ + public String getPackageName() { + JavaPackage javaPackage = getPackage(); + return (javaPackage != null && javaPackage.getName() != null) ? javaPackage.getName() : ""; + } + public String getFullyQualifiedName() { return (getParent() != null ? (getParent().getClassNamePrefix()) : javaPackage != null ? (javaPackage.getName()+".") : "") + getName(); }
Modified: trunk/qdox/src/test/com/thoughtworks/qdox/model/JavaClassTest.java (632 => 633)
--- trunk/qdox/src/test/com/thoughtworks/qdox/model/JavaClassTest.java 2009-07-23 19:33:00 UTC (rev 632) +++ trunk/qdox/src/test/com/thoughtworks/qdox/model/JavaClassTest.java 2009-08-17 09:54:22 UTC (rev 633) @@ -350,6 +350,7 @@ assertEquals("MyClass", cls.getName()); assertEquals("com.thoughtworks.qdox", cls.getPackage().getName()); + assertEquals("com.thoughtworks.qdox", cls.getPackageName()); assertEquals("com.thoughtworks.qdox.MyClass", cls.getFullyQualifiedName()); assertTrue(cls.asType().isResolved()); @@ -375,9 +376,18 @@ assertEquals("Inner", inner.getName()); assertEquals("foo.bar", inner.getPackage().getName()); + assertEquals("foo.bar", inner.getPackageName()); assertEquals("foo.bar.Outer$Inner", inner.getFullyQualifiedName()); } + + public void testDefaultPackageClass() { + src.setPackage(null); + cls.setName("DefaultPackageClass"); + + assertEquals("", src.getClasses()[0].getPackageName()); + assertEquals("DefaultPackageClass", src.getClasses()[0].getFullyQualifiedName()); + } public void testDefaultClassSuperclass() throws Exception { cls.setName("MyClass");
To unsubscribe from this list please visit:
