Merge pull request #11 from relavis/master

fix shit

Author: Andrew

src/main/java/org/cyberpwn/react/network/Request.java

@@ -1,5 +1,6 @@
 package org.cyberpwn.react.network;
 
+import org.cyberpwn.react.L;
 import org.cyberpwn.react.util.GMap;
 import org.json.JSONObject;
 
@@ -24,10 +25,12 @@ public void run() {
             DataInputStream i = new DataInputStream(s.getInputStream());
             DataOutputStream o = new DataOutputStream(s.getOutputStream());
             PacketRequest pr = new PacketRequest(ns.getUsername(), ns.getPassword(), PacketRequestType.GET_SAMPLES.toString());
+            //L.n("OUT: " + pr.toString());
             o.writeUTF(pr.toString());
             o.flush();
             String response = i.readUTF();
             PacketResponse ps = new PacketResponse(new JSONObject(response));
+            //L.n("IN: " + ps.toString());
             GMap<String, Double> data = new GMap<>();
             String console = "";
 

src/main/java/org/cyberpwn/react/network/RequestBasic.java

@@ -1,5 +1,6 @@
 package org.cyberpwn.react.network;
 
+import org.cyberpwn.react.L;
 import org.cyberpwn.react.util.GMap;
 import org.json.JSONObject;
 
@@ -24,10 +25,12 @@ public void run() {
             DataInputStream i = new DataInputStream(s.getInputStream());
             DataOutputStream o = new DataOutputStream(s.getOutputStream());
             PacketRequest pr = new PacketRequest(ns.getUsername(), ns.getPassword(), PacketRequestType.GET_BASIC.toString());
+            L.n("OUT: " + pr.toString());
             o.writeUTF(pr.toString());
             o.flush();
             String response = i.readUTF();
             PacketResponse ps = new PacketResponse(new JSONObject(response));
+            L.n("IN: " + ps.toString());
             GMap<String, String> data = new GMap<>();
 
             if (ps.getString("type").equals("OK")) {

src/main/java/org/cyberpwn/react/ui/ServerTab.java

@@ -442,6 +442,8 @@ public void push(GList<String> actions) {
 
     public void push(GMap<String, Double> sample, String console) {
         sample.put("rct", sample.get("rct") / 1000000.0);
+        sample.put("mah/s", sample.get("mah/s") / 1024D / 1024D);
+        sample.put("mem", sample.get("mem") / 1024 / 1024);
         lastConsole = StringUtils.repeat("\n", 40) + console;
         lastLog = StringUtils.repeat("\n", 40) + L.log;