support of declarative member classes #2

.gitignore

@@ -3,3 +3,4 @@ target/
 .classpath
 .settings/
 .project
+.vscode/

core/src/main/java/org/bsc/java2typescript/TSType.java

@@ -95,28 +95,35 @@ public String getAlias() {
         return (String) super.get(ALIAS);
     }
 
+    private String getMemberSimpleTypeName() {
+
+        return format( "%s$%s", getValue().getDeclaringClass().getSimpleName(), getValue().getSimpleName());
+    }
+
     /**
      * 
      * @return
      */
     public final String getTypeName() {
-        return (hasAlias()) ? getAlias() : format( "%s.%s", getNamespace(), getValue().getSimpleName());
+        return (hasAlias()) ? getAlias() : format( "%s.%s", getNamespace(), 
+                (getValue().isMemberClass() ? getMemberSimpleTypeName() : getValue().getSimpleName()));
     }
 
     /**
      * 
      * @return
      */
     public final String getSimpleTypeName() {
-        return (hasAlias()) ? getAlias() : getValue().getSimpleName();
+        return (hasAlias()) ? getAlias() : 
+            ((getValue().isMemberClass()) ? getMemberSimpleTypeName() : getValue().getSimpleName());
     }
 
     /**
      * 
      * @return
      */
     public final boolean supportNamespace() {
-        return !getValue().isMemberClass() && !hasAlias();
+        return !hasAlias();
     }
 
     /**
@@ -165,6 +172,19 @@ public Set<Method> getMethods() {
 
     }
 
+    /**
+     * 
+     * @param name
+     * @return
+     */
+    private Class<?> getMemberClassForName( String fqn ) throws ClassNotFoundException {
+        char[] ch = fqn.toCharArray();
+        int i = fqn.lastIndexOf('.');
+        ch[i] = '$';
+
+        return Class.forName(String.valueOf(ch));   
+    }
+
     /**
      *
      * @param dt
@@ -174,10 +194,18 @@ private Class<?> getClassFrom(Object dt) {
         if (dt instanceof Class)
             return (Class<?>) dt;
 
+        final String fqn = dt.toString();
         try {
-            return Class.forName(dt.toString());
+            return Class.forName(fqn);
+
         } catch (ClassNotFoundException e1) {
-            throw new RuntimeException(String.format("class not found [%s]", dt), e1);
+
+            try {
+                return getMemberClassForName(fqn);
+
+            } catch (ClassNotFoundException e2) {
+                throw new RuntimeException(String.format("class not found [%s]", dt), e1);
+            }
         }
     }