diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java
index 0196524f6902..c8c2e06d4c21 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java
@@ -28,7 +28,6 @@ import com.intellij.psi.stubs.StubElement;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.cls.ClsFormatException;
 import com.intellij.util.io.StringRef;
-import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.org.objectweb.asm.*;
@@ -46,7 +45,7 @@ import static com.intellij.psi.CommonClassNames.*;
  * @author max
  */
 public class StubBuildingVisitor<T> extends ClassVisitor {
-  private static final Pattern REGEX_PATTERN = Pattern.compile("(?<=[^\\$\\.])\\${1}(?=[^\\$])"); // disallow .$ or $$
+  private static final Pattern REGEX_PATTERN = Pattern.compile("(?<=[^\\$\\.])\\$(?=[^\\$])"); // disallow .$ or $$
 
   public static final String DOUBLE_POSITIVE_INF = "1.0 / 0.0";
   public static final String DOUBLE_NEGATIVE_INF = "-1.0 / 0.0";
@@ -58,8 +57,8 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
 
   private static final int ASM_API = Opcodes.ASM5;
 
-  @NonNls private static final String SYNTHETIC_CLASS_INIT_METHOD = "<clinit>";
-  @NonNls private static final String SYNTHETIC_INIT_METHOD = "<init>";
+  private static final String SYNTHETIC_CLASS_INIT_METHOD = "<clinit>";
+  private static final String SYNTHETIC_INIT_METHOD = "<init>";
 
   private final T mySource;
   private final InnerClassSourceStrategy<T> myInnersStrategy;
@@ -82,41 +81,10 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
     return myResult;
   }
 
-  static String getFqn(String internalName, String myShortName) {
-    String fqn;
-    String shortName;
-    if (myShortName != null && internalName.endsWith(myShortName)) {
-      shortName = myShortName;
-      fqn = internalName.length() == shortName.length()
-            ? shortName : getClassName(internalName.substring(0, internalName.length() - shortName.length() - 1)) + "." + shortName;
-    }
-    else {
-      fqn = getClassName(internalName);
-      shortName = PsiNameHelper.getShortClassName(fqn);
-    }
-
-    return fqn;
-  }
-  static String getShortName(String internalName, String myShortName) {
-    String fqn;
-    String shortName;
-    if (myShortName != null && internalName.endsWith(myShortName)) {
-      shortName = myShortName;
-      fqn = internalName.length() == shortName.length()
-            ? shortName : getClassName(internalName.substring(0, internalName.length() - shortName.length() - 1)) + "." + shortName;
-    }
-    else {
-      fqn = getClassName(internalName);
-      shortName = PsiNameHelper.getShortClassName(fqn);
-    }
-
-    return shortName;
-  }
-
   @Override
   public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
     String fqn = getFqn(name, myShortName);
-    String shortName = getShortName(name, myShortName);
+    String shortName = myShortName != null && name.endsWith(myShortName) ? myShortName : PsiNameHelper.getShortClassName(fqn);
 
     int flags = myAccess | access;
     boolean isDeprecated = (flags & Opcodes.ACC_DEPRECATED) != 0;
@@ -140,7 +108,8 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
       catch (ClsFormatException e) {
         signatureIterator = null;
       }
-    } else {
+    }
+    else {
       new PsiTypeParameterListStubImpl(myResult);
     }
 
@@ -148,7 +117,8 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
     List<String> convertedInterfaces = new ArrayList<String>();
     if (signatureIterator == null) {
       convertedSuper = parseClassDescription(superName, interfaces, convertedInterfaces);
-    } else {
+    }
+    else {
       try {
         convertedSuper = parseClassSignature(signatureIterator, convertedInterfaces);
       }
@@ -178,8 +148,21 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
     }
   }
 
