Cleanup (formatting)

This commit is contained in:
Roman Shevchenko
2017-02-14 15:25:54 +01:00
parent 0a8a19a995
commit 4095963446
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,12 +24,10 @@ import com.intellij.psi.impl.source.SourceTreeToPsiMap;
import com.intellij.psi.impl.source.tree.JavaElementType;
import com.intellij.psi.impl.source.tree.TreeElement;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@SuppressWarnings("ForLoopReplaceableByForEach")
public class ClsModifierListImpl extends ClsRepositoryPsiElement<PsiModifierListStub> implements PsiModifierList {
public ClsModifierListImpl(final PsiModifierListStub stub) {
public ClsModifierListImpl(PsiModifierListStub stub) {
super(stub);
}
@@ -78,29 +76,29 @@ public class ClsModifierListImpl extends ClsRepositoryPsiElement<PsiModifierList
@Override
@NotNull
public PsiAnnotation addAnnotation(@NotNull @NonNls String qualifiedName) {
public PsiAnnotation addAnnotation(@NotNull String qualifiedName) {
throw cannotModifyException(this);
}
@Override
public void appendMirrorText(int indentLevel, @NotNull StringBuilder buffer) {
final PsiElement parent = getParent();
final PsiAnnotation[] annotations = getAnnotations();
final boolean separateAnnotations = parent instanceof PsiClass || parent instanceof PsiMethod || parent instanceof PsiField;
PsiElement parent = getParent();
PsiAnnotation[] annotations = getAnnotations();
boolean separateAnnotations = parent instanceof PsiClass || parent instanceof PsiMethod || parent instanceof PsiField;
for (int i = 0; i < annotations.length; i++) {
appendText(annotations[i], indentLevel, buffer, separateAnnotations ? NEXT_LINE : " ");
for (PsiAnnotation annotation : annotations) {
appendText(annotation, indentLevel, buffer, separateAnnotations ? NEXT_LINE : " ");
}
final boolean isClass = parent instanceof PsiClass;
final boolean isInterface = isClass && ((PsiClass)parent).isInterface();
final boolean isEnum = isClass && ((PsiClass)parent).isEnum();
final boolean isInterfaceClass = isClass && parent.getParent() instanceof PsiClass && ((PsiClass)parent.getParent()).isInterface();
final boolean isMethod = parent instanceof PsiMethod;
final boolean isInterfaceMethod = isMethod && parent.getParent() instanceof PsiClass && ((PsiClass)parent.getParent()).isInterface();
final boolean isField = parent instanceof PsiField;
final boolean isInterfaceField = isField && parent.getParent() instanceof PsiClass && ((PsiClass)parent.getParent()).isInterface();
final boolean isEnumConstant = parent instanceof PsiEnumConstant;
boolean isClass = parent instanceof PsiClass;
boolean isInterface = isClass && ((PsiClass)parent).isInterface();
boolean isEnum = isClass && ((PsiClass)parent).isEnum();
boolean isInterfaceClass = isClass && parent.getParent() instanceof PsiClass && ((PsiClass)parent.getParent()).isInterface();
boolean isMethod = parent instanceof PsiMethod;
boolean isInterfaceMethod = isMethod && parent.getParent() instanceof PsiClass && ((PsiClass)parent.getParent()).isInterface();
boolean isField = parent instanceof PsiField;
boolean isInterfaceField = isField && parent.getParent() instanceof PsiClass && ((PsiClass)parent.getParent()).isInterface();
boolean isEnumConstant = parent instanceof PsiEnumConstant;
if (hasModifierProperty(PsiModifier.PUBLIC) && !isInterfaceMethod && !isInterfaceField && !isInterfaceClass && !isEnumConstant) {
buffer.append(PsiModifier.PUBLIC).append(' ');
@@ -160,4 +158,4 @@ public class ClsModifierListImpl extends ClsRepositoryPsiElement<PsiModifierList
public String toString() {
return "PsiModifierList";
}
}
}