reorganize packages

javaparser · Oct 30, 2015 · b36f330 · b36f330
1 parent 9099980
commit b36f330
Show file tree

Hide file tree

Showing 100 changed files with 303 additions and 312 deletions.
diff --git a/src/main/java/me/tomassetti/symbolsolver/JavaParserFacade.java b/src/main/java/me/tomassetti/symbolsolver/JavaParserFacade.java
@@ -8,15 +8,15 @@
 import com.github.javaparser.ast.type.*;
 import com.github.javaparser.ast.type.PrimitiveType;
 import com.github.javaparser.ast.type.ReferenceType;
-import me.tomassetti.symbolsolver.model.*;
+import me.tomassetti.symbolsolver.resolution.*;
 import me.tomassetti.symbolsolver.model.declarations.*;
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
 import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration;
-import me.tomassetti.symbolsolver.model.javaparser.declarations.*;
+import me.tomassetti.symbolsolver.resolution.javaparser.declarations.*;
-import me.tomassetti.symbolsolver.model.typesolvers.JreTypeSolver;
+import me.tomassetti.symbolsolver.resolution.typesolvers.JreTypeSolver;
 import me.tomassetti.symbolsolver.model.typesystem.*;
-import me.tomassetti.symbolsolver.model.javaparser.JavaParserFactory;
+import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory;
-import me.tomassetti.symbolsolver.model.javaparser.UnsolvedSymbolException;
+import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException;
 
 
 import java.util.*;

diff --git a/src/main/java/me/tomassetti/symbolsolver/ProjectResolver.java b/src/main/java/me/tomassetti/symbolsolver/ProjectResolver.java
@@ -15,9 +15,9 @@
 
 
 
-import me.tomassetti.symbolsolver.model.typesolvers.CombinedTypeSolver;
+import me.tomassetti.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
-import me.tomassetti.symbolsolver.model.typesolvers.JavaParserTypeSolver;
+import me.tomassetti.symbolsolver.resolution.typesolvers.JavaParserTypeSolver;
-import me.tomassetti.symbolsolver.model.typesolvers.JreTypeSolver;
+import me.tomassetti.symbolsolver.resolution.typesolvers.JreTypeSolver;
 
 
 import java.io.File;

diff --git a/src/main/java/me/tomassetti/symbolsolver/SourceFileInfoExtractor.java b/src/main/java/me/tomassetti/symbolsolver/SourceFileInfoExtractor.java
@@ -12,7 +12,7 @@
 import com.github.javaparser.ast.body.VariableDeclarator;
 import com.github.javaparser.ast.expr.Expression;
 import com.github.javaparser.ast.stmt.Statement;
-import me.tomassetti.symbolsolver.model.TypeSolver;
+import me.tomassetti.symbolsolver.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration;
 
 

diff --git a/src/main/java/me/tomassetti/symbolsolver/model/declarations/ClassDeclaration.java b/src/main/java/me/tomassetti/symbolsolver/model/declarations/ClassDeclaration.java
@@ -1,6 +1,6 @@
 package me.tomassetti.symbolsolver.model.declarations;
 
-import me.tomassetti.symbolsolver.model.TypeSolver;
+import me.tomassetti.symbolsolver.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsage;
 
 import java.util.ArrayList;

diff --git a/src/main/java/me/tomassetti/symbolsolver/model/declarations/InterfaceDeclaration.java b/src/main/java/me/tomassetti/symbolsolver/model/declarations/InterfaceDeclaration.java
@@ -1,6 +1,6 @@
 package me.tomassetti.symbolsolver.model.declarations;
 
-import me.tomassetti.symbolsolver.model.TypeSolver;
+import me.tomassetti.symbolsolver.resolution.TypeSolver;
 
 import java.util.ArrayList;
 

diff --git a/src/main/java/me/tomassetti/symbolsolver/model/declarations/MethodDeclaration.java b/src/main/java/me/tomassetti/symbolsolver/model/declarations/MethodDeclaration.java
@@ -1,8 +1,8 @@
 package me.tomassetti.symbolsolver.model.declarations;
 
 import com.github.javaparser.ast.Node;
-import me.tomassetti.symbolsolver.model.Context;
+import me.tomassetti.symbolsolver.resolution.Context;
-import me.tomassetti.symbolsolver.model.TypeSolver;
+import me.tomassetti.symbolsolver.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.typesystem.MethodUsage;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
 
