Author: mes
Date: 2011-09-26 12:23:31 -0700 (Mon, 26 Sep 2011)
New Revision: 26970
Added:
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/builder/
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/builder/CyEdgeBuilder.java
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/builder/CyNetworkBuilder.java
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/builder/CyNodeBuilder.java
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/builder/CyRowBuilder.java
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/builder/CyTableBuilder.java
Modified:
core3/api/branches/builder/model-api/osgi.bnd
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/CyNetworkFactory.java
Log:
added builder pattern code
Modified: core3/api/branches/builder/model-api/osgi.bnd
===================================================================
--- core3/api/branches/builder/model-api/osgi.bnd 2011-09-26 18:58:00 UTC
(rev 26969)
+++ core3/api/branches/builder/model-api/osgi.bnd 2011-09-26 19:23:31 UTC
(rev 26970)
@@ -2,4 +2,4 @@
# Use this file to add customized Bnd instructions for the bundle
#-----------------------------------------------------------------
-Export-Package:
${bundle.namespace},${bundle.namespace}.events,${bundle.namespace}.subnetwork
+Export-Package:
${bundle.namespace},${bundle.namespace}.events,${bundle.namespace}.subnetwork,${bundle.namespace}.builder
Modified:
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/CyNetworkFactory.java
===================================================================
---
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/CyNetworkFactory.java
2011-09-26 18:58:00 UTC (rev 26969)
+++
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/CyNetworkFactory.java
2011-09-26 19:23:31 UTC (rev 26970)
@@ -27,6 +27,7 @@
*/
package org.cytoscape.model;
+import org.cytoscape.model.builder.CyNetworkBuilder;
/**
* A singleton factory object used for instantiating CyNetwork
@@ -40,6 +41,10 @@
*/
CyNetwork getInstance();
+ CyNetworkBuilder getBuilder();
+
+ CyNetwork getInstance(CyNetworkBuilder builder);
+
/**
* Returns a new, empty {@link CyNetwork} object where the associated
default tables are private.
* @return A new, empty {@link CyNetwork} object.
Added:
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/builder/CyEdgeBuilder.java
===================================================================
---
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/builder/CyEdgeBuilder.java
(rev 0)
+++
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/builder/CyEdgeBuilder.java
2011-09-26 19:23:31 UTC (rev 26970)
@@ -0,0 +1,16 @@
+
+package org.cytoscape.model.builder;
+
+public interface CyEdgeBuilder {
+
+ long getSUID();
+
+ CyRowBuilder getCyRowBuilder();
+
+ CyNodeBuilder getSource();
+
+ CyNodeBuilder getTarget();
+
+ boolean isDirected();
+}
+
Added:
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/builder/CyNetworkBuilder.java
===================================================================
---
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/builder/CyNetworkBuilder.java
(rev 0)
+++
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/builder/CyNetworkBuilder.java
2011-09-26 19:23:31 UTC (rev 26970)
@@ -0,0 +1,21 @@
+package org.cytoscape.model.builder;
+
+import java.util.List;
+import java.util.ArrayList;
+
+public interface CyNetworkBuilder {
+
+ CyNodeBuilder addNode();
+
+ CyEdgeBuilder addEdge(CyNodeBuilder source, CyNodeBuilder target,
boolean directed);
+
+ List<CyEdgeBuilder> getEdges();
+
+ List<CyNodeBuilder> getNodes();
+
+ CyTableBuilder getNodeTable();
+
+ CyTableBuilder getEdgeTable();
+
+ CyTableBuilder getNetworkTable();
+}
Added:
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/builder/CyNodeBuilder.java
===================================================================
---
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/builder/CyNodeBuilder.java
(rev 0)
+++
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/builder/CyNodeBuilder.java
2011-09-26 19:23:31 UTC (rev 26970)
@@ -0,0 +1,10 @@
+
+package org.cytoscape.model.builder;
+
+public interface CyNodeBuilder {
+
+ long getSUID();
+
+ CyRowBuilder getCyRowBuilder();
+}
+
Added:
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/builder/CyRowBuilder.java
===================================================================
---
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/builder/CyRowBuilder.java
(rev 0)
+++
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/builder/CyRowBuilder.java
2011-09-26 19:23:31 UTC (rev 26970)
@@ -0,0 +1,11 @@
+
+package org.cytoscape.model.builder;
+
+import java.util.Map;
+
+public interface CyRowBuilder {
+
+ void set(String columnName, Object value);
+
+}
+
Added:
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/builder/CyTableBuilder.java
===================================================================
---
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/builder/CyTableBuilder.java
(rev 0)
+++
core3/api/branches/builder/model-api/src/main/java/org/cytoscape/model/builder/CyTableBuilder.java
2011-09-26 19:23:31 UTC (rev 26970)
@@ -0,0 +1,27 @@
+package org.cytoscape.model.builder;
+
+
+import java.util.Map;
+import java.util.Collection;
+
+
+public interface CyTableBuilder {
+
+ void createColumn(String name, Class<?> type, boolean mutability);
+
+ void setPrimaryKeyColumnName( String name );
+
+ String getPrimaryKeyColumnName();
+
+ Collection<String> getColumnNames();
+
+ Class<?> getColumnType(String columnName);
+
+ boolean getColumnMutability(String columnName);
+
+ Collection<Object> getPrimaryKeys();
+
+ Map<Object,Object> getColumnData(String columnName);
+
+ void setColumnValue(String columnName, Object primaryKey, Object value);
+}
--
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.
