Author: kono
Date: 2009-07-07 19:19:35 -0700 (Tue, 07 Jul 2009)
New Revision: 17272
Modified:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/MultiLayerNetworkBuilder.java
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/MultiLayerNetworkBuilderImpl.java
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/BuildMultilayerNetworkTask.java
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/DisplayMultilayerNetworkBuilderUITask.java
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/DisplayMultilayerNetworkBuilderUITaskFactory.java
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/ui/LayerBuilderDialog.java
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Added builder bean.
Modified:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/MultiLayerNetworkBuilder.java
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/MultiLayerNetworkBuilder.java
2009-07-08 01:58:21 UTC (rev 17271)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/MultiLayerNetworkBuilder.java
2009-07-08 02:19:35 UTC (rev 17272)
@@ -5,8 +5,10 @@
import org.cytoscape.model.CyNetwork;
public interface MultiLayerNetworkBuilder {
-
- public CyNetwork buildLayeredNetwork(List<CyNetwork> layers,
+
+ public void setSourceNetworks(List<CyNetwork> layers,
List<CyNetwork> connectors);
+ public CyNetwork buildLayeredNetwork();
+
}
Modified:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/MultiLayerNetworkBuilderImpl.java
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/MultiLayerNetworkBuilderImpl.java
2009-07-08 01:58:21 UTC (rev 17271)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/MultiLayerNetworkBuilderImpl.java
2009-07-08 02:19:35 UTC (rev 17272)
@@ -136,4 +136,15 @@
nodeMap = null;
}
+
+ public CyNetwork buildLayeredNetwork() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void setSourceNetworks(List<CyNetwork> layers,
+ List<CyNetwork> connectors) {
+ // TODO Auto-generated method stub
+
+ }
}
Modified:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/BuildMultilayerNetworkTask.java
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/BuildMultilayerNetworkTask.java
2009-07-08 01:58:21 UTC (rev 17271)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/BuildMultilayerNetworkTask.java
2009-07-08 02:19:35 UTC (rev 17272)
@@ -3,16 +3,20 @@
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskMonitor;
+import org.cytoscape.layer.MultiLayerNetworkBuilder;
import org.cytoscape.session.CyNetworkManager;
public class BuildMultilayerNetworkTask implements Task {
private CyNetworkManager manager;
private TaskMonitor taskMonitor;
+
+ private MultiLayerNetworkBuilder builder;
// private LayerFactory lFactory;
- public BuildMultilayerNetworkTask(CyNetworkManager manager) {
+ public BuildMultilayerNetworkTask(CyNetworkManager manager,
MultiLayerNetworkBuilder builder) {
this.manager = manager;
+ this.builder = builder;
}
public void cancel() {
@@ -24,6 +28,9 @@
taskMonitor.setProgress(-1.0);
taskMonitor.setStatusMessage("Creating Multi Layer Network...");
+ // Create actual network here!
+// builder.buildLayeredNetwork(layers, connectors);
+
// lFactory.addLayer()
}
Modified:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/DisplayMultilayerNetworkBuilderUITask.java
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/DisplayMultilayerNetworkBuilderUITask.java
2009-07-08 01:58:21 UTC (rev 17271)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/DisplayMultilayerNetworkBuilderUITask.java
2009-07-08 02:19:35 UTC (rev 17272)
@@ -2,6 +2,7 @@
import java.util.Set;
+import org.cytoscape.layer.MultiLayerNetworkBuilder;
import org.cytoscape.layer.internal.ui.LayerBuilderDialog;
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskMonitor;
@@ -15,13 +16,15 @@
// This should be injected.
private CyNetworkManager manager;
private CySwingApplication desktop;
+ private MultiLayerNetworkBuilder builder;
private TaskMonitor taskMonitor;
public DisplayMultilayerNetworkBuilderUITask(CySwingApplication desktop,
- CyNetworkManager manager) {
+ CyNetworkManager manager, MultiLayerNetworkBuilder
builder) {
this.manager = manager;
this.desktop = desktop;
+ this.builder = builder;
}
/**
@@ -40,7 +43,7 @@
System.out.println("Desktop = " + desktop);
LayerBuilderDialog dialog = new
LayerBuilderDialog(desktop.getJFrame(),
- true, manager, targetNetworks);
+ true, manager, targetNetworks, builder);
dialog.setTitle("Multilayer Network Builder");
dialog.setVisible(true);
}
Modified:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/DisplayMultilayerNetworkBuilderUITaskFactory.java
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/DisplayMultilayerNetworkBuilderUITaskFactory.java
2009-07-08 01:58:21 UTC (rev 17271)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/tasks/DisplayMultilayerNetworkBuilderUITaskFactory.java
2009-07-08 02:19:35 UTC (rev 17272)
@@ -3,6 +3,7 @@
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskFactory;
+import org.cytoscape.layer.MultiLayerNetworkBuilder;
import org.cytoscape.session.CyNetworkManager;
import cytoscape.view.CySwingApplication;
@@ -10,13 +11,15 @@
private CyNetworkManager netmgr;
private CySwingApplication desktop;
+ private MultiLayerNetworkBuilder builder;
- public DisplayMultilayerNetworkBuilderUITaskFactory(CySwingApplication
desktop, CyNetworkManager netmgr) {
+ public DisplayMultilayerNetworkBuilderUITaskFactory(CySwingApplication
desktop, CyNetworkManager netmgr, MultiLayerNetworkBuilder builder) {
this.netmgr = netmgr;
this.desktop = desktop;
+ this.builder = builder;
}
public Task getTask() {
- return new DisplayMultilayerNetworkBuilderUITask(desktop,
netmgr);
+ return new DisplayMultilayerNetworkBuilderUITask(desktop,
netmgr, builder);
}
}
Modified:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/ui/LayerBuilderDialog.java
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/ui/LayerBuilderDialog.java
2009-07-08 01:58:21 UTC (rev 17271)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/ui/LayerBuilderDialog.java
2009-07-08 02:19:35 UTC (rev 17272)
@@ -19,6 +19,7 @@
import javax.swing.DefaultListModel;
import javax.swing.JDialog;
+import org.cytoscape.layer.MultiLayerNetworkBuilder;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.session.CyNetworkManager;
@@ -48,7 +49,7 @@
*/
public LayerBuilderDialog(Frame parent, boolean modal,
- CyNetworkManager manager, Set<CyNetwork>
targetNetworks) {
+ CyNetworkManager manager, Set<CyNetwork>
targetNetworks, MultiLayerNetworkBuilder builder) {
super(parent, modal);
this.manager = manager;
title2IdMap = new HashMap<String, Long>();
Modified:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/resources/META-INF/spring/bundle-context.xml
2009-07-08 01:58:21 UTC (rev 17271)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/resources/META-INF/spring/bundle-context.xml
2009-07-08 02:19:35 UTC (rev 17272)
@@ -29,8 +29,15 @@
class="org.cytoscape.layer.internal.tasks.DisplayMultilayerNetworkBuilderUITaskFactory">
<constructor-arg ref="cyNetworkManagerServiceRef" />
<constructor-arg ref="cySwingApplicationServiceRef" />
+ <constructor-arg ref="multiLayerNetworkBuilder" />
</bean>
+ <bean id="multiLayerNetworkBuilder"
class="org.cytoscape.layer.internal.MultiLayerNetworkBuilderImpl">
+ <constructor-arg ref="cyNetworkManagerServiceRef" />
+ </bean>
+
+
+
<!-- this creates a LoadPropsInterceptor object -->
</beans>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
