Merge pull request #118 from moosetechnology/organize-imports

Organize imports
moosetechnology · Dec 3, 2024 · cc6788a · cc6788a
2 parents 6466e49 + af9ff7f
commit cc6788a
Show file tree

Hide file tree

Showing 8 changed files with 98 additions and 34 deletions.
diff --git a/app/src/main/java/fr/inria/verveine/extractor/java/visitors/defvisitors/VisitorComments.java b/app/src/main/java/fr/inria/verveine/extractor/java/visitors/defvisitors/VisitorComments.java
@@ -29,11 +29,7 @@
 
 import fr.inria.verveine.extractor.java.EntityDictionary;
 import fr.inria.verveine.extractor.java.VerveineJOptions;
-import fr.inria.verveine.extractor.java.utils.StructuralEntityKinds;
 import fr.inria.verveine.extractor.java.visitors.GetVisitedEntityAbstractVisitor;
-
-
-import org.moosetechnology.model.famix.famixjavaentities.LocalVariable;
 /**
  * A class to collect all comments.
  * Some important details on comments in JDT:

diff --git a/...c/main/java/fr/inria/verveine/extractor/java/visitors/refvisitors/AbstractRefVisitor.java b/...c/main/java/fr/inria/verveine/extractor/java/visitors/refvisitors/AbstractRefVisitor.java
@@ -5,14 +5,10 @@
 import fr.inria.verveine.extractor.java.visitors.GetVisitedEntityAbstractVisitor;
 import org.eclipse.jdt.core.dom.*;
 import org.moosetechnology.model.famix.famixjavaentities.ContainerEntity;
-import org.moosetechnology.model.famix.famixjavaentities.ParametricClass;
-//import org.moosetechnology.model.famix.famixjavaentities.ParameterizableInterface;
 import org.moosetechnology.model.famix.famixjavaentities.ParametricInterface;
 import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
-//import org.moosetechnology.model.famix.famixtraits.TParameterizedTypeUser;
 import org.moosetechnology.model.famix.famixtraits.TParametricEntity;
 import org.moosetechnology.model.famix.famixtraits.TType;
-//import org.moosetechnology.model.famix.famixtraits.TWithParameterizedTypes;
 import org.moosetechnology.model.famix.famixtraits.TWithTypes;
 
 /**
@@ -136,7 +132,8 @@ protected TType referedType(ITypeBinding bnd, TNamedEntity ctxt, boolean isClass
 			//}
 
 			for (ITypeBinding targ : bnd.getTypeArguments()) {
-				TType fmxTArg = this.referedType(targ, ctxt, false);
+				/* note: referedType() may create Famix entities, so it needs to be called */
+				/*TType fmxTArg =*/ this.referedType(targ, ctxt, false);
 				/*if (fmxTArg != null) {
 					((org.moosetechnology.model.famix.famixjavaentities.ParametricClass) fmxTyp).addArguments((TParameterizedTypeUser) fmxTArg);
 				}*/

diff --git a/...src/main/java/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorAccessRef.java b/...src/main/java/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorAccessRef.java
@@ -4,11 +4,55 @@
 import fr.inria.verveine.extractor.java.VerveineJOptions;
 import fr.inria.verveine.extractor.java.utils.ImplicitVarBinding;
 import fr.inria.verveine.extractor.java.utils.NodeTypeChecker;
