Replace getMethod and getField calls as well. Also rename methods.

Ivan-Veselov · Ivan-Veselov · commit 2db2e25166b5 · 2018-08-15T18:43:23.000+03:00
diff --git a/core/src/main/java/org/jetbrains/research/groups/ml_methods/refactoring/MoveFieldRefactoring.java b/core/src/main/java/org/jetbrains/research/groups/ml_methods/refactoring/MoveFieldRefactoring.java
@@ -43,28 +43,28 @@ public boolean isMoveFieldRefactoring() {
     /**
      * Returns field that is moved in this refactoring.
      */
-    public @NotNull Optional<PsiField> getField() {
+    public @NotNull Optional<PsiField> getOptionalField() {
         return Optional.ofNullable(field.getElement());
     }
 
     /**
      * Returns field that is moved in this refactoring.
      */
-    public @NotNull PsiField getFieldOrThrow() {
-        return getField().orElseThrow(() ->
+    public @NotNull PsiField getField() {
+        return Optional.ofNullable(field.getElement()).orElseThrow(() ->
                 new IllegalStateException("Cannot get field. Reference is invalid."));
     }
 
     @Override
-    public @Nullable Optional<PsiClass> getContainingClass() {
+    public @Nullable Optional<PsiClass> getOptionalContainingClass() {
         return field.getElement() == null ?
                 Optional.empty() : Optional.ofNullable(field.getElement().getContainingClass());
     }
 
     @NotNull
     @Override
-    public PsiClass getContainingClassOrThrow() {
-        return Optional.ofNullable(getFieldOrThrow().getContainingClass())
+    public PsiClass getContainingClass() {
+        return Optional.ofNullable(getField().getContainingClass())
                 .orElseThrow(() -> new IllegalStateException("No containing class."));
     }
 
diff --git a/core/src/main/java/org/jetbrains/research/groups/ml_methods/refactoring/MoveMethodRefactoring.java b/core/src/main/java/org/jetbrains/research/groups/ml_methods/refactoring/MoveMethodRefactoring.java
@@ -44,28 +44,28 @@ public boolean isMoveFieldRefactoring() {
     /**
      * Returns method that is moved in this refactoring.
      */
-    public @NotNull Optional<PsiMethod> getMethod() {
+    public @NotNull Optional<PsiMethod> getOptionalMethod() {
         return Optional.ofNullable(method.getElement());
     }
 
     /**
      * Returns method that is moved in this refactoring.
      */
-    public @NotNull PsiMethod getMethodOrThrow() {
-        return getMethod().orElseThrow(() ->
+    public @NotNull PsiMethod getMethod() {
+        return Optional.ofNullable(method.getElement()).orElseThrow(() ->
                 new IllegalStateException("Cannot get method. Reference is invalid."));
     }
 
     @Override
-    public @Nullable Optional<PsiClass> getContainingClass() {
+    public @Nullable Optional<PsiClass> getOptionalContainingClass() {
         return method.getElement() == null ?
                 Optional.empty() : Optional.ofNullable(method.getElement().getContainingClass());
     }
 
     @NotNull
     @Override
-    public PsiClass getContainingClassOrThrow() {
-        return Optional.ofNullable(getMethodOrThrow().getContainingClass())
+    public PsiClass getContainingClass() {
+        return Optional.ofNullable(getMethod().getContainingClass())
                 .orElseThrow(() -> new IllegalStateException("No containing class."));
     }
 
diff --git a/core/src/main/java/org/jetbrains/research/groups/ml_methods/refactoring/MoveToClassRefactoring.java b/core/src/main/java/org/jetbrains/research/groups/ml_methods/refactoring/MoveToClassRefactoring.java
@@ -33,33 +33,33 @@ public MoveToClassRefactoring(
     /**
      * Returns class which contains moved entity.
      */
-    public abstract @Nullable Optional<PsiClass> getContainingClass();
+    public abstract @Nullable Optional<PsiClass> getOptionalContainingClass();
 
     /**
      * Returns class which contains moved entity.
      */
-    public abstract @NotNull PsiClass getContainingClassOrThrow();
+    public abstract @NotNull PsiClass getContainingClass();
 
     /**
      * Returns class in which entity is placed in this refactoring
      */
-    public @NotNull Optional<PsiClass> getTargetClass() {
+    public @NotNull Optional<PsiClass> getOptionalTargetClass() {
         return Optional.ofNullable(targetClass.getElement());
     }
 
-    public @NotNull Optional<PsiMember> getEntity() {
+    public @NotNull Optional<PsiMember> getOptionalEntity() {
         return Optional.ofNullable(entity.getElement());
     }
 
     /**
      * Returns class in which entity is placed in this refactoring
      */
-    public @NotNull PsiClass getTargetClassOrThrow() {
+    public @NotNull PsiClass getTargetClass() {
         return Optional.ofNullable(targetClass.getElement()).orElseThrow(() ->
                 new IllegalStateException("Cannot get target class. Reference is invalid."));
     }
 
-    public @NotNull PsiMember getEntityOrThrow() {
+    public @NotNull PsiMember getEntity() {
         return Optional.ofNullable(entity.getElement()).orElseThrow(() ->
                 new IllegalStateException("Cannot get entity. Reference is invalid."));
     }
diff --git a/core/src/main/java/org/jetbrains/research/groups/ml_methods/utils/RefactoringUtil.java b/core/src/main/java/org/jetbrains/research/groups/ml_methods/utils/RefactoringUtil.java
@@ -27,7 +27,7 @@ private RefactoringUtil() {
     public static List<CalculatedRefactoring> filter(List<CalculatedRefactoring> refactorings) {
         final List<CalculatedRefactoring> validRefactorings = new ArrayList<>();
         for (CalculatedRefactoring refactoring : refactorings) {
-            final PsiElement element = refactoring.getRefactoring().getEntityOrThrow();
+            final PsiElement element = refactoring.getRefactoring().getEntity();
             final boolean isMovable = ApplicationManager.getApplication()
                     .runReadAction((Computable<Boolean>) () -> isMovable(element));
             if (isMovable) {
@@ -52,9 +52,9 @@ public static List<CalculatedRefactoring> intersect(Collection<List<CalculatedRe
         return refactorings.stream()
                 .flatMap(List::stream)
                 .collect(Collectors.groupingBy(refactoring ->
-                                getHumanReadableName(refactoring.getRefactoring().getEntityOrThrow()) +
+                                getHumanReadableName(refactoring.getRefactoring().getEntity()) +
                                         "&" +
-                                        getHumanReadableName(refactoring.getRefactoring().getTargetClassOrThrow()),
+                                        getHumanReadableName(refactoring.getRefactoring().getTargetClass()),
                         Collectors.toList()))
                 .values().stream()
                 .filter(collection -> collection.size() == refactorings.size())
@@ -72,7 +72,7 @@ private static CalculatedRefactoring intersect(List<CalculatedRefactoring> refac
     public static List<CalculatedRefactoring> combine(Collection<List<CalculatedRefactoring>> refactorings) {
         return refactorings.stream()
                 .flatMap(List::stream)
-                .collect(Collectors.groupingBy(it -> it.getRefactoring().getEntityOrThrow(), Collectors.toList()))
+                .collect(Collectors.groupingBy(it -> it.getRefactoring().getEntity(), Collectors.toList()))
                 .entrySet().stream()
                 .map(entry -> combine(entry.getValue(), refactorings.size()))
                 .filter(Objects::nonNull)
diff --git a/core/src/test/java/org/jetbrains/research/groups/ml_methods/algorithm/TestCasesCheckers.java b/core/src/test/java/org/jetbrains/research/groups/ml_methods/algorithm/TestCasesCheckers.java
@@ -23,8 +23,8 @@ class TestCasesCheckers {
 
     private static Map<String, String> toMap(List<CalculatedRefactoring> refactorings) {
         return refactorings.stream().collect(Collectors.toMap(it ->
-                getHumanReadableName(it.getRefactoring().getEntityOrThrow()),
-                it -> getHumanReadableName(it.getRefactoring().getTargetClassOrThrow())));
+                getHumanReadableName(it.getRefactoring().getEntity()),
+                it -> getHumanReadableName(it.getRefactoring().getTargetClass())));
     }
 
     @NotNull
diff --git a/features-extraction/src/main/java/org/jetbrains/research/groups/ml_methods/extraction/FeaturesExtractionApplicationStarter.java b/features-extraction/src/main/java/org/jetbrains/research/groups/ml_methods/extraction/FeaturesExtractionApplicationStarter.java
@@ -88,8 +88,8 @@ public void main(String[] args) {
             refactorings.forEach(refactoring ->
                     LOGGER.info(
                             refactoring.getMethod() + "->" +
-                                    refactoring.getTargetClassOrThrow() + System.lineSeparator() +
-                                    extractMethodDeclaration(refactoring.getMethodOrThrow()))
+                                    refactoring.getTargetClass() + System.lineSeparator() +
+                                    extractMethodDeclaration(refactoring.getMethod()))
             );
 
             List<FeatureVector> vectors;
diff --git a/features-extraction/src/main/java/org/jetbrains/research/groups/ml_methods/extraction/FormatterApplicationStarter.java b/features-extraction/src/main/java/org/jetbrains/research/groups/ml_methods/extraction/FormatterApplicationStarter.java
@@ -92,8 +92,8 @@ public void main(String[] args) {
             refactorings.forEach(refactoring ->
                     LOGGER.info(
                             refactoring.getMethod() + "->" +
-                                    refactoring.getTargetClassOrThrow() + System.lineSeparator() +
-                                    extractMethodDeclaration(refactoring.getMethodOrThrow()))
+                                    refactoring.getTargetClass() + System.lineSeparator() +
+                                    extractMethodDeclaration(refactoring.getMethod()))
             );
             writer.write(refactorings, out);
         } catch (Throwable throwable) {
diff --git a/features-extraction/src/main/java/org/jetbrains/research/groups/ml_methods/extraction/MoveMethodFeaturesExtractor.java b/features-extraction/src/main/java/org/jetbrains/research/groups/ml_methods/extraction/MoveMethodFeaturesExtractor.java
@@ -49,13 +49,13 @@ private MoveMethodFeaturesExtractor() {}
         List<FeatureVector> vectors = new ArrayList<>();
         for (MoveMethodRefactoring refactoring : refactorings) {
             MethodInfo methodInfo =
-                repository.getMethodInfo(refactoring.getMethodOrThrow()).orElseThrow(
+                repository.getMethodInfo(refactoring.getMethod()).orElseThrow(
                     () -> new IllegalArgumentException(
                             "Refactoring of method which was not found in scope"
                     )
                 );
 
-            vectors.add(extractor.extract(methodInfo, refactoring.getTargetClassOrThrow()));
+            vectors.add(extractor.extract(methodInfo, refactoring.getTargetClass()));
         }
 
         return vectors;
diff --git a/features-extraction/src/main/java/org/jetbrains/research/groups/ml_methods/extraction/refactoring/RefactoringTextRepresentation.java b/features-extraction/src/main/java/org/jetbrains/research/groups/ml_methods/extraction/refactoring/RefactoringTextRepresentation.java
@@ -44,8 +44,8 @@ public RefactoringTextRepresentation(String sourceClassQualifiedName, String met
     }
 
     public RefactoringTextRepresentation(MoveMethodRefactoring refactoring) {
-        PsiMethod method = refactoring.getMethodOrThrow();
-        PsiClass targetClass = refactoring.getTargetClassOrThrow();
+        PsiMethod method = refactoring.getMethod();
+        PsiClass targetClass = refactoring.getTargetClass();
         if (method.getContainingClass() == null || method.getContainingClass().getQualifiedName() == null) {
             String errorMessage = "Refactorings without source qualified names are not supported. " +
                     "Problem during creating refactoring for method " + method.getName() + ".";
diff --git a/src/main/java/org/jetbrains/research/groups/ml_methods/intention/RefactorIntentionAction.java b/src/main/java/org/jetbrains/research/groups/ml_methods/intention/RefactorIntentionAction.java
@@ -29,7 +29,7 @@ public class RefactorIntentionAction extends BaseIntentionAction {
     @NotNull
     @Override
     public String getText() {
-        return String.format("Move to %s", getHumanReadableName(refactoring.getTargetClassOrThrow()));
+        return String.format("Move to %s", getHumanReadableName(refactoring.getTargetClass()));
     }
 
     @Nls
diff --git a/src/main/java/org/jetbrains/research/groups/ml_methods/intention/RefactoringAnnotator.java b/src/main/java/org/jetbrains/research/groups/ml_methods/intention/RefactoringAnnotator.java
@@ -50,14 +50,14 @@ private static void setAnnotations(@NotNull PsiMember element,
             return;
         }
         final CalculatedRefactoring refactoring = refactorings.stream()
-                .filter(refactoringToCheck -> refactoringToCheck.getRefactoring().getEntityOrThrow().equals(element))
+                .filter(refactoringToCheck -> refactoringToCheck.getRefactoring().getEntity().equals(element))
                 .findAny()
                 .orElse(null);
         if (refactoring != null) {
             final Annotation annotation = holder.createWarningAnnotation(
                     getAnnotationPart(element),
                     String.format("Can be moved to %s (%s)",
-                            refactoring.getRefactoring().getTargetClassOrThrow().getQualifiedName(), algorithmName));
+                            refactoring.getRefactoring().getTargetClass().getQualifiedName(), algorithmName));
 
             annotation.registerFix(new RefactorIntentionAction(refactoring.getRefactoring(), scope));
         }
diff --git a/src/main/java/org/jetbrains/research/groups/ml_methods/refactoring/logging/MoveFieldRefactoringFeatures.java b/src/main/java/org/jetbrains/research/groups/ml_methods/refactoring/logging/MoveFieldRefactoringFeatures.java
@@ -35,12 +35,12 @@ public MoveFieldRefactoringFeatures(
         MetricsResult resultsForClasses = metricsRun.getResultsForCategory(MetricCategory.Class);
 
         targetClassMetricsValues = extractMetricsResultsFor(
-                Objects.requireNonNull(refactoring.getTargetClassOrThrow().getQualifiedName()),
+                Objects.requireNonNull(refactoring.getTargetClass().getQualifiedName()),
                 resultsForClasses
         );
 
         sourceClassMetricsValues = extractMetricsResultsFor(
-                Objects.requireNonNull(refactoring.getContainingClassOrThrow().getQualifiedName()),
+                Objects.requireNonNull(refactoring.getContainingClass().getQualifiedName()),
                 resultsForClasses
         );
     }
diff --git a/src/main/java/org/jetbrains/research/groups/ml_methods/refactoring/logging/MoveMethodRefactoringFeatures.java b/src/main/java/org/jetbrains/research/groups/ml_methods/refactoring/logging/MoveMethodRefactoringFeatures.java
@@ -38,17 +38,17 @@ public MoveMethodRefactoringFeatures(
         MetricsResult resultsForMethods = metricsRun.getResultsForCategory(MetricCategory.Method);
 
         targetClassMetricsValues = extractMetricsResultsFor(
-                Objects.requireNonNull(refactoring.getTargetClassOrThrow().getQualifiedName()),
+                Objects.requireNonNull(refactoring.getTargetClass().getQualifiedName()),
                 resultsForClasses
         );
 
         sourceClassMetricsValues = extractMetricsResultsFor(
-                Objects.requireNonNull(refactoring.getContainingClassOrThrow().getQualifiedName()),
+                Objects.requireNonNull(refactoring.getContainingClass().getQualifiedName()),
                 resultsForClasses
         );
 
         methodMetricsValues = extractMetricsResultsFor(
-            MethodUtils.calculateSignature(refactoring.getMethodOrThrow()),
+            MethodUtils.calculateSignature(refactoring.getMethod()),
             resultsForMethods
         );
     }
diff --git a/src/main/java/org/jetbrains/research/groups/ml_methods/ui/RefactoringsApplier.java b/src/main/java/org/jetbrains/research/groups/ml_methods/ui/RefactoringsApplier.java
@@ -29,8 +29,8 @@ private RefactoringsApplier() {
     static Map<CalculatedRefactoring, String> getWarnings(List<CalculatedRefactoring> refactorings) {
         Map<CalculatedRefactoring, String> warnings = new HashMap<>();
         for (CalculatedRefactoring refactoring : refactorings) {
-            final PsiMember element = refactoring.getRefactoring().getEntityOrThrow();
-            final PsiClass target = refactoring.getRefactoring().getTargetClassOrThrow();
+            final PsiMember element = refactoring.getRefactoring().getEntity();
+            final PsiClass target = refactoring.getRefactoring().getTargetClass();
             String warning;
             warning = ApplicationManager.getApplication()
                     .runReadAction((Computable<String>) () -> getWarning(element, target));
@@ -59,8 +59,8 @@ static Map<CalculatedRefactoring, String> getWarnings(List<CalculatedRefactoring
                         .filter(r -> r.accept(new RefactoringVisitor<Boolean>() {
                             @Override
                             public @NotNull Boolean visit(final @NotNull MoveMethodRefactoring refactoring) {
-                                if (canMoveInstanceMethod(refactoring.getMethodOrThrow(), target)) {
-                                    if (moveInstanceMethod(refactoring.getMethodOrThrow(), target)) {
+                                if (canMoveInstanceMethod(refactoring.getMethod(), target)) {
+                                    if (moveInstanceMethod(refactoring.getMethod(), target)) {
                                         accepted.add(refactoring);
                                     }
                                     return false;
@@ -74,7 +74,7 @@ static Map<CalculatedRefactoring, String> getWarnings(List<CalculatedRefactoring
                                 return true;
                             }
                         }))
-                        .filter(r -> makeStatic(r.getEntityOrThrow())) // no effect for already static members
+                        .filter(r -> makeStatic(r.getEntity())) // no effect for already static members
                         .collect(Collectors.toList());
 
                 accepted.addAll(moveMembersRefactoring(filteredRefactorings, target, scope));
@@ -86,7 +86,7 @@ static Map<CalculatedRefactoring, String> getWarnings(List<CalculatedRefactoring
 
     private static boolean checkValid(Collection<MoveToClassRefactoring> refactorings) {
         final long uniqueUnits = refactorings.stream()
-                .map(MoveToClassRefactoring::getEntityOrThrow)
+                .map(MoveToClassRefactoring::getEntity)
                 .distinct()
                 .count();
         return uniqueUnits == refactorings.size();
@@ -96,7 +96,7 @@ private static boolean checkValid(Collection<MoveToClassRefactoring> refactoring
             final @NotNull List<MoveToClassRefactoring> refactorings
     ) {
         return refactorings.stream().collect(
-                Collectors.groupingBy(MoveToClassRefactoring::getTargetClassOrThrow, Collectors.toList())
+                Collectors.groupingBy(MoveToClassRefactoring::getTargetClass, Collectors.toList())
         );
     }
 
@@ -143,11 +143,11 @@ private static boolean makeStatic(PsiElement element) {
     private static Set<MoveToClassRefactoring> moveMembersRefactoring(Collection<MoveToClassRefactoring> elements, PsiClass targetClass,
                                                                       AnalysisScope scope) {
         final Map<PsiClass, Set<MoveToClassRefactoring>> groupByCurrentClass = elements.stream()
-                .collect(groupingBy((MoveToClassRefactoring it) -> it.getEntityOrThrow().getContainingClass(), Collectors.toSet()));
+                .collect(groupingBy((MoveToClassRefactoring it) -> it.getEntity().getContainingClass(), Collectors.toSet()));
 
         final Set<MoveToClassRefactoring> accepted = new HashSet<>();
         for (Entry<PsiClass, Set<MoveToClassRefactoring>> movement : groupByCurrentClass.entrySet()) {
-            final Set<PsiMember> members = movement.getValue().stream().map(MoveToClassRefactoring::getEntityOrThrow).collect(Collectors.toSet());
+            final Set<PsiMember> members = movement.getValue().stream().map(MoveToClassRefactoring::getEntity).collect(Collectors.toSet());
             MoveMembersDialog dialog = new MoveMembersDialog(scope.getProject(), movement.getKey(), targetClass,
                     members, null);
             TransactionGuard.getInstance().submitTransactionAndWait(dialog::show);
diff --git a/src/main/java/org/jetbrains/research/groups/ml_methods/ui/RefactoringsTableModel.java b/src/main/java/org/jetbrains/research/groups/ml_methods/ui/RefactoringsTableModel.java
@@ -161,11 +161,11 @@ public Object getValueAt(int virtualRow, int columnIndex) {
             case SELECTION_COLUMN_INDEX:
                 return isSelected[rowIndex];
             case ENTITY_COLUMN_INDEX:
-                Optional<PsiMember> method = refactorings.get(rowIndex).getRefactoring().getEntity();
+                Optional<PsiMember> method = refactorings.get(rowIndex).getRefactoring().getOptionalEntity();
                 return method.isPresent() ? getHumanReadableName(method.get()) :
                         ArchitectureReloadedBundle.message("java.member.is.not.valid");
             case MOVE_TO_COLUMN_INDEX:
-                Optional<PsiClass> targetClass = refactorings.get(rowIndex).getRefactoring().getTargetClass();
+                Optional<PsiClass> targetClass = refactorings.get(rowIndex).getRefactoring().getOptionalTargetClass();
                 return targetClass.isPresent() ? getHumanReadableName(targetClass.get()) :
                         ArchitectureReloadedBundle.message("target.class.is.not.valid");
             case ACCURACY_COLUMN_INDEX:
@@ -179,9 +179,9 @@ Optional<? extends PsiMember> getUnitAt(int virtualRow, int column) {
         final int row = virtualRows.get(virtualRow);
         switch (column) {
             case ENTITY_COLUMN_INDEX:
-                return refactorings.get(row).getRefactoring().getEntity();
+                return refactorings.get(row).getRefactoring().getOptionalEntity();
             case MOVE_TO_COLUMN_INDEX:
-                return refactorings.get(row).getRefactoring().getTargetClass();
+                return refactorings.get(row).getRefactoring().getOptionalTargetClass();
         }
         throw new IndexOutOfBoundsException("Unexpected column index: " + column);
     }
diff --git a/src/main/java/org/jetbrains/research/groups/ml_methods/utils/ExportResultsUtil.java b/src/main/java/org/jetbrains/research/groups/ml_methods/utils/ExportResultsUtil.java
@@ -47,8 +47,8 @@ public static void exportToFile(List<CalculatedRefactoring> refactorings, Functi
     }
 
     private static String defaultRefactoringView(CalculatedRefactoring r) {
-        Optional<PsiMember> member = r.getRefactoring().getEntity();
-        Optional<PsiClass> target = r.getRefactoring().getTargetClass();
+        Optional<PsiMember> member = r.getRefactoring().getOptionalEntity();
+        Optional<PsiClass> target = r.getRefactoring().getOptionalTargetClass();
         return String.format("%s --> %s (%s)",
                 member.isPresent() ?
                         getHumanReadableName(member.get()) :

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ class TestCasesCheckers {`
`23`	`23`
`24`	`24`	`private static Map<String, String> toMap(List<CalculatedRefactoring> refactorings) {`
`25`	`25`	`return refactorings.stream().collect(Collectors.toMap(it ->`
`26`		`- getHumanReadableName(it.getRefactoring().getEntityOrThrow()),`
`27`		`- it -> getHumanReadableName(it.getRefactoring().getTargetClassOrThrow())));`
	`26`	`+ getHumanReadableName(it.getRefactoring().getEntity()),`
	`27`	`+ it -> getHumanReadableName(it.getRefactoring().getTargetClass())));`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`@NotNull`
Original file line number	Diff line number	Diff line change
`@@ -49,13 +49,13 @@ private MoveMethodFeaturesExtractor() {}`
`49`	`49`	`List<FeatureVector> vectors = new ArrayList<>();`
`50`	`50`	`for (MoveMethodRefactoring refactoring : refactorings) {`
`51`	`51`	`MethodInfo methodInfo =`
`52`		`- repository.getMethodInfo(refactoring.getMethodOrThrow()).orElseThrow(`
	`52`	`+ repository.getMethodInfo(refactoring.getMethod()).orElseThrow(`
`53`	`53`	`() -> new IllegalArgumentException(`
`54`	`54`	`"Refactoring of method which was not found in scope"`
`55`	`55`	`)`
`56`	`56`	`);`
`57`	`57`
`58`		`- vectors.add(extractor.extract(methodInfo, refactoring.getTargetClassOrThrow()));`
	`58`	`+ vectors.add(extractor.extract(methodInfo, refactoring.getTargetClass()));`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`return vectors;`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public class RefactorIntentionAction extends BaseIntentionAction {`
`29`	`29`	`@NotNull`
`30`	`30`	`@Override`
`31`	`31`	`public String getText() {`
`32`		`- return String.format("Move to %s", getHumanReadableName(refactoring.getTargetClassOrThrow()));`
	`32`	`+ return String.format("Move to %s", getHumanReadableName(refactoring.getTargetClass()));`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Nls`