diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationImpl.java
index 566b3100cd8d..9cde504521f9 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationImpl.java
@@ -44,7 +44,7 @@ public class ClsAnnotationImpl extends ClsRepositoryPsiElement<PsiAnnotationStub
     super(stub);
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     buffer.append("@").append(getReferenceElement().getCanonicalText());
     ((ClsAnnotationParameterListImpl)getParameterList()).appendMirrorText(indentLevel, buffer);
   }
@@ -110,7 +110,7 @@ public class ClsAnnotationImpl extends ClsRepositoryPsiElement<PsiAnnotationStub
   }
 
   public String getText() {
-    final StringBuffer buffer = new StringBuffer();
+    final StringBuilder buffer = new StringBuilder();
     appendMirrorText(0, buffer);
     return buffer.toString();
   }
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationParameterListImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationParameterListImpl.java
index 8f974b002e54..200a61300579 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationParameterListImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationParameterListImpl.java
@@ -39,7 +39,7 @@ public class ClsAnnotationParameterListImpl extends ClsElementImpl implements Ps
     }
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     if (myAttributes.length != 0) {
       buffer.append("(");
       for (int i = 0; i < myAttributes.length; i++) {
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationValueImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationValueImpl.java
index ab843c856fee..a0dc4dc57791 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationValueImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationValueImpl.java
@@ -48,7 +48,7 @@ public abstract class ClsAnnotationValueImpl extends ClsElementImpl implements P
 
   protected abstract ClsJavaCodeReferenceElementImpl createReference();
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     buffer.append("@").append(myReferenceElement.getCanonicalText());
     myParameterList.appendMirrorText(indentLevel, buffer);
   }
@@ -107,7 +107,7 @@ public abstract class ClsAnnotationValueImpl extends ClsElementImpl implements P
   }
 
   public String getText() {
-    final StringBuffer buffer = new StringBuffer();
+    final StringBuilder buffer = new StringBuilder();
     appendMirrorText(0, buffer);
     return buffer.toString();
   }
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsArrayInitializerMemberValueImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsArrayInitializerMemberValueImpl.java
index ca4046c9aa95..363d02b1fa73 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsArrayInitializerMemberValueImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsArrayInitializerMemberValueImpl.java
@@ -35,12 +35,12 @@ public class ClsArrayInitializerMemberValueImpl extends ClsElementImpl implement
   }
 
   public String getText() {
-    StringBuffer buffer = new StringBuffer();
+    final StringBuilder buffer = new StringBuilder();
     appendMirrorText(0, buffer);
     return buffer.toString();
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     buffer.append('{');
     for (int i = 0; i < myInitializers.length; i++) {
       if (i > 0) buffer.append(", ");
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java
index c4615730b454..43f7a723d24f 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java
@@ -319,7 +319,7 @@ public class ClsClassImpl extends ClsRepositoryPsiElement<PsiClassStub<?>> imple
     return getStub().isEnum();
   }
 
-  public void appendMirrorText(final int indentLevel, @NonNls final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, @NonNls final StringBuilder buffer) {
     ClsDocCommentImpl docComment = (ClsDocCommentImpl)getDocComment();
     if (docComment != null) {
       docComment.appendMirrorText(indentLevel, buffer);
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsClassObjectAccessExpressionImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsClassObjectAccessExpressionImpl.java
index 2303c840cc9e..9d84f5158b48 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsClassObjectAccessExpressionImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsClassObjectAccessExpressionImpl.java
@@ -41,7 +41,7 @@ public class ClsClassObjectAccessExpressionImpl extends ClsElementImpl implement
     myTypeElement = new ClsTypeElementImpl(this, canonicalClassText, ClsTypeElementImpl.VARIANCE_NONE);
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     myTypeElement.appendMirrorText(0, buffer);
     buffer.append(CLASS_ENDING);
   }
@@ -81,7 +81,7 @@ public class ClsClassObjectAccessExpressionImpl extends ClsElementImpl implement
   }
 
   public String getText() {
-    StringBuffer buffer = new StringBuffer();
+    final StringBuilder buffer = new StringBuilder();
     appendMirrorText(0, buffer);
     return buffer.toString();
   }
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsDocCommentImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsDocCommentImpl.java
index cc5d98a28476..6a8a5bec9957 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsDocCommentImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsDocCommentImpl.java
@@ -36,7 +36,7 @@ class ClsDocCommentImpl extends ClsElementImpl implements PsiDocComment, JavaTok
     myTags = tags;
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     buffer.append("/**");
     for (PsiDocTag tag : getTags()) {
       goNextLine(indentLevel + 1, buffer);
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsDocTagImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsDocTagImpl.java
index 06737615c4b1..a625f6a1a38c 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsDocTagImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsDocTagImpl.java
@@ -41,7 +41,7 @@ class ClsDocTagImpl extends ClsElementImpl implements PsiDocTag {
     myNameElement = new NameElement(name);
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     buffer.append(myNameElement.getText());
   }
 
@@ -129,7 +129,7 @@ class ClsDocTagImpl extends ClsElementImpl implements PsiDocTag {
       return PsiElement.EMPTY_ARRAY;
     }
 
-    public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+    public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     }
 
     public void setMirror(@NotNull TreeElement element) {
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java
index a0f7f94d2036..51a67aa2b740 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java
@@ -104,9 +104,9 @@ public abstract class ClsElementImpl extends PsiElementBase implements PsiCompil
 
   protected static final String CAN_NOT_MODIFY_MESSAGE = PsiBundle.message("psi.error.attempt.to.edit.class.file");
 
-  public abstract void appendMirrorText(final int indentLevel, final StringBuffer buffer);
+  public abstract void appendMirrorText(final int indentLevel, final StringBuilder buffer);
 
-  protected static void goNextLine(int indentLevel, StringBuffer buffer) {
+  protected static void goNextLine(int indentLevel, StringBuilder buffer) {
     buffer.append('\n');
     for (int i = 0; i < indentLevel; i++) buffer.append(' ');
   }
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsEnumConstantImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsEnumConstantImpl.java
index 5d41a8576d83..3a99b4428e68 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsEnumConstantImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsEnumConstantImpl.java
@@ -32,7 +32,7 @@ public class ClsEnumConstantImpl extends ClsFieldImpl implements PsiEnumConstant
     super(stub);
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     ClsDocCommentImpl docComment = (ClsDocCommentImpl)getDocComment();
     if (docComment != null) {
       docComment.appendMirrorText(indentLevel, buffer);
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsFieldImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsFieldImpl.java
index f5bb53a64d0d..77d6efdf9c1d 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsFieldImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsFieldImpl.java
@@ -183,7 +183,7 @@ public class ClsFieldImpl extends ClsRepositoryPsiElement<PsiFieldStub> implemen
   public void normalizeDeclaration() throws IncorrectOperationException {
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     ClsDocCommentImpl docComment = (ClsDocCommentImpl)getDocComment();
     if (docComment != null) {
       docComment.appendMirrorText(indentLevel, buffer);
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java
index 585984b34444..0e43b5833212 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java
@@ -209,7 +209,7 @@ public class ClsFileImpl extends ClsRepositoryPsiElement<PsiClassHolderFileStub>
     return false;
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     buffer.append(PsiBundle.message("psi.decompiled.text.header"));
     goNextLine(indentLevel, buffer);
     goNextLine(indentLevel, buffer);
@@ -358,7 +358,7 @@ public class ClsFileImpl extends ClsRepositoryPsiElement<PsiClassHolderFileStub>
       psiFile = new ClsFileImpl((PsiManagerImpl)manager, new ClassFileViewProvider(manager, file), true);
     }
 
-    StringBuffer buffer = new StringBuffer();
+    final StringBuilder buffer = new StringBuilder();
     psiFile.appendMirrorText(0, buffer);
     return buffer.toString();
   }
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsIdentifierImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsIdentifierImpl.java
index a58414beaa6b..85369cd80845 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsIdentifierImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsIdentifierImpl.java
@@ -50,7 +50,7 @@ class ClsIdentifierImpl extends ClsElementImpl implements PsiIdentifier, PsiJava
     return myParent;
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer){
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer){
     buffer.append(getText());
   }
 
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java
index 4282ffb82440..7b6bd3d6daf9 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java
@@ -234,7 +234,7 @@ public class ClsJavaCodeReferenceElementImpl extends ClsElementImpl implements P
     return false;
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     buffer.append(getCanonicalText());
   }
 
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsLiteralExpressionImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsLiteralExpressionImpl.java
index 8b27d2fc8d04..0a80cd27aec8 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsLiteralExpressionImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsLiteralExpressionImpl.java
@@ -53,7 +53,7 @@ public class ClsLiteralExpressionImpl extends ClsElementImpl implements PsiLiter
     return null;
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     buffer.append(getText());
   }
 
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsMethodImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsMethodImpl.java
index b93f40fd269b..7969d9163aa7 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsMethodImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsMethodImpl.java
@@ -242,7 +242,7 @@ public class ClsMethodImpl extends ClsRepositoryPsiElement<PsiMethodStub> implem
     return MethodSignatureBackedByPsiMethod.create(this, substitutor);
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     appendMethodHeader(buffer, indentLevel);
 
     if (hasModifierProperty(PsiModifier.ABSTRACT) || hasModifierProperty(PsiModifier.NATIVE)) {
@@ -255,7 +255,7 @@ public class ClsMethodImpl extends ClsRepositoryPsiElement<PsiMethodStub> implem
     }
   }
 
