refactor: create SignlinkNode.Type

Author: Jameskmonger

src/main/java/org/runejs/client/util/Signlink.java

@@ -116,15 +116,15 @@ public void killSignlinkThread() {
     }
 
     public SignlinkNode method386(Class[] argumentTypes, String functionName, Class functionType) {
-        return putNode(0, 9, new Object[]{functionType, functionName, argumentTypes});
+        return putNode(0, SignlinkNode.Type.METHOD, new Object[]{functionType, functionName, argumentTypes});
 
     }
 
     public SignlinkNode addType4Node(URL url) {
-        return putNode(0, 4, url);
+        return putNode(0, SignlinkNode.Type.DATA_INPUT_STREAM, url);
     }
 
-    public SignlinkNode putNode(int integerData, int type, Object objectData) {
+    public SignlinkNode putNode(int integerData, SignlinkNode.Type type, Object objectData) {
         SignlinkNode signlinkNode = new SignlinkNode();
         signlinkNode.objectData = objectData;
         signlinkNode.integerData = integerData;
@@ -183,23 +183,23 @@ public void run() {
                 }
             }
             try {
-                int type = currentNode.type;
-                if (type == 1) {
+                SignlinkNode.Type type = currentNode.type;
+                if (type == SignlinkNode.Type.SOCKET) {
                     // Create connection
                     currentNode.value = new Socket(netAddress, currentNode.integerData);
-                } else if(type == 2) {
+                } else if(type == SignlinkNode.Type.THREAD) {
                     // Start thread
                     Thread thread = new Thread((Runnable) currentNode.objectData);
                     thread.setDaemon(true);
                     thread.start();
                     thread.setPriority(currentNode.integerData);
                     currentNode.value = thread;
-                } else if(type == 4)
+                } else if(type == SignlinkNode.Type.DATA_INPUT_STREAM)
                     currentNode.value = new DataInputStream(((URL) currentNode.objectData).openStream());
-                else if(type == 9) {
+                else if(type == SignlinkNode.Type.METHOD) {
                     Object[] objects = (Object[]) currentNode.objectData;
                     currentNode.value = ((Class) objects[0]).getDeclaredMethod((String) objects[1], (Class[]) objects[2]);
-                } else if(type == 10) {
+                } else if(type == SignlinkNode.Type.FIELD) {
                     Object[] objects = (Object[]) currentNode.objectData;
                     currentNode.value = ((Class) objects[0]).getDeclaredField((String) objects[1]);
                 } else {
@@ -215,20 +215,20 @@ else if(type == 9) {
     }
 
     public SignlinkNode createType10Node(Class variableType, String variableName) {
-        return putNode(0, 10, new Object[]{ variableType, variableName });
+        return putNode(0, SignlinkNode.Type.FIELD, new Object[]{ variableType, variableName });
     }
 
     // TODO this will just throw an exception, since type 3 isn't handled
     public SignlinkNode createExceptionNode(int arg1) {
-        return putNode(arg1, 3, null);
+        return putNode(arg1, SignlinkNode.Type.EXCEPTION, null);
     }
 
     public SignlinkNode createThreadNode(int nodeId, Runnable runnableClass) {
-        return putNode(nodeId, 2, runnableClass);
+        return putNode(nodeId, SignlinkNode.Type.THREAD, runnableClass);
     }
 
     public SignlinkNode createSocketNode(int port) {
-        return putNode(port, 1, null);
+        return putNode(port, SignlinkNode.Type.SOCKET, null);
     }
 
     public SignlinkNode method396(int arg0) {

src/main/java/org/runejs/client/util/SignlinkNode.java

@@ -17,6 +17,43 @@ public int getValue() {
         }
     }
 
+    public enum Type {
+        /**
+         * Create connection, save the socket to value
+         */
+        SOCKET(1),
+        /**
+         * Start the thread with objectData, save the thread to value
+         */
+        THREAD(2),
+        /**
+         * Throw an Exception
+         */
+        EXCEPTION(3),
+        /**
+         * Create a data input stream, save the stream to value
+         */
+        DATA_INPUT_STREAM(4),
+        /**
+         * Get a declared method from a class
+         */
+        METHOD(9),
+        /**
+         * Get a declared field from a class
+         */
+        FIELD(10);
+
+        private final int value;
+
+        Type(int value) {
+            this.value = value;
+        }
+
+        public int getValue() {
+            return value;
+        }
+    }
+
     public int integerData;
 
     /**
@@ -27,7 +64,7 @@ public int getValue() {
      * 10 = Call a class constructor dynamically from objectData, where objectData[0] is the class and objectData[1] is a string param
      * Other values will throw an Exception.
      */
-    public int type;
+    public Type type;
 
     public volatile Status status = Status.NOT_INITIALIZED;