Merge branch 'integration2' of https://github.com/ml-in-programming/ArchitectureReloaded into smartPsiElementPointer_integration

# Conflicts:
#	core/src/main/java/org/jetbrains/research/groups/ml_methods/algorithm/AlgorithmsRepository.java
#	core/src/main/java/org/jetbrains/research/groups/ml_methods/algorithm/RefactoringExecutionContext.java
#	core/src/main/java/org/jetbrains/research/groups/ml_methods/utils/PsiSearchUtil.java
#	core/src/test/java/org/jetbrains/research/groups/ml_methods/algorithm/AlgorithmAbstractTest.java
#	src/main/java/org/jetbrains/research/groups/ml_methods/intention/RefactoringAnnotator.java
#	src/main/java/org/jetbrains/research/groups/ml_methods/ui/AlgorithmsSelectionPanel.java
#	src/main/java/org/jetbrains/research/groups/ml_methods/ui/ClassRefactoringPanel.java

Author: RamSaw

algorithms-evaluation/src/main/java/org/jetbrains/research/groups/ml_methods/evaluation/AlgorithmEvaluator.java

@@ -5,9 +5,9 @@
 import com.sixrr.metrics.profile.MetricsProfile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.research.groups.ml_methods.algorithm.Algorithm;
+import org.jetbrains.research.groups.ml_methods.algorithm.RefactoringExecutionContext;
 import org.jetbrains.research.groups.ml_methods.refactoring.CalculatedRefactoring;
 import org.jetbrains.research.groups.ml_methods.refactoring.MoveToClassRefactoring;
-import org.jetbrains.research.groups.ml_methods.algorithm.RefactoringExecutionContext;
 import org.jetbrains.research.groups.ml_methods.utils.MetricsProfilesUtil;
 
 import java.util.Collections;

algorithms-evaluation/src/main/java/org/jetbrains/research/groups/ml_methods/evaluation/ProjectLoader.java

@@ -3,9 +3,9 @@
 import com.intellij.analysis.AnalysisScope;
 import com.intellij.openapi.project.Project;
 import com.sixrr.metrics.utils.ProjectUtils;
-import org.jetbrains.research.groups.ml_methods.refactoring.MoveToClassRefactoring;
 import org.jetbrains.research.groups.ml_methods.extraction.refactoring.RefactoringsLoader;
 import org.jetbrains.research.groups.ml_methods.extraction.refactoring.readers.RefactoringsReaders;
+import org.jetbrains.research.groups.ml_methods.refactoring.MoveToClassRefactoring;
 
 import java.io.IOException;
 import java.nio.file.Path;

core/src/main/java/org/jetbrains/research/groups/ml_methods/algorithm/AlgorithmsRepository.java

