From ba891d072bc60c3728ca75883f660e676826289b Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 11 Jul 2016 19:28:54 +0200
Subject: [PATCH] Cleanup (arrangement)

---
 .../ClsJavaCodeReferenceElementImpl.java      | 11 +++----
 .../com/intellij/psi/ClsStubBuilderTest.java  | 32 +++++++++----------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java
index ae5516715aa3..8fc751b5d390 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java
@@ -34,7 +34,6 @@ import com.intellij.psi.util.TypeConversionUtil;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.containers.HashMap;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -331,11 +330,6 @@ public class ClsJavaCodeReferenceElementImpl extends ClsElementImpl implements P
     }
   }
 
-  @NonNls
-  public String toString() {
-    return "PsiJavaCodeReferenceElement:" + getText();
-  }
-
   @Override
   public TextRange getRangeInElement() {
     return new TextRange(0, getTextLength());
@@ -361,4 +355,9 @@ public class ClsJavaCodeReferenceElementImpl extends ClsElementImpl implements P
   public PsiElement getQualifier() {
     return null;
   }
+
+  @Override
+  public String toString() {
+    return "PsiJavaCodeReferenceElement:" + getText();
+  }
 }
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/psi/ClsStubBuilderTest.java b/java/java-tests/testSrc/com/intellij/psi/ClsStubBuilderTest.java
index d1d2f08d4559..bab399188dc8 100644
--- a/java/java-tests/testSrc/com/intellij/psi/ClsStubBuilderTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/ClsStubBuilderTest.java
@@ -51,15 +51,26 @@ public class ClsStubBuilderTest extends LightIdeaTestCase {
     doTest(clsFile, getTestName(false) + ".txt");
   }
 
-  private void doTest() {
-    String clsFilePath = JavaTestUtil.getJavaTestDataPath() + "/psi/cls/stubBuilder/" + getTestName(false) + ".class";
-    VirtualFile clsFile = LocalFileSystem.getInstance().findFileByPath(clsFilePath);
+  private void doTest(String className) {
+    VirtualFile clsFile = findFile(className);
     assertNotNull(clsFile);
     doTest(clsFile, getTestName(false) + ".txt");
   }
 
-  private void doTest(String className) {
-    VirtualFile clsFile = findFile(className);
+  private VirtualFile findFile(final String className) {
+    final VirtualFile[] roots = getProjectJDK().getRootProvider().getFiles(OrderRootType.CLASSES);
+    for (VirtualFile root : roots) {
+      VirtualFile vFile = root.findFileByRelativePath(className);
+      if (vFile != null) return vFile;
+    }
+
+    fail("Cannot file class file for: " + className);
+    return null;
+  }
+
+  private void doTest() {
+    String clsFilePath = JavaTestUtil.getJavaTestDataPath() + "/psi/cls/stubBuilder/" + getTestName(false) + ".class";
+    VirtualFile clsFile = LocalFileSystem.getInstance().findFileByPath(clsFilePath);
     assertNotNull(clsFile);
     doTest(clsFile, getTestName(false) + ".txt");
   }
@@ -85,15 +96,4 @@ public class ClsStubBuilderTest extends LightIdeaTestCase {
       throw new RuntimeException(e);
     }
   }
-
-  private VirtualFile findFile(final String className) {
-    final VirtualFile[] roots = getProjectJDK().getRootProvider().getFiles(OrderRootType.CLASSES);
-    for (VirtualFile root : roots) {
-      VirtualFile vFile = root.findFileByRelativePath(className);
-      if (vFile != null) return vFile;
-    }
-
-    fail("Cannot file class file for: " + className);
-    return null;
-  }
 }
\ No newline at end of file