+  public static String getFqn(@NotNull String internalName, @Nullable String shortName) {
+    if (shortName == null || !internalName.endsWith(shortName)) {
+      return getClassName(internalName);
+    }
+    else if (internalName.length() == shortName.length()) {
+      return shortName;
+    }
+    else {
+      return getClassName(internalName.substring(0, internalName.length() - shortName.length() - 1)) + "." + shortName;
+    }
+  }
+
   public static void newReferenceList(JavaClassReferenceListElementType type, StubElement parent, String... types) {
     PsiReferenceList.Role role;
+
     if (type == JavaStubElementTypes.EXTENDS_LIST) role = PsiReferenceList.Role.EXTENDS_LIST;
     else if (type == JavaStubElementTypes.IMPLEMENTS_LIST) role = PsiReferenceList.Role.IMPLEMENTS_LIST;
     else if (type == JavaStubElementTypes.THROWS_LIST) role = PsiReferenceList.Role.THROWS_LIST;
@@ -425,10 +408,12 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
     List<String> args = new ArrayList<String>();
     List<String> throwables = exceptions != null ? new ArrayList<String>() : null;
 
+    StringRef stringRef = StringRef.fromString(canonicalMethodName);
     int modifiersMask = packMethodFlags(access, myResult.isInterface());
-    final PsiMethodStubImpl stub = new PsiMethodStubImpl(myResult, StringRef.fromString(canonicalMethodName), flags, signature, args, throwables, desc, modifiersMask);
+    PsiMethodStubImpl stub = new PsiMethodStubImpl(myResult, stringRef, flags, signature, args, throwables, desc, modifiersMask);
 
     PsiModifierListStub modList = (PsiModifierListStub)stub.findChildStubByType(JavaStubElementTypes.MODIFIER_LIST);
+    assert modList != null : stub;
 
     if (isEnum && isConstructor && signature == null && args.size() >= 2 && JAVA_LANG_STRING.equals(args.get(0)) && "int".equals(args.get(1))) {
       // exclude synthetic enum constructor parameters
@@ -452,7 +437,7 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
 
       String paramName = i < parameterNames.length ? parameterNames[i] : "p" + (i + 1);
       PsiParameterStubImpl parameterStub = new PsiParameterStubImpl(parameterList, paramName, typeInfo, isEllipsisParam);
-      paramStubs [i] = parameterStub;
+      paramStubs[i] = parameterStub;
       new PsiModifierListStubImpl(parameterStub, 0);
     }
 
@@ -499,9 +484,9 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
 
   @NotNull
   public static String parseMethodViaGenericSignature(@NotNull String signature,
-                                                       @NotNull PsiMethodStubImpl stub,
-                                                       @NotNull List<String> args,
-                                                       @Nullable List<String> throwables) throws ClsFormatException {
+                                                      @NotNull PsiMethodStubImpl stub,
+                                                      @NotNull List<String> args,
+                                                      @Nullable List<String> throwables) throws ClsFormatException {
     StringCharacterIterator iterator = new StringCharacterIterator(signature);
     SignatureParsing.parseTypeParametersDeclaration(iterator, stub);
 
@@ -523,15 +508,15 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
 
     while (iterator.current() == '^') {
       iterator.next();
-      throwables.add(SignatureParsing.parseTypeString(iterator));
+      String exType = SignatureParsing.parseTypeString(iterator);
+      if (throwables != null) {
+        throwables.add(exType);
+      }
     }
 
     return returnType;
   }
 
-  @Override
-  public void visitEnd() {
-  }
 
   private static class AnnotationTextCollector extends AnnotationVisitor {
     private final StringBuilder myBuilder = new StringBuilder();
@@ -567,7 +552,8 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
         if (myDesc != null) {
           myBuilder.append('(');
         }
-      } else {
+      }
+      else {
         myBuilder.append(',');
       }
 
@@ -686,7 +672,7 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
           }
         }
 
-        myUsedParamCount = paramIndex+1;
+        myUsedParamCount = paramIndex + 1;
         if ("D".equals(desc) || "J".equals(desc)) {
           myUsedParamSize += 2;
         }