Author: mkirby
Date: 2012-07-21 15:38:08 -0700 (Sat, 21 Jul 2012)
New Revision: 29954
Added:
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/JSONCommand.java
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/JSONEdgeTable.java
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/JSONNetwork.java
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/JSONNetworkTable.java
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/JSONNodeTable.java
Modified:
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/Helper.java
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/MyJSON.java
Log:
mkirby: JSON is now at the level XMLRPC was.
Modified:
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/Helper.java
===================================================================
---
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/Helper.java
2012-07-21 18:08:07 UTC (rev 29953)
+++
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/Helper.java
2012-07-21 22:38:08 UTC (rev 29954)
@@ -3,11 +3,10 @@
public class Helper {
-
- public String network_name;
- public Vector<Integer> node_cytobridge_ids;
- public Vector<Integer> edge_cytobridge_ids;
- public Vector<Integer> edge_source_cytobridge_ids;
- public Vector<Integer> edge_target_cytobridge_ids;
+ public String type;
+
+ public String getName() {
+ return type;
+ }
}
Added:
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/JSONCommand.java
===================================================================
---
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/JSONCommand.java
(rev 0)
+++
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/JSONCommand.java
2012-07-21 22:38:08 UTC (rev 29954)
@@ -0,0 +1,9 @@
+package org.cytoscape.cytobridge.json;
+
+import org.cytoscape.cytobridge.NetworkManager;
+
+public interface JSONCommand {
+
+ public void run(NetworkManager netMan);
+
+}
Added:
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/JSONEdgeTable.java
===================================================================
---
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/JSONEdgeTable.java
(rev 0)
+++
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/JSONEdgeTable.java
2012-07-21 22:38:08 UTC (rev 29954)
@@ -0,0 +1,20 @@
+package org.cytoscape.cytobridge.json;
+
+import java.util.Vector;
+
+import org.cytoscape.cytobridge.NetworkManager;
+
+public class JSONEdgeTable implements JSONCommand {
+
+ private String network_name;
+ private Vector<String> table_headings;
+ private Vector<Integer> edge_cytobridge_ids;
+ private Vector<String> table_data;
+
+
+
+ public void run(NetworkManager netMan) {
+ netMan.pushEdgeTable(network_name, table_headings,
edge_cytobridge_ids, table_data);
+ }
+
+}
\ No newline at end of file
Added:
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/JSONNetwork.java
===================================================================
---
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/JSONNetwork.java
(rev 0)
+++
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/JSONNetwork.java
2012-07-21 22:38:08 UTC (rev 29954)
@@ -0,0 +1,20 @@
+package org.cytoscape.cytobridge.json;
+
+import java.util.Vector;
+
+import org.cytoscape.cytobridge.NetworkManager;
+
+public class JSONNetwork implements JSONCommand {
+
+ public String network_name;
+ public Vector<Integer> node_cytobridge_ids;
+ public Vector<Integer> edge_cytobridge_ids;
+ public Vector<Integer> edge_source_cytobridge_ids;
+ public Vector<Integer> edge_target_cytobridge_ids;
+
+
+ public void run(NetworkManager netMan) {
+ netMan.pushNetwork(network_name, node_cytobridge_ids,
edge_cytobridge_ids, edge_source_cytobridge_ids, edge_target_cytobridge_ids);
+ }
+
+}
Added:
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/JSONNetworkTable.java
===================================================================
---
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/JSONNetworkTable.java
(rev 0)
+++
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/JSONNetworkTable.java
2012-07-21 22:38:08 UTC (rev 29954)
@@ -0,0 +1,19 @@
+package org.cytoscape.cytobridge.json;
+
+import java.util.Vector;
+
+import org.cytoscape.cytobridge.NetworkManager;
+
+public class JSONNetworkTable implements JSONCommand {
+
+ private String network_name;
+ private Vector<String> table_headings;
+ private Vector<String> table_data;
+
+
+
+ public void run(NetworkManager netMan) {
+ netMan.pushNetTable(network_name, table_headings, table_data);
+ }
+
+}
Added:
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/JSONNodeTable.java
===================================================================
---
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/JSONNodeTable.java
(rev 0)
+++
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/JSONNodeTable.java
2012-07-21 22:38:08 UTC (rev 29954)
@@ -0,0 +1,20 @@
+package org.cytoscape.cytobridge.json;
+
+import java.util.Vector;
+
+import org.cytoscape.cytobridge.NetworkManager;
+
+public class JSONNodeTable implements JSONCommand {
+
+ private String network_name;
+ private Vector<String> table_headings;
+ private Vector<Integer> node_cytobridge_ids;
+ private Vector<String> table_data;
+
+
+
+ public void run(NetworkManager netMan) {
+ netMan.pushNodeTable(network_name, table_headings,
node_cytobridge_ids, table_data);
+ }
+
+}
\ No newline at end of file
Modified:
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/MyJSON.java
===================================================================
---
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/MyJSON.java
2012-07-21 18:08:07 UTC (rev 29953)
+++
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/json/MyJSON.java
2012-07-21 22:38:08 UTC (rev 29954)
@@ -10,6 +10,8 @@
public class MyJSON implements Runnable{
+ private static final String PACKAGE =
"org.cytoscape.cytobridge.json.";
+
private NetworkManager myManager;
public MyJSON(NetworkManager myManager) {
@@ -18,7 +20,7 @@
public void run() {
try {
- /** True while this PostListener should listen. */
+ /** True while this should listen. */
boolean run = true;
// Try to connect to the port.
@@ -42,23 +44,22 @@
System.exit(1);
}
- System.out.println("waiting");
in = new BufferedReader(
new InputStreamReader(
clientSocket.getInputStream()));
- System.out.println("waiting2");
+
String line;
Gson gson = new Gson();
while ((line = in.readLine()) != null) {
- System.out.println("waiting3");
if (line.equals("die")) {
System.out.println("Got kill
signal!");
run = false;
break;
}
+ Helper helper = gson.fromJson(line,
Helper.class);
- Helper test =
gson.fromJson(line,Helper.class);
-
myManager.pushNetwork(test.network_name, test.node_cytobridge_ids,
test.edge_cytobridge_ids, test.edge_source_cytobridge_ids,
test.edge_target_cytobridge_ids);
+ JSONCommand jcom =
(JSONCommand)gson.fromJson(line,Class.forName(PACKAGE+helper.getName()));
+ jcom.run(myManager);
}
}
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
