Issue #15 WIP. Needs tests and completion.

stephanenicolas · Oct 11, 2013 · af15313 · af15313
1 parent b91dc6a
commit af15313
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 15 deletions.
diff --git a/boundbox-library/src/main/java/org/boundbox/processor/BoundClassScanner.java b/boundbox-library/src/main/java/org/boundbox/processor/BoundClassScanner.java
@@ -4,7 +4,6 @@
 import java.util.List;
 
 import javax.lang.model.element.Element;
-import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;

diff --git a/boundbox-library/src/main/java/org/boundbox/processor/VisibilityComputer.java b/boundbox-library/src/main/java/org/boundbox/processor/VisibilityComputer.java
@@ -4,26 +4,72 @@
 
 import org.boundbox.model.ClassInfo;
 import org.boundbox.model.FieldInfo;
+import org.boundbox.model.InnerClassInfo;
 import org.boundbox.model.MethodInfo;
 
 public class VisibilityComputer {
-
-    public void processVisibleTypes(ClassInfo classInfo, List<String> listOfInvisibleTypes ) {
-        for(MethodInfo methodInfo : classInfo.getListMethodInfos() ) {
-            if( listOfInvisibleTypes.contains(methodInfo.getReturnTypeName()) ) {
-                methodInfo.setReturnTypeName("java.lang.Object");
-            }
-            for( String thrownTypeName : methodInfo.getThrownTypeNames() ) {
-                if( listOfInvisibleTypes.contains(thrownTypeName) ) {
-                    //TODO and this can be complex...
-                }
+
+    public void processVisibleTypes(ClassInfo classInfo, List<String> listOfInvisibleTypes) {
+        // TODO constructor ?
+        for (FieldInfo fieldInfo : classInfo.getListFieldInfos()) {
+            processField(fieldInfo, listOfInvisibleTypes);
+        }
+        for (MethodInfo methodInfo : classInfo.getListMethodInfos()) {
+            processMethod(methodInfo, listOfInvisibleTypes);
+        }
+        for (InnerClassInfo innerClassInfo : classInfo.getListInnerClassInfo()) {
+            processInnerClass(innerClassInfo, listOfInvisibleTypes);
+        }
+    }
+
+    public void processInnerClass(InnerClassInfo innerClassInfo, List<String> listOfInvisibleTypes) {
+        for (MethodInfo constructorInfo : innerClassInfo.getListConstructorInfos()) {
+            processConstructor(constructorInfo, listOfInvisibleTypes);
+        }
+        for (FieldInfo fieldInfo : innerClassInfo.getListFieldInfos()) {
+            processField(fieldInfo, listOfInvisibleTypes);
+        }
+        for (MethodInfo methodInfo : innerClassInfo.getListMethodInfos()) {
+            processMethod(methodInfo, listOfInvisibleTypes);
+        }
+        for (InnerClassInfo innerInnerClassInfo : innerClassInfo.getListInnerClassInfo()) {
+            processInnerClass(innerInnerClassInfo, listOfInvisibleTypes);
+        }
+    }
+
+    private void processConstructor(MethodInfo methodInfo, List<String> listOfInvisibleTypes) {
+        //TODO if the inner class itself is not visible
+        for (String thrownTypeName : methodInfo.getThrownTypeNames()) {
+            if (listOfInvisibleTypes.contains(thrownTypeName)) {
+                // TODO and this can be complex...
             }
-            for( FieldInfo paramInfo : methodInfo.getParameterTypes() ) {
-                if( listOfInvisibleTypes.contains(paramInfo.getFieldTypeName()) ) {
-                    paramInfo.setFieldTypeName("java.lang.Object");
-                }
+        }
+        for (FieldInfo paramInfo : methodInfo.getParameterTypes()) {
+            if (listOfInvisibleTypes.contains(paramInfo.getFieldTypeName())) {
+                paramInfo.setFieldTypeName("java.lang.Object");
             }
+        }
+    }
+
+    private void processField(FieldInfo fieldInfo, List<String> listOfInvisibleTypes) {
+        if (listOfInvisibleTypes.contains(fieldInfo.getFieldTypeName())) {
+            fieldInfo.setFieldTypeName("java.lang.Object");
+        }
+    }
 
+    private void processMethod(MethodInfo methodInfo, List<String> listOfInvisibleTypes) {
+        if (listOfInvisibleTypes.contains(methodInfo.getReturnTypeName())) {
+            methodInfo.setReturnTypeName("java.lang.Object");
+        }
+        for (String thrownTypeName : methodInfo.getThrownTypeNames()) {
+            if (listOfInvisibleTypes.contains(thrownTypeName)) {
+                // TODO and this can be complex...
+            }
+        }
+        for (FieldInfo paramInfo : methodInfo.getParameterTypes()) {
+            if (listOfInvisibleTypes.contains(paramInfo.getFieldTypeName())) {
+                paramInfo.setFieldTypeName("java.lang.Object");
+            }
         }
     }