Reformat

1 files changed, 17 insertions, 26 deletions

diff --git a/src/main/java/cuchaz/enigma/CommandMain.java b/src/main/java/cuchaz/enigma/CommandMain.java
index 8dfbe24..d7967b4 100644
--- a/src/main/java/cuchaz/enigma/CommandMain.java
+++ b/src/main/java/cuchaz/enigma/CommandMain.java
@@ -23,42 +23,38 @@ public class CommandMain {
 
         private static final int ReportTime = 5000; // 5s
 
-        private int m_totalWork;
-        private long m_startTime;
-        private long m_lastReportTime;
+        private int totalWork;
+        private long startTime;
+        private long lastReportTime;
 
         @Override
         public void init(int totalWork, String title) {
-            m_totalWork = totalWork;
-            m_startTime = System.currentTimeMillis();
-            m_lastReportTime = m_startTime;
+            this.totalWork = totalWork;
+            this.startTime = System.currentTimeMillis();
+            this.lastReportTime = this.startTime;
             System.out.println(title);
         }
 
         @Override
         public void onProgress(int numDone, String message) {
-
             long now = System.currentTimeMillis();
-            boolean isLastUpdate = numDone == m_totalWork;
-            boolean shouldReport = isLastUpdate || now - m_lastReportTime > ReportTime;
+            boolean isLastUpdate = numDone == this.totalWork;
+            boolean shouldReport = isLastUpdate || now - this.lastReportTime > ReportTime;
 
             if (shouldReport) {
-                int percent = numDone * 100 / m_totalWork;
+                int percent = numDone * 100 / this.totalWork;
                 System.out.println(String.format("\tProgress: %3d%%", percent));
-                m_lastReportTime = now;
+                this.lastReportTime = now;
             }
             if (isLastUpdate) {
-                double elapsedSeconds = (now - m_startTime) / 1000;
+                double elapsedSeconds = (now - this.startTime) / 1000;
                 System.out.println(String.format("Finished in %.1f seconds", elapsedSeconds));
             }
         }
     }
 
-    public static void main(String[] args)
-            throws Exception {
-
+    public static void main(String[] args) throws Exception {
         try {
-
             // process the command
             String command = getArg(args, 0, "command", true);
             if (command.equalsIgnoreCase("deobfuscate")) {
@@ -88,8 +84,7 @@ public class CommandMain {
         System.out.println("\t\tprotectify <in jar> <out jar>");
     }
 
-    private static void decompile(String[] args)
-            throws Exception {
+    private static void decompile(String[] args) throws Exception {
         File fileJarIn = getReadableFile(getArg(args, 1, "in jar", true));
         File fileJarOut = getWritableFolder(getArg(args, 2, "out folder", true));
         File fileMappings = getReadableFile(getArg(args, 3, "mappings file", false));
@@ -97,8 +92,7 @@ public class CommandMain {
         deobfuscator.writeSources(fileJarOut, new ConsoleProgressListener());
     }
 
-    private static void deobfuscate(String[] args)
-            throws Exception {
+    private static void deobfuscate(String[] args) throws Exception {
         File fileJarIn = getReadableFile(getArg(args, 1, "in jar", true));
         File fileJarOut = getWritableFile(getArg(args, 2, "out jar", true));
         File fileMappings = getReadableFile(getArg(args, 3, "mappings file", false));
@@ -106,24 +100,21 @@ public class CommandMain {
         deobfuscator.writeJar(fileJarOut, new ConsoleProgressListener());
     }
 
-    private static void protectify(String[] args)
-            throws Exception {
+    private static void protectify(String[] args) throws Exception {
         File fileJarIn = getReadableFile(getArg(args, 1, "in jar", true));
         File fileJarOut = getWritableFile(getArg(args, 2, "out jar", true));
         Deobfuscator deobfuscator = getDeobfuscator(null, new JarFile(fileJarIn));
         deobfuscator.protectifyJar(fileJarOut, new ConsoleProgressListener());
     }
 
-    private static void publify(String[] args)
-            throws Exception {
+    private static void publify(String[] args) throws Exception {
         File fileJarIn = getReadableFile(getArg(args, 1, "in jar", true));
         File fileJarOut = getWritableFile(getArg(args, 2, "out jar", true));
         Deobfuscator deobfuscator = getDeobfuscator(null, new JarFile(fileJarIn));
         deobfuscator.publifyJar(fileJarOut, new ConsoleProgressListener());
     }
 
-    private static Deobfuscator getDeobfuscator(File fileMappings, JarFile jar)
-            throws Exception {
+    private static Deobfuscator getDeobfuscator(File fileMappings, JarFile jar) throws Exception {
         System.out.println("Reading jar...");
         Deobfuscator deobfuscator = new Deobfuscator(jar);
         if (fileMappings != null) {