Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove superfluous references to enclosing classes #604

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/groovy/lang/MetaClassImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -3810,7 +3810,7 @@ public Object copy(Object value) {
}
};

class MethodIndex extends Index {
static class MethodIndex extends Index {
public MethodIndex(boolean b) {
super(false);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/groovy/ui/GroovySocketServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public void run() {
}
}

class GroovyClientConnection implements Runnable {
static class GroovyClientConnection implements Runnable {
private Script script;
private Socket socket;
private BufferedReader reader;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public void closeRange(Label end) {
}
}

private class ExceptionTableEntry {
private static class ExceptionTableEntry {
Label start,end,goal;
String sig;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ public void pushTemporaryTypeInfo() {
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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -409,13 +409,13 @@ public void setUnwrapped(boolean unwrapped) {
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);
}
Expand Down Expand Up @@ -477,7 +477,7 @@ public void actionPerformed(ActionEvent ae) {
/**
* 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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public void undoableEditHappened(UndoableEditEvent uee) {

}

private class StructuredEdit extends CompoundEdit {
private static class StructuredEdit extends CompoundEdit {

private long editedTime;

Expand Down
2 changes: 1 addition & 1 deletion subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
Original file line number Diff line number Diff line change
Expand Up @@ -4477,7 +4477,7 @@ public void setEnableNamedQueries(boolean enableNamedQueries) {
// command pattern implementation classes
//-------------------------------------------------------------------------

private abstract class AbstractStatementCommand {
private abstract static class AbstractStatementCommand {
/**
* Execute the command that's defined by the subclass following
* the Command pattern. Specialized parameters are held in the command instances.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ private Writer createWriter(final Writer out) {
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ private void printEscaped(String s, boolean isAttributeValue) {
}
}

protected class NamespaceContext {
protected static class NamespaceContext {
private final Map<String, String> namespaceMap;

public NamespaceContext() {
Expand Down