Author: Christian Lopes
Date: 2010-02-12 15:28:52 -0800 (Fri, 12 Feb 2010)
New Revision: 19332
Modified:
cytoscapeweb/trunk/cytoscapeweb/default.properties
cytoscapeweb/trunk/cytoscapeweb/src-test/org/cytoscapeweb/AllTests.as
cytoscapeweb/trunk/cytoscapeweb/src-test/org/cytoscapeweb/fixtures/Fixtures.as
cytoscapeweb/trunk/cytoscapeweb/src/org/cytoscapeweb/model/GraphProxy.as
Log:
Fixed Mantis #2167: Merged edges data object does not have source and target
attributes.
Modified: cytoscapeweb/trunk/cytoscapeweb/default.properties
===================================================================
--- cytoscapeweb/trunk/cytoscapeweb/default.properties 2010-02-12 23:11:38 UTC
(rev 19331)
+++ cytoscapeweb/trunk/cytoscapeweb/default.properties 2010-02-12 23:28:52 UTC
(rev 19332)
@@ -1,3 +1,3 @@
-build.version=0.3.1
+build.version=0.3.2
FLEX_HOME=/Applications/Adobe Flex Builder 3 Plug-in/sdks/3.2.0/
\ No newline at end of file
Modified:
cytoscapeweb/trunk/cytoscapeweb/src/org/cytoscapeweb/model/GraphProxy.as
===================================================================
--- cytoscapeweb/trunk/cytoscapeweb/src/org/cytoscapeweb/model/GraphProxy.as
2010-02-12 23:11:38 UTC (rev 19331)
+++ cytoscapeweb/trunk/cytoscapeweb/src/org/cytoscapeweb/model/GraphProxy.as
2010-02-12 23:28:52 UTC (rev 19332)
@@ -583,7 +583,10 @@
var edges:Array = np.edges;
// Create a fake merged edge:
- var me:EdgeSprite = graphData.addEdgeFor(np.node1, np.node2,
false);
+ var src:NodeSprite = np.node1;
+ var tgt:NodeSprite = np.node2;
+ var dt:Object = { source: src.data.id, target: tgt.data.id };
+ var me:EdgeSprite = graphData.addEdgeFor(src, tgt, false, dt);
me.props.$merged = true;
me.props.$edges = edges;
me.props.$getDataList = function():Array {
Modified: cytoscapeweb/trunk/cytoscapeweb/src-test/org/cytoscapeweb/AllTests.as
===================================================================
--- cytoscapeweb/trunk/cytoscapeweb/src-test/org/cytoscapeweb/AllTests.as
2010-02-12 23:11:38 UTC (rev 19331)
+++ cytoscapeweb/trunk/cytoscapeweb/src-test/org/cytoscapeweb/AllTests.as
2010-02-12 23:28:52 UTC (rev 19332)
@@ -30,6 +30,8 @@
package org.cytoscapeweb {
import flexunit.framework.TestSuite;
+ import org.cytoscapeweb.model.ConfigProxy;
+ import org.cytoscapeweb.model.GraphProxy;
import org.cytoscapeweb.model.converters.XGMMLConverterTest;
import org.cytoscapeweb.model.data.ConfigVOTest;
import org.cytoscapeweb.model.data.ContinuousVizMapperVOTest;
@@ -46,6 +48,9 @@
public class AllTests extends TestSuite {
public function AllTests() {
+ setupEnvironment();
+
+
addTestSuite(UtilsTest);
addTestSuite(GraphUtilsTest);
addTestSuite(VisualPropertiesTest);
@@ -64,5 +69,14 @@
addTestSuite(XGMMLConverterTest);
}
+
+ private function setupEnvironment():void {
+ // Pure MVC setup:
+ var facade:ApplicationFacade =
ApplicationFacade.getInstance();
+
+ // Register required model classes:
+ facade.registerProxy(new ConfigProxy());
+ facade.registerProxy(new GraphProxy());
+ }
}
}
\ No newline at end of file
Modified:
cytoscapeweb/trunk/cytoscapeweb/src-test/org/cytoscapeweb/fixtures/Fixtures.as
===================================================================
---
cytoscapeweb/trunk/cytoscapeweb/src-test/org/cytoscapeweb/fixtures/Fixtures.as
2010-02-12 23:11:38 UTC (rev 19331)
+++
cytoscapeweb/trunk/cytoscapeweb/src-test/org/cytoscapeweb/fixtures/Fixtures.as
2010-02-12 23:28:52 UTC (rev 19332)
@@ -33,6 +33,8 @@
import flash.utils.ByteArray;
+ import org.cytoscapeweb.ApplicationFacade;
+ import org.cytoscapeweb.model.GraphProxy;
import org.cytoscapeweb.model.converters.GraphMLConverter;
public class Fixtures {
@@ -73,6 +75,11 @@
public static function getData(fixtureClass:Class):Data {
var ds:DataSet = getDataSet(fixtureClass);
var data:Data = Data.fromDataSet(ds);
+
+ var graphProxy:GraphProxy =
ApplicationFacade.getInstance().retrieveProxy(GraphProxy.NAME) as GraphProxy;
+ graphProxy.dataSet = ds;
+ graphProxy.graphData = data;
+ data = graphProxy.graphData;
return data;
}
--
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.
