Issue #326: Improve clarity of variable names and remove incorrect @d…

…eprecated annotation.
javaparser · Nov 2, 2017 · 0b37d59 · 0b37d59
1 parent c1cde43
commit 0b37d59
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/...ain/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistClassDeclaration.java b/...ain/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistClassDeclaration.java
@@ -157,8 +157,8 @@ private SymbolReference<? extends ResolvedValueDeclaration> solveSymbolForFQN(St
             return SymbolReference.unsolved(ResolvedValueDeclaration.class);
         }
 
-        ResolvedReferenceTypeDeclaration superClass = typeSolver.solveType(fqn);
-        return new SymbolSolver(typeSolver).solveSymbolInType(superClass, symbolName);
+        ResolvedReferenceTypeDeclaration fqnTypeDeclaration = typeSolver.solveType(fqn);
+        return new SymbolSolver(typeSolver).solveSymbolInType(fqnTypeDeclaration, symbolName);
     }
 
     private String[] getInterfaceFQNs() {

diff --git a/...main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumDeclaration.java b/...main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumDeclaration.java
@@ -234,7 +234,6 @@ public boolean hasInternalType(String name) {
         return this.internalTypes().stream().anyMatch(f -> f.getName().endsWith(name));
     }
 
-    @Deprecated
     public SymbolReference<? extends ResolvedValueDeclaration> solveSymbol(String name, TypeSolver typeSolver) {
         for (CtField field : ctClass.getDeclaredFields()) {
             if (field.getName().equals(name)) {
@@ -258,8 +257,8 @@ private SymbolReference<? extends ResolvedValueDeclaration> solveSymbolForFQN(St
             return SymbolReference.unsolved(ResolvedValueDeclaration.class);
         }
 
-        ResolvedReferenceTypeDeclaration superClass = typeSolver.solveType(fqn);
-        return new SymbolSolver(typeSolver).solveSymbolInType(superClass, symbolName);
+        ResolvedReferenceTypeDeclaration fqnTypeDeclaration = typeSolver.solveType(fqn);
+        return new SymbolSolver(typeSolver).solveSymbolInType(fqnTypeDeclaration, symbolName);
     }
 
     private String[] getInterfaceFQNs() {

diff --git a/...java/com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclaration.java b/...java/com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclaration.java
@@ -243,8 +243,8 @@ private SymbolReference<? extends ResolvedValueDeclaration> solveSymbolForFQN(St
             return SymbolReference.unsolved(ResolvedValueDeclaration.class);
         }
 
-        ResolvedReferenceTypeDeclaration superClass = typeSolver.solveType(fqn);
-        return new SymbolSolver(typeSolver).solveSymbolInType(superClass, symbolName);
+        ResolvedReferenceTypeDeclaration fqnTypeDeclaration = typeSolver.solveType(fqn);
+        return new SymbolSolver(typeSolver).solveSymbolInType(fqnTypeDeclaration, symbolName);
     }
 
     private String[] getInterfaceFQNs() {