Commenting and cleaning

src/main/java/me/tomassetti/symbolsolver/model/declarations/ClassDeclaration.java → src/main/java/me/tomassetti/symbolsolver/model/declarations/ClassOrInterfaceDeclaration.java

@@ -5,11 +5,8 @@
 import java.util.List;
 
 /**
- * A class declaration.
- * Not an interface declaration.
+ * A class or interface declaration.
  */
-public interface ClassDeclaration extends TypeDeclaration {
-
+public interface ClassOrInterfaceDeclaration extends TypeDeclaration {
     public List<TypeParameter> getTypeParameters();
-
 }

src/main/java/me/tomassetti/symbolsolver/model/declarations/Declaration.java

@@ -7,5 +7,8 @@ public interface Declaration {
     String getName();
     boolean isField();
     boolean isParameter();
+    boolean isVariable();
     boolean isType();
+    boolean isClass();
+    boolean isInterface();
 }

src/main/java/me/tomassetti/symbolsolver/model/declarations/MethodDeclaration.java

@@ -10,6 +10,10 @@
  */
 public interface MethodDeclaration extends Declaration, TypeParametrized {
 
+    /**
+     * The type in which the method is declared.
+     * @return
+     */
     TypeDeclaration declaringType();
 
     TypeDeclaration getReturnType(TypeSolver typeSolver);

src/main/java/me/tomassetti/symbolsolver/model/declarations/ParameterDeclaration.java

@@ -1,7 +1,37 @@
 package me.tomassetti.symbolsolver.model.declarations;
 
 /**
- * Created by federico on 02/08/15.
+ * @author Federico Tomassetti
  */
 public interface ParameterDeclaration extends ValueDeclaration {
+
+    @Override
+    default boolean isField() {
+        return false;
+    }
+
+    @Override
+    default boolean isParameter() {
+        return true;
+    }
+
+    @Override
+    default boolean isVariable() {
+        return false;
+    }
+
+    @Override
+    default boolean isType() {
+        return false;
+    }
+
+    @Override
+    default boolean isClass() {
+        return false;
+    }
+
+    @Override
+    default boolean isInterface() {
+        return false;
+    }
 }

src/main/java/me/tomassetti/symbolsolver/model/declarations/TypeDeclaration.java

@@ -12,7 +12,7 @@
 import java.util.Optional;
 
 /**
- * Created by federico on 31/07/15.
+ * @author Federico Tomassetti
  */
 public interface TypeDeclaration extends Declaration, TypeParametrized {
     String getQualifiedName();
@@ -37,7 +37,6 @@ default SymbolReference<MethodDeclaration> solveMethod(String name, List<TypeUsa
 
     boolean hasField(String name);
 
-
     default Optional<MethodUsage> solveMethodAsUsage(String name, List<TypeUsage> parameterTypes, TypeSolver typeSolver, Context invokationContext) {
         return getContext().solveMethodAsUsage(name, parameterTypes, typeSolver);
     }

src/main/java/me/tomassetti/symbolsolver/model/declarations/TypeParametrized.java

@@ -7,7 +7,7 @@
 import java.util.Optional;
 
 /**
- * Created by federico on 03/08/15.
+ * @author Federico Tomassetti
  */
 public interface TypeParametrized {
 

src/main/java/me/tomassetti/symbolsolver/model/declarations/ValueDeclaration.java

@@ -4,12 +4,10 @@
 import me.tomassetti.symbolsolver.model.usages.TypeUsage;
 
 /**
- * Created by federico on 28/07/15.
+ * @author Federico Tomassetti
  */
 public interface ValueDeclaration extends Declaration {
 
-    TypeDeclaration asTypeDeclaration();
-
     TypeDeclaration getType(TypeSolver typeSolver);
 
     default TypeUsage getTypeUsage(TypeSolver typeSolver) {

src/main/java/me/tomassetti/symbolsolver/model/declarations/VoidTypeDeclaration.java

@@ -63,9 +63,24 @@ public boolean isParameter() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public boolean isVariable() {
+        return false;
+    }
+
     @Override
     public boolean isType() {
-        throw new UnsupportedOperationException();
+        return true;
+    }
+
+    @Override
+    public boolean isClass() {
+        return false;
+    }
+
+    @Override
+    public boolean isInterface() {
+        return false;
     }
 
     @Override

src/main/java/me/tomassetti/symbolsolver/model/javaparser/declarations/JavaParserClassDeclaration.java

@@ -6,8 +6,7 @@
 import com.github.javaparser.ast.body.*;
 import me.tomassetti.symbolsolver.model.*;
 import me.tomassetti.symbolsolver.model.FieldDeclaration;
-import me.tomassetti.symbolsolver.model.declarations.ClassDeclaration;
-import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
+import me.tomassetti.symbolsolver.model.declarations.ClassOrInterfaceDeclaration;
 import me.tomassetti.symbolsolver.model.javaparser.JavaParserFactory;
 import me.tomassetti.symbolsolver.model.usages.TypeUsage;
 
@@ -18,13 +17,13 @@
 /**
  * Created by federico on 30/07/15.
  */
-public class JavaParserClassDeclaration implements ClassDeclaration {
+public class JavaParserClassDeclaration implements ClassOrInterfaceDeclaration {
 
-    public JavaParserClassDeclaration(ClassOrInterfaceDeclaration wrappedNode) {
+    public JavaParserClassDeclaration(com.github.javaparser.ast.body.ClassOrInterfaceDeclaration wrappedNode) {
         this.wrappedNode = wrappedNode;
     }
 
-    private ClassOrInterfaceDeclaration wrappedNode;
+    private com.github.javaparser.ast.body.ClassOrInterfaceDeclaration wrappedNode;
 
     @Override
     public Context getContext() {
@@ -51,11 +50,26 @@ public boolean isParameter() {
         return false;
     }
 
+    @Override
+    public boolean isVariable() {
+        return false;
+    }
+
     @Override
     public boolean isType() {
         return true;
     }
 
+    @Override
+    public boolean isClass() {
+        return !wrappedNode.isInterface();
+    }
+
+    @Override
+    public boolean isInterface() {
+        return wrappedNode.isInterface();
+    }
+
     @Override
     public String getQualifiedName() {
         String containerName = containerName("", wrappedNode.getParentNode());
@@ -67,9 +81,9 @@ public String getQualifiedName() {
     }
 
     private String containerName(String base, Node container) {
-        if (container instanceof ClassOrInterfaceDeclaration) {
+        if (container instanceof com.github.javaparser.ast.body.ClassOrInterfaceDeclaration) {
             String b = containerName(base, container.getParentNode());
-            String cn = ((ClassOrInterfaceDeclaration)container).getName();
+            String cn = ((com.github.javaparser.ast.body.ClassOrInterfaceDeclaration)container).getName();
             if (b.isEmpty()) {
                 return cn;
             } else {

src/main/java/me/tomassetti/symbolsolver/model/javaparser/declarations/JavaParserFieldDeclaration.java

@@ -27,72 +27,48 @@ public JavaParserFieldDeclaration(VariableDeclarator variableDeclarator) {
         this.fieldDeclaration = (com.github.javaparser.ast.body.FieldDeclaration)variableDeclarator.getParentNode();
     }
 
-    @Override
-    public TypeDeclaration asTypeDeclaration() {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public TypeUsage getTypeUsage(TypeSolver typeSolver) {
         return JavaParserFacade.get(typeSolver).convertToUsage(fieldDeclaration.getType(), fieldDeclaration);
-        /*TypeUsage typeUsage = new TypeUsageOfTypeDeclaration(typeDeclaration);
-        if (!typeUsage.parameters().isEmpty()) {
-            throw new UnsupportedOperationException(typeUsage.toString()+" "+fieldDeclaration.getType());
-        }
-        return typeUsage;*/
     }
 
-    /*private TypeUsage replaceTypeParams(TypeUsage typeUsage){
-        System.out.println("GOT "+typeUsage);
-        if (typeUsage.isTypeVariable()) {
-            System.out.println("  is type variable");
-            TypeParameter typeParameter = typeUsage.asTypeParameter();
-            if (typeParameter.declaredOnClass()) {
-                System.out.println("  declared on class");
-                System.out.println("  type param name "+typeParameter.getName());
-                Optional<TypeUsage> typeParam = typeParamByName(typeParameter.getName());
-                if (typeParam.isPresent()) {
-                    typeUsage = typeParam.get();
-                }
-            }
-        }
-
-        for (int i=0; i<typeUsage.parameters().size(); i++) {
-            TypeUsage replaced = replaceTypeParams(typeUsage.parameters().get(i));
-            // Identity comparison on purpose
-            if (replaced != typeUsage.parameters().get(i)) {
-                typeUsage = typeUsage.replaceParam(i, replaced);
-            }
-        }
-
-        System.out.println("TRANSFORMED IN "+typeUsage);
-
-        return typeUsage;
-    }*/
-
-
     @Override
     public TypeDeclaration getType(TypeSolver typeSolver) {
         return JavaParserFacade.get(typeSolver).convert(fieldDeclaration.getType(), fieldDeclaration);
     }
 
     @Override
     public String getName() {
-        throw new UnsupportedOperationException();
+        return variableDeclarator.getId().getName();
     }
 
     @Override
     public boolean isField() {
-        throw new UnsupportedOperationException();
+        return true;
     }
 
     @Override
     public boolean isParameter() {
-        throw new UnsupportedOperationException();
+        return false;
+    }
+
+    @Override
+    public boolean isVariable() {
+        return false;
     }
 
     @Override
     public boolean isType() {
-        throw new UnsupportedOperationException();
+        return false;
+    }
+
+    @Override
+    public boolean isClass() {
+        return false;
+    }
+
+    @Override
+    public boolean isInterface() {
+        return false;
     }
 }

src/main/java/me/tomassetti/symbolsolver/model/javaparser/declarations/JavaParserMethodDeclaration.java

@@ -121,11 +121,26 @@ public boolean isParameter() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public boolean isVariable() {
+        return false;
+    }
+
     @Override
     public boolean isType() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public boolean isClass() {
+        return false;
+    }
+
+    @Override
+    public boolean isInterface() {
+        return false;
+    }
+
     @Override
     public List<TypeParameter> getTypeParameters() {
         throw new UnsupportedOperationException();

src/main/java/me/tomassetti/symbolsolver/model/javaparser/declarations/JavaParserParameterDeclaration.java

@@ -37,11 +37,6 @@ public boolean isType() {
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public TypeDeclaration asTypeDeclaration() {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public TypeDeclaration getType(TypeSolver typeSolver) {
         return JavaParserFacade.get(typeSolver).convert(wrappedNode.getType(), wrappedNode);

src/main/java/me/tomassetti/symbolsolver/model/javaparser/declarations/JavaParserSymbolDeclaration.java

@@ -23,14 +23,15 @@ public class JavaParserSymbolDeclaration implements ValueDeclaration {
     private Node wrappedNode;
     private boolean field;
     private boolean parameter;
+    private boolean variable;
     private TypeSolver typeSolver;
 
     public static JavaParserSymbolDeclaration field(VariableDeclarator wrappedNode, TypeSolver typeSolver) {
-        return new JavaParserSymbolDeclaration(wrappedNode, wrappedNode.getId().getName(), typeSolver, true, false);
+        return new JavaParserSymbolDeclaration(wrappedNode, wrappedNode.getId().getName(), typeSolver, true, false, false);
     }
 
     public static JavaParserSymbolDeclaration parameter(Parameter parameter, TypeSolver typeSolver) {
-        return new JavaParserSymbolDeclaration(parameter, parameter.getId().getName(), typeSolver, false, true);
+        return new JavaParserSymbolDeclaration(parameter, parameter.getId().getName(), typeSolver, false, true, false);
     }
 
     @Override
@@ -41,10 +42,11 @@ public String toString() {
                 '}';
     }
 
-    private JavaParserSymbolDeclaration(Node wrappedNode, String name, TypeSolver typeSolver, boolean field, boolean parameter) {
+    private JavaParserSymbolDeclaration(Node wrappedNode, String name, TypeSolver typeSolver, boolean field, boolean parameter, boolean variable) {
         this.name = name;
         this.wrappedNode = wrappedNode;
         this.field = field;
+        this.variable = variable;
         this.parameter = parameter;
         this.typeSolver = typeSolver;
     }
@@ -64,14 +66,24 @@ public boolean isParameter() {
         return parameter;
     }
 
+    @Override
+    public boolean isVariable() {
+        return variable;
+    }
+
     @Override
     public boolean isType() {
         return false;
     }
 
     @Override
-    public TypeDeclaration asTypeDeclaration() {
-        throw new UnsupportedOperationException();
+    public boolean isClass() {
+        return false;
+    }
+
+    @Override
+    public boolean isInterface() {
+        return false;
     }
 
     @Override