@@ -30,6 +30,7 @@ public interface MethodDeclaration extends Declaration, TypeParametrized {
      * @param node
      * @return
      */
+    @Deprecated
     MethodUsage getUsage(Node node);
 
     /**

diff --git a/src/main/java/me/tomassetti/symbolsolver/model/declarations/TypeDeclaration.java b/src/main/java/me/tomassetti/symbolsolver/model/declarations/TypeDeclaration.java
@@ -1,9 +1,9 @@
 package me.tomassetti.symbolsolver.model.declarations;
 
 import com.github.javaparser.ast.Node;
-import me.tomassetti.symbolsolver.model.Context;
+import me.tomassetti.symbolsolver.resolution.Context;
-import me.tomassetti.symbolsolver.model.SymbolReference;
+import me.tomassetti.symbolsolver.resolution.SymbolReference;
-import me.tomassetti.symbolsolver.model.TypeSolver;
+import me.tomassetti.symbolsolver.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.typesystem.MethodUsage;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
 import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsage;
@@ -34,6 +34,7 @@ default Optional<MethodUsage> solveMethodAsUsage(String name, List<TypeUsage> pa
      * @param node
      * @return
      */
+    @Deprecated
     TypeUsage getUsage(Node node);
 
     boolean isAssignableBy(TypeUsage typeUsage, TypeSolver typeSolver);

diff --git a/src/main/java/me/tomassetti/symbolsolver/model/declarations/TypeParametrized.java b/src/main/java/me/tomassetti/symbolsolver/model/declarations/TypeParametrized.java
@@ -1,6 +1,6 @@
 package me.tomassetti.symbolsolver.model.declarations;
 
-import me.tomassetti.symbolsolver.model.TypeParameter;
+import me.tomassetti.symbolsolver.resolution.TypeParameter;
 
 
 import java.util.List;

diff --git a/src/main/java/me/tomassetti/symbolsolver/model/declarations/ValueDeclaration.java b/src/main/java/me/tomassetti/symbolsolver/model/declarations/ValueDeclaration.java
@@ -1,6 +1,6 @@
 package me.tomassetti.symbolsolver.model.declarations;
 
-import me.tomassetti.symbolsolver.model.TypeSolver;
+import me.tomassetti.symbolsolver.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
 
 

diff --git a/src/main/java/me/tomassetti/symbolsolver/model/javaparser/package-info.java b/src/main/java/me/tomassetti/symbolsolver/model/javaparser/package-info.java
diff --git a/src/main/java/me/tomassetti/symbolsolver/model/javassist/package-info.java b/src/main/java/me/tomassetti/symbolsolver/model/javassist/package-info.java
diff --git a/src/main/java/me/tomassetti/symbolsolver/model/reflection/package-info.java b/src/main/java/me/tomassetti/symbolsolver/model/reflection/package-info.java
diff --git a/src/main/java/me/tomassetti/symbolsolver/model/typesystem/ArrayTypeUsage.java b/src/main/java/me/tomassetti/symbolsolver/model/typesystem/ArrayTypeUsage.java
@@ -1,7 +1,7 @@
 package me.tomassetti.symbolsolver.model.typesystem;
 
-import me.tomassetti.symbolsolver.model.SymbolReference;
+import me.tomassetti.symbolsolver.resolution.SymbolReference;
-import me.tomassetti.symbolsolver.model.TypeSolver;
+import me.tomassetti.symbolsolver.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
 
 import java.util.Collections;

diff --git a/src/main/java/me/tomassetti/symbolsolver/model/typesystem/LambdaTypeUsagePlaceholder.java b/src/main/java/me/tomassetti/symbolsolver/model/typesystem/LambdaTypeUsagePlaceholder.java
@@ -1,12 +1,10 @@
 package me.tomassetti.symbolsolver.model.typesystem;
 
-import me.tomassetti.symbolsolver.model.Context;
+import me.tomassetti.symbolsolver.resolution.SymbolReference;
-import me.tomassetti.symbolsolver.model.SymbolReference;
+import me.tomassetti.symbolsolver.resolution.TypeSolver;
-import me.tomassetti.symbolsolver.model.TypeSolver;
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
 
 import java.util.List;
-import java.util.Optional;
 
 /**
  * Created by federico on 02/08/15.

diff --git a/src/main/java/me/tomassetti/symbolsolver/model/typesystem/MethodUsage.java b/src/main/java/me/tomassetti/symbolsolver/model/typesystem/MethodUsage.java
@@ -1,7 +1,7 @@
 package me.tomassetti.symbolsolver.model.typesystem;
 
 
-import me.tomassetti.symbolsolver.model.TypeSolver;
+import me.tomassetti.symbolsolver.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
 import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration;
 

diff --git a/src/main/java/me/tomassetti/symbolsolver/model/typesystem/NullTypeUsage.java b/src/main/java/me/tomassetti/symbolsolver/model/typesystem/NullTypeUsage.java
@@ -1,7 +1,7 @@
 package me.tomassetti.symbolsolver.model.typesystem;
 
-import me.tomassetti.symbolsolver.model.SymbolReference;
+import me.tomassetti.symbolsolver.resolution.SymbolReference;
-import me.tomassetti.symbolsolver.model.TypeSolver;
+import me.tomassetti.symbolsolver.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
 
 import java.util.Collections;

diff --git a/src/main/java/me/tomassetti/symbolsolver/model/typesystem/PrimitiveTypeUsage.java b/src/main/java/me/tomassetti/symbolsolver/model/typesystem/PrimitiveTypeUsage.java
@@ -1,8 +1,8 @@
 package me.tomassetti.symbolsolver.model.typesystem;
 
 import com.google.common.collect.ImmutableList;
-import me.tomassetti.symbolsolver.model.SymbolReference;
+import me.tomassetti.symbolsolver.resolution.SymbolReference;
-import me.tomassetti.symbolsolver.model.TypeSolver;
+import me.tomassetti.symbolsolver.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
 
 import java.util.Collections;

diff --git a/src/main/java/me/tomassetti/symbolsolver/model/typesystem/ReferenceTypeUsage.java b/src/main/java/me/tomassetti/symbolsolver/model/typesystem/ReferenceTypeUsage.java
@@ -1,10 +1,10 @@
 package me.tomassetti.symbolsolver.model.typesystem;
 
-import me.tomassetti.symbolsolver.model.*;
+import me.tomassetti.symbolsolver.resolution.*;
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
 import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration;
-import me.tomassetti.symbolsolver.model.javaparser.declarations.JavaParserTypeVariableDeclaration;
+import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserTypeVariableDeclaration;
-import me.tomassetti.symbolsolver.model.reflection.ReflectionClassDeclaration;
+import me.tomassetti.symbolsolver.resolution.reflection.ReflectionClassDeclaration;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/src/main/java/me/tomassetti/symbolsolver/model/typesystem/TypeUsage.java b/src/main/java/me/tomassetti/symbolsolver/model/typesystem/TypeUsage.java
@@ -1,10 +1,9 @@
 package me.tomassetti.symbolsolver.model.typesystem;
 
-import me.tomassetti.symbolsolver.model.*;
+import me.tomassetti.symbolsolver.resolution.*;
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
-import me.tomassetti.symbolsolver.model.javaparser.UnsolvedSymbolException;
+import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -133,6 +132,7 @@ default TypeUsage solveGenericTypes(Context context, TypeSolver typeSolver) {
     ///
 
     SymbolReference<MethodDeclaration> solveMethod(String name, List<TypeUsage> parameterTypes, TypeSolver typeSolver);
+
     default Optional<MethodUsage> solveMethodAsUsage(String name, List<TypeUsage> parameterTypes, TypeSolver typeSolver, Context invokationContext) {
         throw new UnsupportedOperationException(this.getClass().getCanonicalName());
     }

diff --git a/src/main/java/me/tomassetti/symbolsolver/model/typesystem/TypeUsageOfTypeParameter.java b/src/main/java/me/tomassetti/symbolsolver/model/typesystem/TypeUsageOfTypeParameter.java
@@ -1,9 +1,9 @@
 package me.tomassetti.symbolsolver.model.typesystem;
 
-import me.tomassetti.symbolsolver.model.Context;
+import me.tomassetti.symbolsolver.resolution.Context;
-import me.tomassetti.symbolsolver.model.SymbolReference;
+import me.tomassetti.symbolsolver.resolution.SymbolReference;
-import me.tomassetti.symbolsolver.model.TypeParameter;
+import me.tomassetti.symbolsolver.resolution.TypeParameter;
-import me.tomassetti.symbolsolver.model.TypeSolver;
+import me.tomassetti.symbolsolver.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
 
 import java.util.Collections;

diff --git a/src/main/java/me/tomassetti/symbolsolver/model/typesystem/VoidTypeUsage.java b/src/main/java/me/tomassetti/symbolsolver/model/typesystem/VoidTypeUsage.java
@@ -1,13 +1,11 @@
 package me.tomassetti.symbolsolver.model.typesystem;
 
-import me.tomassetti.symbolsolver.model.Context;
+import me.tomassetti.symbolsolver.resolution.SymbolReference;
-import me.tomassetti.symbolsolver.model.SymbolReference;
+import me.tomassetti.symbolsolver.resolution.TypeSolver;
-import me.tomassetti.symbolsolver.model.TypeSolver;
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 
 public class VoidTypeUsage implements TypeUsage {
     public static final TypeUsage INSTANCE = new VoidTypeUsage();

diff --git a/src/main/java/me/tomassetti/symbolsolver/model/typesystem/WildcardUsage.java b/src/main/java/me/tomassetti/symbolsolver/model/typesystem/WildcardUsage.java
@@ -1,8 +1,8 @@
 package me.tomassetti.symbolsolver.model.typesystem;
 
 import com.github.javaparser.ast.type.WildcardType;
-import me.tomassetti.symbolsolver.model.SymbolReference;
+import me.tomassetti.symbolsolver.resolution.SymbolReference;
-import me.tomassetti.symbolsolver.model.TypeSolver;
+import me.tomassetti.symbolsolver.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
 
 import java.util.Collections;

diff --git a/...omassetti/symbolsolver/model/Context.java → ...etti/symbolsolver/resolution/Context.java b/...omassetti/symbolsolver/model/Context.java → ...etti/symbolsolver/resolution/Context.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.model;
+package me.tomassetti.symbolsolver.resolution;
 
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
 import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration;

diff --git a/...i/symbolsolver/model/MethodReference.java → ...bolsolver/resolution/MethodReference.java b/...i/symbolsolver/model/MethodReference.java → ...bolsolver/resolution/MethodReference.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.model;
+package me.tomassetti.symbolsolver.resolution;
 
 /**
  * Created by federico on 28/07/15.

diff --git a/...olsolver/model/MethodResolutionLogic.java → ...ver/resolution/MethodResolutionLogic.java b/...olsolver/model/MethodResolutionLogic.java → ...ver/resolution/MethodResolutionLogic.java
@@ -1,8 +1,8 @@
-package me.tomassetti.symbolsolver.model;
+package me.tomassetti.symbolsolver.resolution;
 
 import me.tomassetti.symbolsolver.model.declarations.MethodAmbiguityException;
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
-import me.tomassetti.symbolsolver.model.reflection.ReflectionClassDeclaration;
+import me.tomassetti.symbolsolver.resolution.reflection.ReflectionClassDeclaration;
 import me.tomassetti.symbolsolver.model.typesystem.MethodUsage;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
 import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsage;

diff --git a/.../symbolsolver/model/SymbolDeclarator.java → ...olsolver/resolution/SymbolDeclarator.java b/.../symbolsolver/model/SymbolDeclarator.java → ...olsolver/resolution/SymbolDeclarator.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.model;
+package me.tomassetti.symbolsolver.resolution;
 
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
 import me.tomassetti.symbolsolver.model.declarations.ValueDeclaration;

diff --git a/...i/symbolsolver/model/SymbolReference.java → ...bolsolver/resolution/SymbolReference.java b/...i/symbolsolver/model/SymbolReference.java → ...bolsolver/resolution/SymbolReference.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.model;
+package me.tomassetti.symbolsolver.resolution;
 
 import me.tomassetti.symbolsolver.model.declarations.Declaration;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;

diff --git a/...etti/symbolsolver/model/SymbolSolver.java → ...symbolsolver/resolution/SymbolSolver.java b/...etti/symbolsolver/model/SymbolSolver.java → ...symbolsolver/resolution/SymbolSolver.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.model;
+package me.tomassetti.symbolsolver.resolution;
 
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
@@ -7,8 +7,8 @@
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
 import me.tomassetti.symbolsolver.model.declarations.ValueDeclaration;
 import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration;
-import me.tomassetti.symbolsolver.model.javaparser.JavaParserFactory;
+import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory;
-import me.tomassetti.symbolsolver.model.javaparser.UnsolvedSymbolException;
+import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException;
 import me.tomassetti.symbolsolver.model.typesystem.MethodUsage;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
 import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsage;

diff --git a/...tti/symbolsolver/model/TypeParameter.java → ...ymbolsolver/resolution/TypeParameter.java b/...tti/symbolsolver/model/TypeParameter.java → ...ymbolsolver/resolution/TypeParameter.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.model;
+package me.tomassetti.symbolsolver.resolution;
 
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
 

diff --git a/...ssetti/symbolsolver/model/TypeSolver.java → ...i/symbolsolver/resolution/TypeSolver.java b/...ssetti/symbolsolver/model/TypeSolver.java → ...i/symbolsolver/resolution/TypeSolver.java
@@ -1,11 +1,8 @@
-package me.tomassetti.symbolsolver.model;
+package me.tomassetti.symbolsolver.resolution;
 
 import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration;
-import me.tomassetti.symbolsolver.model.javaparser.UnsolvedSymbolException;
+import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException;
 
-/**
- * Created by federico on 28/07/15.
- */
 public interface TypeSolver {
 
     public SymbolReference<TypeDeclaration> tryToSolveType(String name);

diff --git a/.../tomassetti/symbolsolver/model/Value.java → ...ssetti/symbolsolver/resolution/Value.java b/.../tomassetti/symbolsolver/model/Value.java → ...ssetti/symbolsolver/resolution/Value.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.model;
+package me.tomassetti.symbolsolver.resolution;
 
 import me.tomassetti.symbolsolver.model.declarations.ValueDeclaration;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;

diff --git a/...r/model/javaparser/JavaParserFactory.java → ...olution/javaparser/JavaParserFactory.java b/...r/model/javaparser/JavaParserFactory.java → ...olution/javaparser/JavaParserFactory.java
@@ -1,17 +1,17 @@
-package me.tomassetti.symbolsolver.model.javaparser;
+package me.tomassetti.symbolsolver.resolution.javaparser;
 
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.body.*;
 import com.github.javaparser.ast.expr.*;
 import com.github.javaparser.ast.stmt.*;
-import me.tomassetti.symbolsolver.model.Context;
+import me.tomassetti.symbolsolver.resolution.Context;
-import me.tomassetti.symbolsolver.model.SymbolDeclarator;
+import me.tomassetti.symbolsolver.resolution.SymbolDeclarator;
-import me.tomassetti.symbolsolver.model.TypeSolver;
+import me.tomassetti.symbolsolver.resolution.TypeSolver;
-import me.tomassetti.symbolsolver.model.javaparser.contexts.*;
+import me.tomassetti.symbolsolver.resolution.javaparser.contexts.*;
-import me.tomassetti.symbolsolver.model.javaparser.declarators.FieldSymbolDeclarator;
+import me.tomassetti.symbolsolver.resolution.javaparser.declarators.FieldSymbolDeclarator;
-import me.tomassetti.symbolsolver.model.javaparser.declarators.NoSimboyDeclarator;
+import me.tomassetti.symbolsolver.resolution.javaparser.declarators.NoSimboyDeclarator;
-import me.tomassetti.symbolsolver.model.javaparser.declarators.ParameterSymbolDeclarator;
+import me.tomassetti.symbolsolver.resolution.javaparser.declarators.ParameterSymbolDeclarator;
-import me.tomassetti.symbolsolver.model.javaparser.declarators.VariableSymbolDeclarator;
+import me.tomassetti.symbolsolver.resolution.javaparser.declarators.VariableSymbolDeclarator;
 
 /**
  * Created by federico on 28/07/15.

diff --git a/...l/javaparser/UnsolvedSymbolException.java → ...n/javaparser/UnsolvedSymbolException.java b/...l/javaparser/UnsolvedSymbolException.java → ...n/javaparser/UnsolvedSymbolException.java
@@ -1,10 +1,7 @@
-package me.tomassetti.symbolsolver.model.javaparser;
+package me.tomassetti.symbolsolver.resolution.javaparser;
 
-import me.tomassetti.symbolsolver.model.Context;
+import me.tomassetti.symbolsolver.resolution.Context;
 
-/**
- * Created by federico on 30/07/15.
- */
 public class UnsolvedSymbolException extends RuntimeException {
 
     private String context;

diff --git a/...del/javaparser/UnsolvedTypeException.java → ...ion/javaparser/UnsolvedTypeException.java b/...del/javaparser/UnsolvedTypeException.java → ...ion/javaparser/UnsolvedTypeException.java
@@ -1,6 +1,6 @@
-package me.tomassetti.symbolsolver.model.javaparser;
+package me.tomassetti.symbolsolver.resolution.javaparser;
 
-import me.tomassetti.symbolsolver.model.Context;
+import me.tomassetti.symbolsolver.resolution.Context;
 
 /**
  * Created by federico on 30/07/15.