Permalink
Browse files

code cleanup <3

  • Loading branch information...
1 parent 5e2a4eb commit 8608b099840e89a1fa22affefed6d787cd23e293 @contra committed Apr 26, 2011
View
@@ -2,31 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="3a893d62-f736-4332-8d0c-e49c42a3bf57" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/artifacts/JBird_jar.xml" />
- <change type="DELETED" beforePath="C:\Users\Eric\Desktop\Projects\JBird\.idea\artifacts\Jaybird_jar.xml" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Eric\Desktop\Projects\JBird\Jaybird.iml" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Eric\Desktop\Projects\JBird\out\artifacts\Jaybird_jar\Jaybird.jar" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Eric\Desktop\Projects\JBird\out\production\Jaybird\Application.class" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Eric\Desktop\Projects\JBird\out\production\Jaybird\Injector.class" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Eric\Desktop\Projects\JBird\out\production\Jaybird\util\bcel\BCELMethods.class" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Eric\Desktop\Projects\JBird\out\production\Jaybird\util\bcel\JarLoader.class" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Eric\Desktop\Projects\JBird\out\production\Jaybird\util\misc\Downloader.class" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Eric\Desktop\Projects\JBird\out\production\Jaybird\util\misc\IO.class" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Eric\Desktop\Projects\JBird\out\production\Jaybird\util\misc\LogHandler.class" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Eric\Desktop\Projects\JBird\out\production\Jaybird\util\misc\Misc.class" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Eric\Desktop\Projects\JBird\out\production\Jaybird\util\misc\Settings.class" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Eric\Desktop\Projects\JBird\out\production\Jaybird\util\misc\UI$1.class" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Eric\Desktop\Projects\JBird\out\production\Jaybird\util\misc\UI.class" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Eric\Desktop\Projects\JBird\out\production\META-INF\MANIFEST.MF" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Eric\Desktop\Projects\JBird\src\util\misc\Downloader.java" afterPath="" />
- <change type="MOVED" beforePath="C:\Users\Eric\Desktop\Projects\JBird\out\META-INF\MANIFEST.MF" afterPath="$PROJECT_DIR$/src/META-INF/MANIFEST.MF" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/.name" afterPath="$PROJECT_DIR$/.idea/.name" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/vcs.xml" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Application.java" afterPath="$PROJECT_DIR$/src/Application.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/util/misc/Settings.java" afterPath="$PROJECT_DIR$/src/util/misc/Settings.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/util/misc/LogHandler.java" afterPath="$PROJECT_DIR$/src/util/misc/LogHandler.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/util/misc/Misc.java" afterPath="$PROJECT_DIR$/src/util/misc/Misc.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/util/misc/UI.java" afterPath="$PROJECT_DIR$/src/util/misc/UI.java" />
</list>
<ignored path="Jaybird.iws" />
<ignored path=".idea/workspace.xml" />
@@ -88,32 +67,14 @@
<file leaf-file-name="Application.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/Application.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="25" column="36" selection-start="841" selection-end="841" vertical-scroll-proportion="0.64491653">
+ <state line="20" column="33" selection-start="609" selection-end="609" vertical-scroll-proportion="0.5159332">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Settings.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/util/misc/Settings.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="4" column="23" selection-start="113" selection-end="113" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Network.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/util/misc/Network.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="9" column="84" selection-start="211" selection-end="211" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindManager">
@@ -131,16 +92,16 @@
<option value="$PROJECT_DIR$/src/util/bcel/BCELMethods.java" />
<option value="$PROJECT_DIR$/src/util/bcel/JarLoader.java" />
<option value="$PROJECT_DIR$/src/Settings.java" />
- <option value="$PROJECT_DIR$/src/util/misc/LogHandler.java" />
<option value="$PROJECT_DIR$/src/trans/Injector.java" />
<option value="$PROJECT_DIR$/src/util/misc/Downloader.java" />
- <option value="$PROJECT_DIR$/src/util/misc/Misc.java" />
<option value="$PROJECT_DIR$/src/util/misc/IO.java" />
- <option value="$PROJECT_DIR$/src/util/misc/UI.java" />
<option value="$PROJECT_DIR$/src/Injector.java" />
<option value="$PROJECT_DIR$/src/util/misc/Network.java" />
<option value="$PROJECT_DIR$/src/util/misc/Settings.java" />
<option value="$PROJECT_DIR$/src/Application.java" />
+ <option value="$PROJECT_DIR$/src/util/misc/LogHandler.java" />
+ <option value="$PROJECT_DIR$/src/util/misc/Misc.java" />
+ <option value="$PROJECT_DIR$/src/util/misc/UI.java" />
</list>
</option>
</component>
@@ -210,46 +171,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="JBird" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="JBird" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="util" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="misc" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="JBird" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="JBird" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="util" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
</subPane>
</pane>
<pane id="Scope" />
@@ -445,7 +366,7 @@
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3288426" sideWeight="0.76391983" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23608018" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23608018" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Regex" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -491,70 +412,89 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/util/bcel/JarLoader.java">
+ <entry file="file://$PROJECT_DIR$/src/util/misc/IO.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="6" column="24" selection-start="223" selection-end="223" vertical-scroll-proportion="0.0" />
+ <state line="33" column="22" selection-start="913" selection-end="913" vertical-scroll-proportion="0.775076" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/util/misc/LogHandler.java">
+ <entry file="jar://C:/Program Files/Java/jdk1.6.0_22/src.zip!/java/io/InputStreamReader.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="15" column="12" selection-start="295" selection-end="295" vertical-scroll-proportion="0.41062802" />
+ <state line="44" column="13" selection-start="1351" selection-end="1399" vertical-scroll-proportion="0.33295062" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/util/misc/Misc.java">
+ <entry file="file://$PROJECT_DIR$/src/Injector.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="7" column="10" selection-start="148" selection-end="148" vertical-scroll-proportion="0.13662457" />
+ <state line="40" column="33" selection-start="1607" selection-end="1607" vertical-scroll-proportion="0.6736597" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/util/misc/IO.java">
+ <entry file="file://$PROJECT_DIR$/JBird.iml">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="22" selection-start="913" selection-end="913" vertical-scroll-proportion="0.775076" />
+ <state line="4" column="72" selection-start="214" selection-end="214" vertical-scroll-proportion="0.078071184">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/util/bcel/BCELMethods.java">
+ <entry file="file://$PROJECT_DIR$/src/util/misc/Settings.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
+ <state line="6" column="27" selection-start="176" selection-end="176" vertical-scroll-proportion="0.15477997">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="jar://C:/Program Files/Java/jdk1.6.0_22/src.zip!/java/io/InputStreamReader.java">
+ <entry file="file://$PROJECT_DIR$/src/util/misc/Network.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="44" column="13" selection-start="1351" selection-end="1399" vertical-scroll-proportion="0.33295062" />
+ <state line="12" column="74" selection-start="452" selection-end="452" vertical-scroll-proportion="0.23216996">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/Injector.java">
+ <entry file="jar://C:/Program Files/Java/jdk1.6.0_22/src.zip!/java/lang/System.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="40" column="33" selection-start="1607" selection-end="1607" vertical-scroll-proportion="0.6736597" />
+ <state line="36" column="19" selection-start="1183" selection-end="1183" vertical-scroll-proportion="0.3323217">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/util/misc/UI.java">
+ <entry file="file://$PROJECT_DIR$/src/util/misc/LogHandler.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="41" selection-start="590" selection-end="590" vertical-scroll-proportion="0.31228474" />
+ <state line="23" column="19" selection-start="447" selection-end="447" vertical-scroll-proportion="0.59332323">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/JBird.iml">
+ <entry file="file://$PROJECT_DIR$/src/util/misc/Misc.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="4" column="72" selection-start="214" selection-end="214" vertical-scroll-proportion="0.078071184">
+ <state line="11" column="47" selection-start="393" selection-end="393" vertical-scroll-proportion="0.2837633">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/util/misc/Settings.java">
+ <entry file="file://$PROJECT_DIR$/src/util/misc/UI.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="4" column="23" selection-start="113" selection-end="113" vertical-scroll-proportion="0.0">
+ <state line="30" column="32" selection-start="919" selection-end="919" vertical-scroll-proportion="0.6707132">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/util/misc/Network.java">
+ <entry file="file://$PROJECT_DIR$/src/util/bcel/BCELMethods.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="84" selection-start="211" selection-end="211" vertical-scroll-proportion="0.0">
+ <state line="113" column="19" selection-start="4252" selection-end="4252" vertical-scroll-proportion="0.28072837">
<folding />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/util/bcel/JarLoader.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="68" column="116" selection-start="2698" selection-end="2698" vertical-scroll-proportion="0.35508347">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/src/Application.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="25" column="36" selection-start="841" selection-end="841" vertical-scroll-proportion="0.64491653">
+ <state line="20" column="33" selection-start="609" selection-end="609" vertical-scroll-proportion="0.5159332">
<folding>
<element signature="imports" expanded="true" />
</folding>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -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!");
}
@@ -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);
}
}
Oops, something went wrong.

0 comments on commit 8608b09

Please sign in to comment.