azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring: rename class

Browse Source
This commit is contained in:
Nikolay Krasko
2014-05-02 01:50:29 +04:00
parent 47400f90ce
commit eeea34ec9e
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java
+3 -3
View File
@@ -37,7 +37,7 @@ import java.util.List;
import static org.jetbrains.jet.JetNodeTypes.*; import static org.jetbrains.jet.JetNodeTypes.*;
import static org.jetbrains.jet.lexer.JetTokens.*; import static org.jetbrains.jet.lexer.JetTokens.*;
import static org.jetbrains.jet.plugin.formatter.ASTIndentStrategy.strategy; import static org.jetbrains.jet.plugin.formatter.NodeIndentStrategy.strategy;
/** /**
* @see Block for good JavaDoc documentation * @see Block for good JavaDoc documentation
@@ -279,7 +279,7 @@ public class JetBlock extends AbstractBlock {
} }
} }
private static final ASTIndentStrategy[] INDENT_RULES = new ASTIndentStrategy[] { private static final NodeIndentStrategy[] INDENT_RULES = new NodeIndentStrategy[] {
strategy("No indent for braces in blocks") strategy("No indent for braces in blocks")
.in(BLOCK, CLASS_BODY, FUNCTION_LITERAL) .in(BLOCK, CLASS_BODY, FUNCTION_LITERAL)
.forType(RBRACE, LBRACE) .forType(RBRACE, LBRACE)
@@ -357,7 +357,7 @@ public class JetBlock extends AbstractBlock {
} }
} }
for (ASTIndentStrategy strategy : INDENT_RULES) { for (NodeIndentStrategy strategy : INDENT_RULES) {
Indent indent = strategy.getIndent(child); Indent indent = strategy.getIndent(child);
if (indent != null) { if (indent != null) {
return indent; return indent;
idea/src/org/jetbrains/jet/plugin/formatter/ASTIndentStrategy.java → idea/src/org/jetbrains/jet/plugin/formatter/NodeIndentStrategy.java
+4 -4
View File
@@ -27,8 +27,8 @@ import java.util.Collections;
import java.util.List; import java.util.List;
@SuppressWarnings("UnusedDeclaration") @SuppressWarnings("UnusedDeclaration")
public abstract class ASTIndentStrategy { public abstract class NodeIndentStrategy {
public static ASTIndentStrategy constIndent(Indent indent) { public static NodeIndentStrategy constIndent(Indent indent) {
return new ConstIndentStrategy(indent); return new ConstIndentStrategy(indent);
} }
@@ -39,7 +39,7 @@ public abstract class ASTIndentStrategy {
@Nullable @Nullable
public abstract Indent getIndent(@NotNull ASTNode node); public abstract Indent getIndent(@NotNull ASTNode node);
public static class ConstIndentStrategy extends ASTIndentStrategy { public static class ConstIndentStrategy extends NodeIndentStrategy {
private final Indent indent; private final Indent indent;
public ConstIndentStrategy(Indent indent) { public ConstIndentStrategy(Indent indent) {
@@ -53,7 +53,7 @@ public abstract class ASTIndentStrategy {
} }
} }
public static class PositionStrategy extends ASTIndentStrategy { public static class PositionStrategy extends NodeIndentStrategy {
private Indent defaultIndent = Indent.getNoneIndent(); private Indent defaultIndent = Indent.getNoneIndent();
private final List<IElementType> in = new ArrayList<IElementType>(); private final List<IElementType> in = new ArrayList<IElementType>();