Adds more precise class naming. Because $ is a legal character in class names, we should try to handle them. Some may say it's bad practice to use dollar signs in Java class names at all, reserving them for the compiler. They're probably correct.

Author: UnquietCode

codemodel/.classpath

@@ -57,7 +57,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

codemodel/.project

@@ -41,6 +41,8 @@
 package com.sun.codemodel;
 
 
+import com.sun.codemodel.util.NameUtilities;
+
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.List;
@@ -236,7 +238,7 @@ public JAnnotationArrayMember param(final Class<?> value){
        JAnnotationValue annotationValue = new JAnnotationStringValue(
     		   new JExpressionImpl() {
       			 public void generate(JFormatter f) {
-      				 f.p(value.getName().replace('$', '.'));
+      				 f.p(NameUtilities.getFullName(value));
       				 f.p(".class");
       			}
       		 });

codemodel/pom.xml

@@ -36,6 +36,8 @@
 package com.sun.codemodel;
 
 
+import com.sun.codemodel.util.NameUtilities;
+
 import java.lang.annotation.Annotation;
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -324,7 +326,7 @@ public JAnnotationUse param(String name, final Class<?> value){
          addValue(name, new JAnnotationStringValue(
         		 new JExpressionImpl() {
         			 public void generate(JFormatter f) {
-        				 f.p(value.getName().replace('$', '.'));
+        				 f.p(NameUtilities.getFullName(value));
         				 f.p(".class");
         			}
         		 }));

codemodel/src/main/java/com/sun/codemodel/JAnnotationArrayMember.java

@@ -51,6 +51,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.sun.codemodel.util.NameUtilities;
 import com.sun.codemodel.writer.FileCodeWriter;
 import com.sun.codemodel.writer.ProgressCodeWriter;
 
@@ -556,11 +557,11 @@ private class JReferencedClass extends JClass implements JDeclaration {
         }
 
         public String name() {
-            return _class.getSimpleName().replace('$','.');
+            return _class.getSimpleName();
         }
 
         public String fullName() {
-            return _class.getName().replace('$','.');
+	        return NameUtilities.getFullName(_class);
         }
 
         public String binaryName() {

codemodel/src/main/java/com/sun/codemodel/JAnnotationUse.java

@@ -0,0 +1,34 @@
+package com.sun.codemodel.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Ben Fagin
+ * @version 2013-04-01
+ */
+public class NameUtilities {
+
+	public static String getFullName(Class c) {
+		if (c == null) {
+			throw new IllegalArgumentException("class cannot be null");
+		}
+
+		StringBuilder name = new StringBuilder();
+		name.append(c.getPackage().getName()).append(".");
+
+		Class klaus = c;
+		List<Class> enclosingClasses = new ArrayList<Class>();
+
+		while ((klaus = klaus.getEnclosingClass()) != null) {
+			enclosingClasses.add(klaus);
+		}
+
+		for (int i = enclosingClasses.size() - 1; i >= 0; i--) {
+			name.append(enclosingClasses.get(i).getSimpleName()).append(".");
+		}
+
+		name.append(c.getSimpleName());
+		return name.toString();
+	}
+}

codemodel/src/main/java/com/sun/codemodel/JCodeModel.java

@@ -0,0 +1,26 @@
+package com.sun.codemodel.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * @author Ben Fagin
+ * @version 2013-04-01
+ */
+public class NameUtilitiesTest {
+
+
+	@Test
+	public void testInnerClassNaming() {
+		String expected =
+			NameUtilitiesTest.class.getPackage().getName()+"."
+		  + NameUtilitiesTest.class.getSimpleName()+"."
+		  + "Inner"
+		;
+
+		String name = NameUtilities.getFullName(Inner.class);
+		Assert.assertEquals(expected, name);
+	}
+
+	public static class Inner { }
+}

codemodel/src/main/java/com/sun/codemodel/util/NameUtilities.java

@@ -49,11 +49,6 @@
     <url>http://codemodel.java.net/</url>
     <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <parent>
-        <groupId>net.java</groupId>
-        <artifactId>jvnet-parent</artifactId>
-        <version>1</version>
-    </parent>
     <modules>
         <module>codemodel</module>
         <module>codemodel-annotation-compiler</module>
@@ -144,6 +139,15 @@
         <connection>scm:svn:https://svn.java.net/svn/codemodel~svn/trunk/codemodel</connection>
         <url>http://java.net/projects/codemodel/sources/svn/show/trunk</url>
     </scm>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.11</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
     <build>
         <plugins>
             <plugin>
@@ -181,15 +185,11 @@
 			        </execution>
 		        </executions>
 	        </plugin>
+	        <plugin>
+		        <groupId>org.apache.maven.plugins</groupId>
+		        <artifactId>maven-surefire-plugin</artifactId>
+		        <version>2.12.3</version>
+	        </plugin>
         </plugins>
     </build>
-    <!--<reporting>-->
-        <!--<plugins>-->
-            <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-javadoc-plugin</artifactId>-->
-                <!--<version>2.8.1</version>-->
-            <!--</plugin>-->
-        <!--</plugins>-->
-    <!--</reporting>-->
 </project>