-import org.eclipse.jdt.core.dom.*;
-import org.moosetechnology.model.famix.famixjavaentities.*;
+
+import org.eclipse.jdt.core.dom.ASTNode;
+import org.eclipse.jdt.core.dom.AnnotationTypeDeclaration;
+import org.eclipse.jdt.core.dom.AnnotationTypeMemberDeclaration;
+import org.eclipse.jdt.core.dom.AnonymousClassDeclaration;
+import org.eclipse.jdt.core.dom.ArrayAccess;
+import org.eclipse.jdt.core.dom.AssertStatement;
+import org.eclipse.jdt.core.dom.Assignment;
+import org.eclipse.jdt.core.dom.ClassInstanceCreation;
+import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.DoStatement;
+import org.eclipse.jdt.core.dom.EnhancedForStatement;
+import org.eclipse.jdt.core.dom.EnumConstantDeclaration;
+import org.eclipse.jdt.core.dom.EnumDeclaration;
+import org.eclipse.jdt.core.dom.Expression;
+import org.eclipse.jdt.core.dom.FieldAccess;
+import org.eclipse.jdt.core.dom.FieldDeclaration;
+import org.eclipse.jdt.core.dom.ForStatement;
+import org.eclipse.jdt.core.dom.IBinding;
+import org.eclipse.jdt.core.dom.IVariableBinding;
+import org.eclipse.jdt.core.dom.IfStatement;
+import org.eclipse.jdt.core.dom.InfixExpression;
+import org.eclipse.jdt.core.dom.Initializer;
+import org.eclipse.jdt.core.dom.LambdaExpression;
+import org.eclipse.jdt.core.dom.MethodDeclaration;
+import org.eclipse.jdt.core.dom.MethodInvocation;
+import org.eclipse.jdt.core.dom.PostfixExpression;
+import org.eclipse.jdt.core.dom.PrefixExpression;
+import org.eclipse.jdt.core.dom.QualifiedName;
+import org.eclipse.jdt.core.dom.ReturnStatement;
+import org.eclipse.jdt.core.dom.SimpleName;
+import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
+import org.eclipse.jdt.core.dom.SwitchCase;
+import org.eclipse.jdt.core.dom.SwitchStatement;
+import org.eclipse.jdt.core.dom.SynchronizedStatement;
+import org.eclipse.jdt.core.dom.ThisExpression;
+import org.eclipse.jdt.core.dom.ThrowStatement;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
+import org.eclipse.jdt.core.dom.TypeLiteral;
+import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
+import org.eclipse.jdt.core.dom.WhileStatement;
+import org.moosetechnology.model.famix.famixjavaentities.Attribute;
+import org.moosetechnology.model.famix.famixjavaentities.ContainerEntity;
 import org.moosetechnology.model.famix.famixjavaentities.Enum;
-import org.moosetechnology.model.famix.famixjavaentities.PrimitiveType;
-import org.moosetechnology.model.famix.famixjavaentities.Type;
+import org.moosetechnology.model.famix.famixjavaentities.EnumValue;
+import org.moosetechnology.model.famix.famixjavaentities.ImplicitVariable;
+import org.moosetechnology.model.famix.famixjavaentities.LocalVariable;
+import org.moosetechnology.model.famix.famixjavaentities.Method;
+import org.moosetechnology.model.famix.famixjavaentities.Parameter;
 import org.moosetechnology.model.famix.famixtraits.TAccess;
 import org.moosetechnology.model.famix.famixtraits.TMethod;
 import org.moosetechnology.model.famix.famixtraits.TNamedEntity;

diff --git a/...main/java/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorAnnotationRef.java b/...main/java/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorAnnotationRef.java
@@ -1,18 +1,33 @@
 package fr.inria.verveine.extractor.java.visitors.refvisitors;
 
-import fr.inria.verveine.extractor.java.EntityDictionary;
-import fr.inria.verveine.extractor.java.VerveineJOptions;
-import fr.inria.verveine.extractor.java.visitors.GetVisitedEntityAbstractVisitor;
-import org.eclipse.jdt.core.dom.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.jdt.core.dom.AnnotationTypeDeclaration;
+import org.eclipse.jdt.core.dom.AnonymousClassDeclaration;
+import org.eclipse.jdt.core.dom.EnumDeclaration;
+import org.eclipse.jdt.core.dom.FieldDeclaration;
+import org.eclipse.jdt.core.dom.IAnnotationBinding;
+import org.eclipse.jdt.core.dom.IBinding;
+import org.eclipse.jdt.core.dom.IMemberValuePairBinding;
+import org.eclipse.jdt.core.dom.ITypeBinding;
+import org.eclipse.jdt.core.dom.MethodDeclaration;
+import org.eclipse.jdt.core.dom.PackageDeclaration;
+import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
+import org.eclipse.jdt.core.dom.Type;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
+import org.eclipse.jdt.core.dom.VariableDeclaration;
+import org.eclipse.jdt.core.dom.VariableDeclarationExpression;
+import org.eclipse.jdt.core.dom.VariableDeclarationStatement;
 import org.moosetechnology.model.famix.famixjavaentities.AnnotationInstanceAttribute;
 import org.moosetechnology.model.famix.famixjavaentities.AnnotationType;
 import org.moosetechnology.model.famix.famixjavaentities.AnnotationTypeAttribute;
-import org.moosetechnology.model.famix.famixjavaentities.NamedEntity;
 import org.moosetechnology.model.famix.famixtraits.TWithAnnotationInstances;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import fr.inria.verveine.extractor.java.EntityDictionary;
