logic: simplify AbstractTypeDeclaration

javaparser · Nov 22, 2015 · 949f967 · 949f967
1 parent 3f27992
commit 949f967
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/...a/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java b/...a/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java
@@ -43,6 +43,11 @@ public JavaParserClassDeclaration(com.github.javaparser.ast.body.ClassOrInterfac
         this.typeSolver = typeSolver;
     }
 
+    @Override
+    public SymbolReference<MethodDeclaration> solveMethod(String name, List<TypeUsage> parameterTypes) {
+        return getContext().solveMethod(name, parameterTypes, typeSolver());
+    }
+
     @Override
     public Context getContext() {
         return JavaParserFactory.getContext(wrappedNode, typeSolver);

diff --git a/.../tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java b/.../tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java
@@ -40,6 +40,11 @@ public JavaParserInterfaceDeclaration(ClassOrInterfaceDeclaration wrappedNode, T
         this.typeSolver = typeSolver;
     }
 
+    @Override
+    public SymbolReference<MethodDeclaration> solveMethod(String name, List<TypeUsage> parameterTypes) {
+        return getContext().solveMethod(name, parameterTypes, typeSolver());
+    }
+
     @Override
     public Set<MethodDeclaration> getDeclaredMethods() {
         throw new UnsupportedOperationException();

diff --git a/...java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameter.java b/...java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameter.java
@@ -37,6 +37,11 @@ public Set<MethodDeclaration> getDeclaredMethods() {
         return Collections.emptySet();
     }
 
+    @Override
+    public SymbolReference<MethodDeclaration> solveMethod(String name, List<TypeUsage> parameterTypes) {
+        return getContext().solveMethod(name, parameterTypes, typeSolver());
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

diff --git a/...solver-logic/src/main/java/me/tomassetti/symbolsolver/logic/AbstractClassDeclaration.java b/...solver-logic/src/main/java/me/tomassetti/symbolsolver/logic/AbstractClassDeclaration.java
@@ -41,7 +41,6 @@ public final List<ReferenceTypeUsage> getAllSuperClasses() {
     public final List<InterfaceDeclaration> getAllInterfaces() {
         // TODO it could specify type parameters: they should appear
         List<InterfaceDeclaration> interfaces = new ArrayList<>();
-        //ClassDeclaration superClass = getSuperClass(typeSolver);
         for (InterfaceDeclaration interfaceDeclaration : getInterfaces()) {
             interfaces.add(interfaceDeclaration);
             interfaces.addAll(interfaceDeclaration.getAllInterfacesExtended());

diff --git a/...-solver-logic/src/main/java/me/tomassetti/symbolsolver/logic/AbstractTypeDeclaration.java b/...-solver-logic/src/main/java/me/tomassetti/symbolsolver/logic/AbstractTypeDeclaration.java
@@ -3,22 +3,14 @@
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
 import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration;
 import me.tomassetti.symbolsolver.model.invokations.MethodUsage;
-import me.tomassetti.symbolsolver.model.resolution.SymbolReference;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsage;
-import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
 
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 public abstract class AbstractTypeDeclaration implements TypeDeclaration {
 
-    @Override
-    public SymbolReference<MethodDeclaration> solveMethod(String name, List<TypeUsage> parameterTypes) {
-        return getContext().solveMethod(name, parameterTypes, typeSolver());
-    }
-
     protected abstract TypeSolver typeSolver();
 
     @Override