From ecae42fa576aad4c307eb549c5691235c826a35b Mon Sep 17 00:00:00 2001
From: Clisprail <clisprail@parabot.org>
Date: Thu, 20 Feb 2014 00:41:08 +0100
Subject: [PATCH] Moved HookParsers into correct package

Note: this will require an update for all server providers who use the
hookparser (sorry)
---
 parabotv2/src/org/parabot/core/Context.java                 | 2 +-
 parabotv2/src/org/parabot/core/asm/hooks/HookFile.java      | 6 +++---
 .../org/parabot/core/parsers/{ => hooks}/HookParser.java    | 2 +-
 .../parabot/core/parsers/{ => hooks}/JSONHookParser.java    | 2 +-
 .../org/parabot/core/parsers/{ => hooks}/XMLHookParser.java | 2 +-
 .../src/org/parabot/environment/servers/ServerProvider.java | 3 ++-
 6 files changed, 9 insertions(+), 8 deletions(-)
 rename parabotv2/src/org/parabot/core/parsers/{ => hooks}/HookParser.java (94%)
 rename parabotv2/src/org/parabot/core/parsers/{ => hooks}/JSONHookParser.java (96%)
 rename parabotv2/src/org/parabot/core/parsers/{ => hooks}/XMLHookParser.java (97%)

diff --git a/parabotv2/src/org/parabot/core/Context.java b/parabotv2/src/org/parabot/core/Context.java
index 653cf05..b7ff00b 100644
--- a/parabotv2/src/org/parabot/core/Context.java
+++ b/parabotv2/src/org/parabot/core/Context.java
@@ -3,7 +3,7 @@ package org.parabot.core;
 import org.parabot.core.asm.ASMClassLoader;
 import org.parabot.core.classpath.ClassPath;
 import org.parabot.core.paint.PaintDebugger;
-import org.parabot.core.parsers.HookParser;
+import org.parabot.core.parsers.hooks.HookParser;
 import org.parabot.core.ui.BotUI;
 import org.parabot.core.ui.components.GamePanel;
 import org.parabot.environment.api.interfaces.Paintable;
diff --git a/parabotv2/src/org/parabot/core/asm/hooks/HookFile.java b/parabotv2/src/org/parabot/core/asm/hooks/HookFile.java
index d438e19..dd48f59 100644
--- a/parabotv2/src/org/parabot/core/asm/hooks/HookFile.java
+++ b/parabotv2/src/org/parabot/core/asm/hooks/HookFile.java
@@ -5,9 +5,9 @@ import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.parabot.core.parsers.HookParser;
-import org.parabot.core.parsers.JSONHookParser;
-import org.parabot.core.parsers.XMLHookParser;
+import org.parabot.core.parsers.hooks.HookParser;
+import org.parabot.core.parsers.hooks.JSONHookParser;
+import org.parabot.core.parsers.hooks.XMLHookParser;
 import org.parabot.environment.api.utils.WebUtil;
 
 public class HookFile {
diff --git a/parabotv2/src/org/parabot/core/parsers/HookParser.java b/parabotv2/src/org/parabot/core/parsers/hooks/HookParser.java
similarity index 94%
rename from parabotv2/src/org/parabot/core/parsers/HookParser.java
rename to parabotv2/src/org/parabot/core/parsers/hooks/HookParser.java
index 99533cd..89ea470 100644
--- a/parabotv2/src/org/parabot/core/parsers/HookParser.java
+++ b/parabotv2/src/org/parabot/core/parsers/hooks/HookParser.java
@@ -1,4 +1,4 @@
-package org.parabot.core.parsers;
+package org.parabot.core.parsers.hooks;
 
 import org.parabot.core.asm.hooks.HookFile;
 import org.parabot.core.asm.interfaces.Injectable;
diff --git a/parabotv2/src/org/parabot/core/parsers/JSONHookParser.java b/parabotv2/src/org/parabot/core/parsers/hooks/JSONHookParser.java
similarity index 96%
rename from parabotv2/src/org/parabot/core/parsers/JSONHookParser.java
rename to parabotv2/src/org/parabot/core/parsers/hooks/JSONHookParser.java
index 7333a2e..6d39ca2 100644
--- a/parabotv2/src/org/parabot/core/parsers/JSONHookParser.java
+++ b/parabotv2/src/org/parabot/core/parsers/hooks/JSONHookParser.java
@@ -1,4 +1,4 @@
-package org.parabot.core.parsers;
+package org.parabot.core.parsers.hooks;
 
 import java.io.InputStreamReader;
 import java.util.HashMap;
diff --git a/parabotv2/src/org/parabot/core/parsers/XMLHookParser.java b/parabotv2/src/org/parabot/core/parsers/hooks/XMLHookParser.java
similarity index 97%
rename from parabotv2/src/org/parabot/core/parsers/XMLHookParser.java
rename to parabotv2/src/org/parabot/core/parsers/hooks/XMLHookParser.java
index aee2625..3393e2a 100644
--- a/parabotv2/src/org/parabot/core/parsers/XMLHookParser.java
+++ b/parabotv2/src/org/parabot/core/parsers/hooks/XMLHookParser.java
@@ -1,4 +1,4 @@
-package org.parabot.core.parsers;
+package org.parabot.core.parsers.hooks;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/parabotv2/src/org/parabot/environment/servers/ServerProvider.java b/parabotv2/src/org/parabot/environment/servers/ServerProvider.java
index 55a6a52..5d9e7a6 100644
--- a/parabotv2/src/org/parabot/environment/servers/ServerProvider.java
+++ b/parabotv2/src/org/parabot/environment/servers/ServerProvider.java
@@ -4,12 +4,13 @@ import org.objectweb.asm.Opcodes;
 import org.parabot.core.Context;
 import org.parabot.core.asm.hooks.HookFile;
 import org.parabot.core.asm.interfaces.Injectable;
-import org.parabot.core.parsers.HookParser;
+import org.parabot.core.parsers.hooks.HookParser;
 import org.parabot.environment.input.Keyboard;
 import org.parabot.environment.input.Mouse;
 import org.parabot.environment.scripts.Script;
 
 import javax.swing.*;
+
 import java.applet.Applet;
 import java.applet.AppletStub;
 import java.net.URL;