+import fr.inria.verveine.extractor.java.VerveineJOptions;
+import fr.inria.verveine.extractor.java.visitors.GetVisitedEntityAbstractVisitor;
 
 /**
  * Recovers annotations from the IBinding of various kind of entities:

diff --git a/.../main/java/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorExceptionRef.java b/.../main/java/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorExceptionRef.java
@@ -1,18 +1,24 @@
 package fr.inria.verveine.extractor.java.visitors.refvisitors;
 
-import fr.inria.verveine.extractor.java.EntityDictionary;
-import fr.inria.verveine.extractor.java.VerveineJOptions;
-import fr.inria.verveine.extractor.java.utils.NodeTypeChecker;
-import org.eclipse.jdt.core.dom.*;
+import java.util.List;
+
+import org.eclipse.jdt.core.dom.CatchClause;
+import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.MethodDeclaration;
+import org.eclipse.jdt.core.dom.PackageDeclaration;
+import org.eclipse.jdt.core.dom.ThrowStatement;
+import org.eclipse.jdt.core.dom.Type;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
 import org.moosetechnology.model.famix.famixjavaentities.ContainerEntity;
-import org.moosetechnology.model.famix.famixjavaentities.Exception;
 import org.moosetechnology.model.famix.famixjavaentities.Method;
 import org.moosetechnology.model.famix.famixjavaentities.Package;
 import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
 import org.moosetechnology.model.famix.famixtraits.TThrowable;
 import org.moosetechnology.model.famix.famixtraits.TType;
 
-import java.util.List;
+import fr.inria.verveine.extractor.java.EntityDictionary;
+import fr.inria.verveine.extractor.java.VerveineJOptions;
+import fr.inria.verveine.extractor.java.utils.NodeTypeChecker;
 
 /** A visitor to record exceptions declared/thrown/caught.<br>
  * It is simpler than the other ref visitors because we only need to worry about methods

diff --git a/...ain/java/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorInheritanceRef.java b/...ain/java/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorInheritanceRef.java
@@ -6,11 +6,10 @@
 import fr.inria.verveine.extractor.java.utils.Util;
 import fr.inria.verveine.extractor.java.visitors.GetVisitedEntityAbstractVisitor;
 import org.eclipse.jdt.core.dom.*;
-import org.moosetechnology.model.famix.famixjavaentities.*;
+import org.moosetechnology.model.famix.famixjavaentities.ContainerEntity;
 import org.moosetechnology.model.famix.famixjavaentities.Package;
+import org.moosetechnology.model.famix.famixjavaentities.ParametricClass;
 import org.moosetechnology.model.famix.famixtraits.TAssociation;
-import org.moosetechnology.model.famix.famixtraits.TCanImplement;
-import org.moosetechnology.model.famix.famixtraits.TImplementable;
 import org.moosetechnology.model.famix.famixtraits.TType;
 import org.moosetechnology.model.famix.famixtraits.TWithInheritances;
 import org.moosetechnology.model.famix.famixtraits.TWithTypes;

diff --git a/app/src/main/java/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorInvocRef.java b/app/src/main/java/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorInvocRef.java
@@ -201,7 +201,6 @@ public void endVisit(Initializer node) {
      *     [Javadoc] { ExtendedModifier } Type VariableDeclarationFragment
      *          { , VariableDeclarationFragment } ;
      */
-    @SuppressWarnings("unchecked")
     @Override
     public boolean visit(FieldDeclaration node) {
         hasInitBlock(node);  // to recover optional EntityDictionary.INIT_BLOCK_NAME method
@@ -324,7 +323,7 @@ public boolean visit(ConstructorInvocation node) {
 
 	public boolean visit(SuperConstructorInvocation node) {
 		// ConstructorInvocation (i.e. 'super(...)' ) happen in constructor, so the name is that of the superclass
-        Class superC = superClass();
+        //Class superC = superClass();
 		Method invoked = null;
 
 //		if (superC != null) {

diff --git a/app/src/test/java/fr/inria/verveine/extractor/java/VerveineJTest_Configuration.java b/app/src/test/java/fr/inria/verveine/extractor/java/VerveineJTest_Configuration.java
@@ -2,9 +2,17 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.Assert;
-import org.moosetechnology.model.famix.famixjavaentities.*;
+import org.moosetechnology.model.famix.famixjavaentities.Access;
+import org.moosetechnology.model.famix.famixjavaentities.Attribute;
 import org.moosetechnology.model.famix.famixjavaentities.Class;
+import org.moosetechnology.model.famix.famixjavaentities.Comment;
+import org.moosetechnology.model.famix.famixjavaentities.IndexedFileAnchor;
+import org.moosetechnology.model.famix.famixjavaentities.Interface;
+import org.moosetechnology.model.famix.famixjavaentities.Invocation;
+import org.moosetechnology.model.famix.famixjavaentities.LocalVariable;
+import org.moosetechnology.model.famix.famixjavaentities.Method;
+import org.moosetechnology.model.famix.famixjavaentities.Parameter;
+import org.moosetechnology.model.famix.famixjavaentities.SourceAnchor;
 import org.moosetechnology.model.famix.famixtraits.TAccess;
 import org.moosetechnology.model.famix.famixtraits.TNamedEntity;