Author: kozo
Date: 2009-08-11 17:20:11 -0700 (Tue, 11 Aug 2009)
New Revision: 17775
Modified:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/pom.xml
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/resources/META-INF/spring/bundle-context-osgi.xml
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/resources/META-INF/spring/bundle-context.xml
Log:
OSGi service setting and creation of !visualStyle [error in !buildVisualStyle
function](refs ticket:24)
Modified: csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/pom.xml
===================================================================
--- csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/pom.xml
2009-08-11 22:23:21 UTC (rev 17774)
+++ csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/pom.xml
2009-08-12 00:20:11 UTC (rev 17775)
@@ -44,6 +44,13 @@
<artifactId>session-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>vizmap-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
<!-- GUI -->
<dependency>
<groupId>org.cytoscape.wrappers</groupId>
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-08-11 22:23:21 UTC (rev 17774)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/MultiLayerNetworkBuilderImpl.java
2009-08-12 00:20:11 UTC (rev 17775)
@@ -13,6 +13,9 @@
import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.model.CyNode;
import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.view.vizmap.VisualStyle;
+import org.cytoscape.view.vizmap.mappings.DiscreteMapping;
/**
* Build actual network here
@@ -32,6 +35,10 @@
private CyNetworkManager manager;
private CyNetwork layeredNetwork;
private CyNetworkFactory factory;
+
+ private VisualMappingManager visualMappingManager;
+ private VisualStyle visualStyle;
+
private List<CyNetwork> layers;
private List<CyNetwork> connectors;
@@ -203,4 +210,17 @@
this.layers = layers;
this.connectors = connectors;
}
+
+ public void setVisualMappingManager(VisualMappingManager
visualMappingManager){
+ this.visualMappingManager = visualMappingManager;
+ }
+
+ public void setVisualStyle(){
+ this.visualStyle =
visualMappingManager.getVisualStyle(manager.getCurrentNetworkView());
+ }
+
+ public void buildVisualStyle(){
+ DiscreteMapping discreteMapping = new
DiscreteMapping(LAYER_INDEX, String.class, NODE_Z_VALUE);
+ }
+
}
Modified:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-08-11 22:23:21 UTC (rev 17774)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-08-12 00:20:11 UTC (rev 17775)
@@ -11,6 +11,9 @@
<osgi:reference id ="cyNetworkFactoryServiceRef"
interface="org.cytoscape.model.CyNetworkFactory" />
+
+ <osgi:reference id ="visualMappingManagerServiceRef"
+ interface="org.cytoscape.view.vizmap.VisualMappingManager" />
<osgi:reference id="cySwingApplicationServiceRef"
interface="cytoscape.view.CySwingApplication" />
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-08-11 22:23:21 UTC (rev 17774)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/resources/META-INF/spring/bundle-context.xml
2009-08-12 00:20:11 UTC (rev 17775)
@@ -35,6 +35,7 @@
<bean id="multiLayerNetworkBuilder"
class="org.cytoscape.layer.internal.MultiLayerNetworkBuilderImpl">
<constructor-arg ref="cyNetworkManagerServiceRef" />
<constructor-arg ref="cyNetworkFactoryServiceRef" />
+ <property name="visualMappingManager"
ref="visualMappingManagerServiceRef" />
</bean>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