-  private void appendMethodHeader(@NonNls StringBuffer buffer, final int indentLevel) {
+  private void appendMethodHeader(@NonNls StringBuilder buffer, final int indentLevel) {
     ClsDocCommentImpl docComment = (ClsDocCommentImpl)getDocComment();
     if (docComment != null) {
       docComment.appendMirrorText(indentLevel, buffer);
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsModifierListImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsModifierListImpl.java
index 0f0d2cd194ba..8f9ec219ef1d 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsModifierListImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsModifierListImpl.java
@@ -84,7 +84,7 @@ public class ClsModifierListImpl extends ClsRepositoryPsiElement<PsiModifierList
         || element instanceof PsiField;
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     final PsiAnnotation[] annotations = getAnnotations();
     final boolean formattingAllowed = isAnnotationFormattingAllowed();
     for (PsiAnnotation annotation : annotations) {
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsNameValuePairImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsNameValuePairImpl.java
index c2f45ed984e0..78f564aba307 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsNameValuePairImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsNameValuePairImpl.java
@@ -37,7 +37,7 @@ public class ClsNameValuePairImpl extends ClsElementImpl implements PsiNameValue
     myMemberValue = ClsParsingUtil.getMemberValue(value, this);
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     if (myNameIdentifier.getText() != null) {
       myNameIdentifier.appendMirrorText(0, buffer);
       buffer.append(" = ");
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsPackageStatementImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsPackageStatementImpl.java
index 6701698cf456..478782e4b2c2 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsPackageStatementImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsPackageStatementImpl.java
@@ -68,7 +68,7 @@ class ClsPackageStatementImpl extends ClsElementImpl implements PsiPackageStatem
     return myPackageName;
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     buffer.append("package ");
     buffer.append(getPackageName());
     buffer.append(";");
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsParameterImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsParameterImpl.java
index 63dbd4fbd8f3..5c8362fee1a4 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsParameterImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsParameterImpl.java
@@ -125,7 +125,7 @@ public class ClsParameterImpl extends ClsRepositoryPsiElement<PsiParameterStub>
   public void normalizeDeclaration() throws IncorrectOperationException {
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     PsiAnnotation[] annotations = getModifierList().getAnnotations();
     for (PsiAnnotation annotation : annotations) {
       ((ClsAnnotationImpl)annotation).appendMirrorText(indentLevel, buffer);
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsParameterListImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsParameterListImpl.java
index 18a661899237..980b75476b1a 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsParameterListImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsParameterListImpl.java
@@ -49,7 +49,7 @@ public class ClsParameterListImpl extends ClsRepositoryPsiElement<PsiParameterLi
     return getParameters().length;
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     buffer.append('(');
     PsiParameter[] parameters = getParameters();
     for (int i = 0; i < parameters.length; i++) {
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsPrefixExpressionImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsPrefixExpressionImpl.java
index ef90e06a7452..a3fbcd5f3028 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsPrefixExpressionImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsPrefixExpressionImpl.java
@@ -63,7 +63,7 @@ public class ClsPrefixExpressionImpl extends ClsElementImpl implements PsiPrefix
     return "-" + myOperand.getText();
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     buffer.append(getText());
   }
 
@@ -98,7 +98,7 @@ public class ClsPrefixExpressionImpl extends ClsElementImpl implements PsiPrefix
       return ClsPrefixExpressionImpl.this;
     }
 
-    public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+    public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
       buffer.append("-");
     }
 
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceExpressionImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceExpressionImpl.java
index 4fc4696f75a8..31b3f0c05ed2 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceExpressionImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceExpressionImpl.java
@@ -159,7 +159,7 @@ public class ClsReferenceExpressionImpl extends ClsElementImpl implements PsiRef
     return false;
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     buffer.append(getText());
   }
 
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceListImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceListImpl.java
index dd93dc09989a..79b7b43783c6 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceListImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceListImpl.java
@@ -62,7 +62,7 @@ public class ClsReferenceListImpl extends ClsRepositoryPsiElement<PsiClassRefere
     return getStub().getRole();
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     final String[] names = getStub().getReferencedNames();
     if (names.length != 0) {
       final Role role = getStub().getRole();
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceParametersListImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceParametersListImpl.java
index 877f44d5491b..b831ae67da8b 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceParametersListImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceParametersListImpl.java
@@ -36,7 +36,7 @@ public class ClsReferenceParametersListImpl extends ClsElementImpl implements Ps
     myTypeElements = typeElements;
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     if (myTypeElements.length != 0) {
       buffer.append('<');
       for (int i = 0; i < myTypeElements.length; i++) {
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeElementImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeElementImpl.java
index 82b8ff692fe2..ca14f003cdaf 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeElementImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeElementImpl.java
@@ -84,7 +84,7 @@ public class ClsTypeElementImpl extends ClsElementImpl implements PsiTypeElement
     return decorateTypeText(myTypeText);
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer){
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer){
     buffer.append(decorateTypeText(myTypeText));
   }
 
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterImpl.java
index e2eb663e4295..494b9d859d36 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterImpl.java
@@ -266,7 +266,7 @@ public class ClsTypeParameterImpl extends ClsRepositoryPsiElement<PsiTypeParamet
     return "PsiTypeParameter";
   }
 
-  public void appendMirrorText(final int indentLevel, @NonNls final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, @NonNls final StringBuilder buffer) {
     buffer.append(getName());
     PsiJavaCodeReferenceElement[] bounds = getExtendsList().getReferenceElements();
     if (bounds.length > 0) {
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterReferenceImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterReferenceImpl.java
index 4133b98a8123..ddf924df1095 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterReferenceImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterReferenceImpl.java
@@ -156,7 +156,7 @@ public class ClsTypeParameterReferenceImpl extends ClsElementImpl implements Psi
     return false;
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer){
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer){
     buffer.append(getCanonicalText());
   }
 
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeParametersListImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeParametersListImpl.java
index e5d57ba81090..371737a65242 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeParametersListImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeParametersListImpl.java
@@ -37,7 +37,7 @@ public class ClsTypeParametersListImpl extends ClsRepositoryPsiElement<PsiTypePa
     super(stub);
   }
 
-  public void appendMirrorText(final int indentLevel, final StringBuffer buffer) {
+  public void appendMirrorText(final int indentLevel, final StringBuilder buffer) {
     final PsiTypeParameter[] params = getTypeParameters();
     if (params.length != 0) {
       buffer.append('<');