From 3b60dfa45b791457131bca60c3f9be1fdf76934a Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Tue, 18 Mar 2014 18:51:11 +0400
Subject: [PATCH] Refactoring: rename weight result enums

---
 .../weigher/JetDeclarationRemotenessWeigher.java | 12 ++++++------
 .../completion/weigher/JetKindWeigher.java       | 16 ++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/completion/weigher/JetDeclarationRemotenessWeigher.java b/idea/src/org/jetbrains/jet/plugin/completion/weigher/JetDeclarationRemotenessWeigher.java
index 16d4236a58f..736e042b55f 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/weigher/JetDeclarationRemotenessWeigher.java
+++ b/idea/src/org/jetbrains/jet/plugin/completion/weigher/JetDeclarationRemotenessWeigher.java
@@ -38,7 +38,7 @@ public class JetDeclarationRemotenessWeigher extends LookupElementWeigher {
         this.file = file;
     }
 
-    private enum MyResult {
+    private enum Weight {
         kotlinDefaultImport,
         thisFile,
         imported,
@@ -57,7 +57,7 @@ public class JetDeclarationRemotenessWeigher extends LookupElementWeigher {
             if (psiElement != null) {
                 PsiFile elementFile = psiElement.getContainingFile();
                 if (elementFile instanceof JetFile && elementFile.getOriginalFile() == file) {
-                    return MyResult.thisFile;
+                    return Weight.thisFile;
                 }
             }
 
@@ -68,18 +68,18 @@ public class JetDeclarationRemotenessWeigher extends LookupElementWeigher {
                 if (NamePackage.isValidJavaFqName(fqName.toString())) {
                     ImportPath importPath = new ImportPath(fqName.toString());
                     if (ImportInsertHelper.needImport(importPath, file)) {
-                        return MyResult.notImported;
+                        return Weight.notImported;
                     }
                     else {
                         if (ImportInsertHelper.isImportedWithDefault(importPath, file)) {
-                            return MyResult.kotlinDefaultImport;
+                            return Weight.kotlinDefaultImport;
                         }
-                        return MyResult.imported;
+                        return Weight.imported;
                     }
                 }
             }
         }
 
-        return MyResult.normal;
+        return Weight.normal;
     }
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/weigher/JetKindWeigher.java b/idea/src/org/jetbrains/jet/plugin/completion/weigher/JetKindWeigher.java
index 5011961dcc5..1201801a8d4 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/weigher/JetKindWeigher.java
+++ b/idea/src/org/jetbrains/jet/plugin/completion/weigher/JetKindWeigher.java
@@ -32,7 +32,7 @@ class JetKindWeigher extends LookupElementWeigher {
         super(JetKindWeigher.class.getSimpleName());
     }
 
-    private enum MyResult {
+    private enum Weight {
         localOrParameter,
         property,
         namedParameter,
@@ -43,31 +43,31 @@ class JetKindWeigher extends LookupElementWeigher {
 
     @NotNull
     @Override
-    public MyResult weigh(@NotNull LookupElement element) {
+    public Weight weigh(@NotNull LookupElement element) {
         Object object = element.getObject();
         if (object instanceof JetLookupObject) {
             JetLookupObject lookupObject = (JetLookupObject) object;
             DeclarationDescriptor descriptor = lookupObject.getDescriptor();
             if (descriptor != null) {
                 if (descriptor instanceof LocalVariableDescriptor || descriptor instanceof ValueParameterDescriptor) {
-                    return MyResult.localOrParameter;
+                    return Weight.localOrParameter;
                 }
                 else if (descriptor instanceof PropertyDescriptor) {
-                    return MyResult.property;
+                    return Weight.property;
                 }
                 else if (descriptor instanceof PackageViewDescriptor) {
-                    return MyResult.packages;
+                    return Weight.packages;
                 }
             }
         }
         else if (object instanceof KotlinNamedParametersContributor.NamedParameterLookupObject) {
-            return MyResult.namedParameter;
+            return Weight.namedParameter;
         }
         else if (object instanceof String) {
-             return MyResult.probableKeyword;
+             return Weight.probableKeyword;
         }
 
-        return MyResult.normal;
+        return Weight.normal;
     }
 
     @Override