Author: jm
Date: 2011-04-04 12:31:10 -0700 (Mon, 04 Apr 2011)
New Revision: 24653
Modified:
core3/cpath2-impl/trunk/pom.xml
core3/cpath2-impl/trunk/src/main/java/org/cytoscape/cpath2/internal/cytoscape/MergeNetworkEdit.java
Log:
Updated dependency versions
Modified: core3/cpath2-impl/trunk/pom.xml
===================================================================
--- core3/cpath2-impl/trunk/pom.xml 2011-04-04 19:30:35 UTC (rev 24652)
+++ core3/cpath2-impl/trunk/pom.xml 2011-04-04 19:31:10 UTC (rev 24653)
@@ -35,11 +35,6 @@
<artifactId>webservice-api</artifactId>
<version>3.0.0-alpha2-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>cytoscape-temp</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>viewmodel-api</artifactId>
@@ -54,7 +49,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>presentation-api</artifactId>
- <version>3.0.0-alpha2-SNAPSHOT</version>
+ <version>3.0.0-alpha3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
@@ -64,7 +59,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>swing-application-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
</dependency>
<dependency>
@@ -73,6 +68,12 @@
<version>1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>cytoscape-temp</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
+
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
Modified:
core3/cpath2-impl/trunk/src/main/java/org/cytoscape/cpath2/internal/cytoscape/MergeNetworkEdit.java
===================================================================
---
core3/cpath2-impl/trunk/src/main/java/org/cytoscape/cpath2/internal/cytoscape/MergeNetworkEdit.java
2011-04-04 19:30:35 UTC (rev 24652)
+++
core3/cpath2-impl/trunk/src/main/java/org/cytoscape/cpath2/internal/cytoscape/MergeNetworkEdit.java
2011-04-04 19:31:10 UTC (rev 24653)
@@ -46,7 +46,7 @@
import org.cytoscape.util.swing.CyAbstractEdit;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
-import org.cytoscape.view.presentation.property.TwoDVisualLexicon;
+import org.cytoscape.view.presentation.property.MinimalVisualLexicon;
/**
* An undoable edit used by MergeNetworkTask
@@ -95,8 +95,8 @@
if (view != null) {
for (CyNode cyNode : cyNodes) {
View<CyNode> nv = view.getNodeView(cyNode);
- double x =
nv.getVisualProperty(TwoDVisualLexicon.NODE_X_LOCATION).doubleValue();
- double y =
nv.getVisualProperty(TwoDVisualLexicon.NODE_Y_LOCATION).doubleValue();
+ double x =
nv.getVisualProperty(MinimalVisualLexicon.NODE_X_LOCATION).doubleValue();
+ double y =
nv.getVisualProperty(MinimalVisualLexicon.NODE_Y_LOCATION).doubleValue();
Point2D.Double point = new Point2D.Double(x, y);
this.cyNodes.put(cyNode, point);
}
@@ -141,8 +141,8 @@
Point2D.Double point = cyNodes.get(cyNode);
View<CyNode> nv = view.getNodeView(node);
- nv.setVisualProperty(TwoDVisualLexicon.NODE_X_LOCATION,
point.getX());
- nv.setVisualProperty(TwoDVisualLexicon.NODE_Y_LOCATION,
point.getY());
+ nv.setVisualProperty(MinimalVisualLexicon.NODE_X_LOCATION,
point.getX());
+ nv.setVisualProperty(MinimalVisualLexicon.NODE_Y_LOCATION,
point.getY());
}
// interate through edges and restore each one...
--
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.
