checkstyle passes.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@77 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/BuildTypeMap.java b/dev/core/src/com/google/gwt/dev/jjs/impl/BuildTypeMap.java
index abb4fe0..326fb6a 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/BuildTypeMap.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/BuildTypeMap.java
@@ -280,6 +280,7 @@
char[] chars = jsniCode.toCharArray();
int i = 0, n = chars.length;
while (line > 0) {
+ // CHECKSTYLE_OFF
switch (chars[i]) {
case '\r':
// if skip an extra character if this is a CR/LF
@@ -293,6 +294,7 @@
default:
++i;
}
+ // CHECKSTYLE_ON
}
// Map into the original source stream;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaAST.java b/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaAST.java
index b12495a..b75dbbd 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaAST.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaAST.java
@@ -1780,15 +1780,15 @@
return null;
}
String sname = String.valueOf(name);
- Map/* <String, JLabel> */labelMap = (Map) this.labelMap.get(enclosingMethod);
- if (labelMap == null) {
- labelMap = new HashMap();
- this.labelMap.put(enclosingMethod, labelMap);
+ Map/* <String, JLabel> */lblMap = (Map) this.labelMap.get(enclosingMethod);
+ if (lblMap == null) {
+ lblMap = new HashMap();
+ this.labelMap.put(enclosingMethod, lblMap);
}
- JLabel jlabel = (JLabel) labelMap.get(sname);
+ JLabel jlabel = (JLabel) lblMap.get(sname);
if (jlabel == null) {
jlabel = new JLabel(program, sname);
- labelMap.put(sname, jlabel);
+ lblMap.put(sname, jlabel);
}
return jlabel;
}
diff --git a/dev/core/src/com/google/gwt/dev/js/JsToStringGenerationVisitor.java b/dev/core/src/com/google/gwt/dev/js/JsToStringGenerationVisitor.java
index e00c8e4..067cc1b 100644
--- a/dev/core/src/com/google/gwt/dev/js/JsToStringGenerationVisitor.java
+++ b/dev/core/src/com/google/gwt/dev/js/JsToStringGenerationVisitor.java
@@ -740,6 +740,7 @@
return false;
}
+ // CHECKSTYLE_NAMING_OFF
protected void _newline() {
p.newline();
}
@@ -1036,7 +1037,8 @@
private void _while() {
p.print(CHARS_WHILE);
}
-
+ // CHECKSTYLE_NAMING_ON
+
private void indent() {
p.indentIn();
}
diff --git a/dev/core/src/com/google/gwt/dev/shell/LowLevel.java b/dev/core/src/com/google/gwt/dev/shell/LowLevel.java
index 1eb08f9..d57f565 100644
--- a/dev/core/src/com/google/gwt/dev/shell/LowLevel.java
+++ b/dev/core/src/com/google/gwt/dev/shell/LowLevel.java
@@ -179,6 +179,7 @@
}
}
+ // CHECKSTYLE_NAMING_OFF
private static native void _deleteGlobalRefInt(int globalRef);
private static native String _getEnv(String key);
@@ -186,7 +187,8 @@
private static native int _newGlobalRefInt(Object o);
private static native Object _objFromGlobalRefInt(int globalRef);
-
+ // CHECKSTYLE_NAMING_ON
+
/**
* This class is not instantiable.
*/
diff --git a/dev/core/src/com/google/gwt/dev/util/log/ThreadLocalTreeLoggerProxy.java b/dev/core/src/com/google/gwt/dev/util/log/ThreadLocalTreeLoggerProxy.java
index de6dd19..06c2acd 100644
--- a/dev/core/src/com/google/gwt/dev/util/log/ThreadLocalTreeLoggerProxy.java
+++ b/dev/core/src/com/google/gwt/dev/util/log/ThreadLocalTreeLoggerProxy.java
@@ -42,10 +42,11 @@
*/
public TreeLogger branch(Type type, String msg, Throwable caught) {
TreeLogger logger = (TreeLogger) perThreadLogger.get();
- if (logger != null)
+ if (logger != null) {
return logger.branch(type, msg, caught);
- else
+ } else {
return this;
+ }
}
/**
@@ -56,10 +57,11 @@
*/
public boolean isLoggable(Type type) {
TreeLogger logger = (TreeLogger) perThreadLogger.get();
- if (logger != null)
+ if (logger != null) {
return logger.isLoggable(type);
- else
+ } else {
return false;
+ }
}
/**
@@ -68,8 +70,9 @@
*/
public void log(Type type, String msg, Throwable caught) {
TreeLogger logger = (TreeLogger) perThreadLogger.get();
- if (logger != null)
+ if (logger != null) {
logger.log(type, msg, caught);
+ }
}
/**
diff --git a/dev/core/src/com/google/gwt/dev/util/msg/Message.java b/dev/core/src/com/google/gwt/dev/util/msg/Message.java
index 93978b6..f6057cf 100644
--- a/dev/core/src/com/google/gwt/dev/util/msg/Message.java
+++ b/dev/core/src/com/google/gwt/dev/util/msg/Message.java
@@ -77,11 +77,11 @@
}
fmtParts[args] = fmt.substring(from).toCharArray();
- int minChars = 0;
+ int minNumChars = 0;
for (int i = 0, n = fmtParts.length; i < n; ++i) {
- minChars += fmtParts[i].length;
+ minNumChars += fmtParts[i].length;
}
- this.minChars = minChars;
+ this.minChars = minNumChars;
}
protected final Formatter getFormatter(Class c) {
diff --git a/dev/mac/src/com/google/gwt/dev/shell/mac/LowLevelSaf.java b/dev/mac/src/com/google/gwt/dev/shell/mac/LowLevelSaf.java
index 12be03b..e49acb8 100644
--- a/dev/mac/src/com/google/gwt/dev/shell/mac/LowLevelSaf.java
+++ b/dev/mac/src/com/google/gwt/dev/shell/mac/LowLevelSaf.java
@@ -412,6 +412,7 @@
System.out.flush();
}
+ // CHECKSTYLE_NAMING_OFF
private static native boolean _coerceToBoolean(int execState, int jsval,
boolean[] rval);
@@ -467,7 +468,8 @@
private static native boolean _wrapFunction(String name,
DispatchMethod dispMeth, int[] rval);
-
+ // CHECKSTYLE_NAMING_OFF
+
/**
* Not instantiable.
*/
