You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2017/12/04 23:50:39 UTC
groovy git commit: Trivial refactoring: Make inner classes static
Repository: groovy
Updated Branches:
refs/heads/master 3aa0b7e33 -> e828b02ce
Trivial refactoring: Make inner classes static
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/e828b02c
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/e828b02c
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/e828b02c
Branch: refs/heads/master
Commit: e828b02ce62e05c6a70e7fcbee52fd4ecc57daac
Parents: 3aa0b7e
Author: sunlan <su...@apache.org>
Authored: Tue Dec 5 07:50:33 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Tue Dec 5 07:50:33 2017 +0800
----------------------------------------------------------------------
.../groovy/transform/stc/AbstractTypeCheckingExtension.java | 2 +-
.../src/main/groovy/groovy/ui/text/TextEditor.java | 6 +++---
.../src/main/groovy/groovy/ui/text/TextUndoManager.java | 2 +-
.../src/main/groovy/groovy/text/markup/BaseTemplate.java | 2 +-
.../groovy-xml/src/main/java/groovy/util/XmlNodePrinter.java | 2 +-
.../main/java/org/apache/groovy/parser/antlr4/AstBuilder.java | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/e828b02c/src/main/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java b/src/main/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java
index c6c5cc7..8e2fad7 100644
--- a/src/main/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java
+++ b/src/main/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java
@@ -435,7 +435,7 @@ public class AbstractTypeCheckingExtension extends TypeCheckingExtension {
context.pushTemporaryTypeInfo();
}
- private class TypeCheckingScope extends LinkedHashMap<String, Object> {
+ private static class TypeCheckingScope extends LinkedHashMap<String, Object> {
private final AbstractTypeCheckingExtension.TypeCheckingScope parent;
private TypeCheckingScope(final AbstractTypeCheckingExtension.TypeCheckingScope parentScope) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/e828b02c/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextEditor.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextEditor.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextEditor.java
index 68ed413..34df868 100644
--- a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextEditor.java
+++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextEditor.java
@@ -390,13 +390,13 @@ public class TextEditor extends JTextPane implements Pageable, Printable {
this.unwrapped = unwrapped;
}
- private class FindAction extends AbstractAction {
+ private static class FindAction extends AbstractAction {
public void actionPerformed(ActionEvent ae) {
FindReplaceUtility.showDialog();
}
}
- private class ReplaceAction extends AbstractAction {
+ private static class ReplaceAction extends AbstractAction {
public void actionPerformed(ActionEvent ae) {
FindReplaceUtility.showDialog(true);
}
@@ -458,7 +458,7 @@ public class TextEditor extends JTextPane implements Pageable, Printable {
/**
* Paint a horizontal line the width of a column and 1 pixel high
*/
- private class OvertypeCaret extends DefaultCaret {
+ private static class OvertypeCaret extends DefaultCaret {
//The overtype caret will simply be a horizontal line one pixel high
// (once we determine where to paint it)
public void paint(Graphics g) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/e828b02c/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextUndoManager.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextUndoManager.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextUndoManager.java
index 0490948..05a9d24 100644
--- a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextUndoManager.java
+++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextUndoManager.java
@@ -175,7 +175,7 @@ public class TextUndoManager extends UndoManager {
}
- private class StructuredEdit extends CompoundEdit {
+ private static class StructuredEdit extends CompoundEdit {
private long editedTime;
http://git-wip-us.apache.org/repos/asf/groovy/blob/e828b02c/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/BaseTemplate.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/BaseTemplate.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/BaseTemplate.java
index d9b89cc..20121c9 100644
--- a/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/BaseTemplate.java
+++ b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/BaseTemplate.java
@@ -482,7 +482,7 @@ public abstract class BaseTemplate implements Writable {
return configuration.isAutoIndent() && !(out instanceof DelegatingIndentWriter)?new DelegatingIndentWriter(out, configuration.getAutoIndentString()):out;
}
- private class TagData {
+ private static class TagData {
private final Object[] array;
private Map attributes;
private Object body;
http://git-wip-us.apache.org/repos/asf/groovy/blob/e828b02c/subprojects/groovy-xml/src/main/java/groovy/util/XmlNodePrinter.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/groovy/util/XmlNodePrinter.java b/subprojects/groovy-xml/src/main/java/groovy/util/XmlNodePrinter.java
index 6b79962..f6c4fde 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/util/XmlNodePrinter.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/util/XmlNodePrinter.java
@@ -414,7 +414,7 @@ public class XmlNodePrinter {
}
}
- protected class NamespaceContext {
+ protected static class NamespaceContext {
private final Map<String, String> namespaceMap;
public NamespaceContext() {
http://git-wip-us.apache.org/repos/asf/groovy/blob/e828b02c/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
----------------------------------------------------------------------
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
index b0b4cd6..a67b236 100644
--- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
+++ b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
@@ -4396,7 +4396,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
}
*/
- private class DeclarationListStatement extends Statement {
+ private static class DeclarationListStatement extends Statement {
private final List<ExpressionStatement> declarationStatements;
public DeclarationListStatement(DeclarationExpression... declarations) {