Fix styles

netty · Feb 24, 2016 · 721955a · 721955a
1 parent 658390a
commit 721955a
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/...tty/build/test/TimedOutTestsListener.java → ...ty/build/junit/TimedOutTestsListener.java b/...tty/build/test/TimedOutTestsListener.java → ...ty/build/junit/TimedOutTestsListener.java
@@ -30,7 +30,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.netty.build.test;
+package io.netty.build.junit;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -42,6 +42,7 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 import java.util.Map;
 
 import org.junit.runner.notification.Failure;
@@ -53,9 +54,9 @@
  */
 public class TimedOutTestsListener extends RunListener {
 
-    static final String TEST_TIMED_OUT_PREFIX = "test timed out after";
+    private static final String TEST_TIMED_OUT_PREFIX = "test timed out after";
 
-    private static String INDENT = "    ";
+    private static final String INDENT = "\t";
 
     private final PrintWriter output;
 
@@ -82,7 +83,7 @@ public static String buildThreadDiagnosticString() {
         StringWriter sw = new StringWriter();
         PrintWriter output = new PrintWriter(sw);
 
-        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss,SSS");
+        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss,SSS", Locale.US);
         output.println(String.format("Timestamp: %s", dateFormat.format(new Date())));
         output.println();
         output.println(buildThreadDump());
@@ -105,7 +106,7 @@ static String buildThreadDump() {
             dump.append(String.format(
                     "\"%s\" %s prio=%d tid=%d %s\njava.lang.Thread.State: %s",
                     thread.getName(),
-                    (thread.isDaemon() ? "daemon" : ""),
+                    thread.isDaemon() ? "daemon" : "",
                     thread.getPriority(),
                     thread.getId(),
                     Thread.State.WAITING.equals(thread.getState()) ?
@@ -114,33 +115,32 @@ static String buildThreadDump() {
                     Thread.State.WAITING.equals(thread.getState()) ?
                             "WAITING (on object monitor)" : thread.getState()));
             for (StackTraceElement stackTraceElement : e.getValue()) {
-                dump.append("\n        at ");
+                dump.append("\n\tat ");
                 dump.append(stackTraceElement);
             }
-            dump.append("\n");
+            dump.append('\n');
         }
         return dump.toString();
     }
 
     static String buildDeadlockInfo() {
         ThreadMXBean threadBean = ManagementFactory.getThreadMXBean();
         long[] threadIds = threadBean.findMonitorDeadlockedThreads();
-        if (threadIds != null && threadIds.length > 0) {
-            StringWriter stringWriter = new StringWriter();
-            PrintWriter out = new PrintWriter(stringWriter);
-
-            ThreadInfo[] infos = threadBean.getThreadInfo(threadIds, true, true);
-            for (ThreadInfo ti : infos) {
-                printThreadInfo(ti, out);
-                printLockInfo(ti.getLockedSynchronizers(), out);
-                out.println();
-            }
-
-            out.close();
-            return stringWriter.toString();
-        } else {
+        if (threadIds == null || threadIds.length == 0) {
             return null;
         }
+        StringWriter stringWriter = new StringWriter();
+        PrintWriter out = new PrintWriter(stringWriter);
+
+        ThreadInfo[] infos = threadBean.getThreadInfo(threadIds, true, true);
+        for (ThreadInfo ti : infos) {
+            printThreadInfo(ti, out);
+            printLockInfo(ti.getLockedSynchronizers(), out);
+            out.println();
+        }
+
+        out.close();
+        return stringWriter.toString();
     }
 
     private static void printThreadInfo(ThreadInfo ti, PrintWriter out) {