@@ -4,7 +4,6 @@
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Optional;
 
 public class AlgorithmsRepository {
     private static final List<Algorithm> ALGORITHMS = Arrays.asList(

core/src/main/java/org/jetbrains/research/groups/ml_methods/algorithm/RefactoringExecutionContext.java

@@ -22,14 +22,14 @@
 import org.jetbrains.research.groups.ml_methods.logging.Logging;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.function.Consumer;
 
 import static org.jetbrains.research.groups.ml_methods.algorithm.AlgorithmsRepository.AlgorithmType;
+import static org.jetbrains.research.groups.ml_methods.algorithm.AlgorithmsRepository.getAvailableAlgorithms;
 
 /**
  * Stores all information that might be needed for refactoring suggestions calculation. Can be
@@ -58,7 +58,7 @@ public class RefactoringExecutionContext {
     public RefactoringExecutionContext(@NotNull Project project, @NotNull AnalysisScope scope,
                                        @NotNull MetricsProfile profile,
                                        @Nullable Consumer<RefactoringExecutionContext> continuation) {
-        this(project, scope, profile, Arrays.asList(getAvailableAlgorithms()), true, continuation);
+        this(project, scope, profile, getAvailableAlgorithms(), true, continuation);
     }
 
     /**

core/src/test/java/org/jetbrains/research/groups/ml_methods/ScopeAbstractTest.java

@@ -5,7 +5,6 @@
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;

core/src/test/java/org/jetbrains/research/groups/ml_methods/algorithm/AlgorithmAbstractTest.java

@@ -3,7 +3,6 @@
 import com.intellij.analysis.AnalysisScope;
 import com.sixrr.metrics.profile.MetricsProfile;
 import org.jetbrains.research.groups.ml_methods.ScopeAbstractTest;
-import org.jetbrains.research.groups.ml_methods.algorithm.RefactoringExecutionContext;
 import org.jetbrains.research.groups.ml_methods.utils.MetricsProfilesUtil;
 
 import java.util.Collections;
@@ -12,7 +11,7 @@
 @SuppressWarnings("WeakerAccess")
 public abstract class AlgorithmAbstractTest extends ScopeAbstractTest {
     protected final TestCasesCheckers testCasesChecker =
-        new TestCasesCheckers(getAlgorithm().getDescriptionString());
+        new TestCasesCheckers(getAlgorithm().getAlgorithmType());
 
     protected RefactoringExecutionContext createContext(
         AnalysisScope scope,

features-extraction/src/main/java/org/jetbrains/research/groups/ml_methods/extraction/FeaturesExtractionApplicationStarter.java

@@ -11,12 +11,12 @@
 import org.apache.log4j.Logger;
 import org.apache.log4j.PatternLayout;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.research.groups.ml_methods.refactoring.MoveMethodRefactoring;
 import org.jetbrains.research.groups.ml_methods.extraction.features.extractors.*;
 import org.jetbrains.research.groups.ml_methods.extraction.features.vector.FeatureVector;
 import org.jetbrains.research.groups.ml_methods.extraction.features.vector.VectorSerializer;
 import org.jetbrains.research.groups.ml_methods.extraction.refactoring.RefactoringsLoader;
 import org.jetbrains.research.groups.ml_methods.extraction.refactoring.readers.RefactoringsReaders;
+import org.jetbrains.research.groups.ml_methods.refactoring.MoveMethodRefactoring;
 
 import java.io.IOException;
 import java.nio.file.Path;

features-extraction/src/main/java/org/jetbrains/research/groups/ml_methods/extraction/FormatterApplicationStarter.java

@@ -11,12 +11,12 @@
 import org.apache.log4j.Logger;
 import org.apache.log4j.PatternLayout;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.research.groups.ml_methods.refactoring.MoveMethodRefactoring;
 import org.jetbrains.research.groups.ml_methods.extraction.refactoring.RefactoringsLoader;
 import org.jetbrains.research.groups.ml_methods.extraction.refactoring.readers.RefactoringsReader;
 import org.jetbrains.research.groups.ml_methods.extraction.refactoring.readers.RefactoringsReaders;
 import org.jetbrains.research.groups.ml_methods.extraction.refactoring.writers.RefactoringsWriter;
 import org.jetbrains.research.groups.ml_methods.extraction.refactoring.writers.RefactoringsWriters;
+import org.jetbrains.research.groups.ml_methods.refactoring.MoveMethodRefactoring;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;

features-extraction/src/main/java/org/jetbrains/research/groups/ml_methods/extraction/MoveMethodFeaturesExtractor.java

@@ -2,13 +2,13 @@
 
 import com.intellij.analysis.AnalysisScope;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.research.groups.ml_methods.refactoring.MoveMethodRefactoring;
 import org.jetbrains.research.groups.ml_methods.extraction.features.extractors.MoveMethodSingleFeatureExtractor;
 import org.jetbrains.research.groups.ml_methods.extraction.features.vector.FeatureVector;
 import org.jetbrains.research.groups.ml_methods.extraction.features.vector.MoveMethodVectorExtractor;
 import org.jetbrains.research.groups.ml_methods.extraction.info.InfoCollector;
 import org.jetbrains.research.groups.ml_methods.extraction.info.MethodInfo;
 import org.jetbrains.research.groups.ml_methods.extraction.info.MethodInfoRepository;
+import org.jetbrains.research.groups.ml_methods.refactoring.MoveMethodRefactoring;
 
 import java.util.ArrayList;
 import java.util.List;

features-extraction/src/main/java/org/jetbrains/research/groups/ml_methods/extraction/features/extractors/AnotherInstanceCallersExtractor.java

@@ -3,8 +3,6 @@
 import com.intellij.psi.PsiClass;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.research.groups.ml_methods.extraction.features.AnotherInstanceCallers;
-import org.jetbrains.research.groups.ml_methods.extraction.features.Feature;
-import org.jetbrains.research.groups.ml_methods.extraction.features.SameInstanceCallers;
 import org.jetbrains.research.groups.ml_methods.extraction.info.MethodInfo;
 
 public class AnotherInstanceCallersExtractor implements MoveMethodSingleFeatureExtractor {