Author: Christian Lopes
Date: 2011-03-23 15:29:20 -0700 (Wed, 23 Mar 2011)
New Revision: 24564
Modified:
core3/ding-presentation-impl/trunk/pom.xml
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/FontTwoDVisualProperty.java
Log:
Updated presentation-api dependency to 3.0.0-alpha3-SNAPSHOT.
Modified: core3/ding-presentation-impl/trunk/pom.xml
===================================================================
--- core3/ding-presentation-impl/trunk/pom.xml 2011-03-23 22:26:39 UTC (rev
24563)
+++ core3/ding-presentation-impl/trunk/pom.xml 2011-03-23 22:29:20 UTC (rev
24564)
@@ -116,7 +116,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>presentation-api</artifactId>
- <version>3.0.0-alpha2</version>
+ <version>3.0.0-alpha3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2011-03-23 22:26:39 UTC (rev 24563)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2011-03-23 22:29:20 UTC (rev 24564)
@@ -2687,7 +2687,7 @@
m_networkCanvas.setBounds(x, y, width, height);
m_foregroundCanvas.setBounds(x, y, width, height);
}
-
+
public void setSize(Dimension d) {
m_networkCanvas.setSize(d);
}
@@ -2778,32 +2778,29 @@
*
*/
@Override
- public void networkVisualPropertySet(View<CyNetwork> target,
- VisualProperty<?> vp, Object o) {
+ public void networkVisualPropertySet(View<CyNetwork> target,
VisualProperty<?> vp, Object value) {
+ if (value == null) return;
- if (o == null)
- return;
-
if (vp == DVisualLexicon.NETWORK_NODE_SELECTION) {
- boolean b = ((Boolean) o).booleanValue();
+ boolean b = ((Boolean) value).booleanValue();
if (b)
enableNodeSelection();
else
disableNodeSelection();
} else if (vp == DVisualLexicon.NETWORK_EDGE_SELECTION) {
- boolean b = ((Boolean) o).booleanValue();
+ boolean b = ((Boolean) value).booleanValue();
if (b)
enableEdgeSelection();
else
disableEdgeSelection();
} else if (vp == TwoDVisualLexicon.NETWORK_BACKGROUND_PAINT) {
- setBackgroundPaint((Paint) o);
+ setBackgroundPaint((Paint) value);
} else if (vp == TwoDVisualLexicon.NETWORK_CENTER_X_LOCATION) {
- setCenter(((Double) o).doubleValue(),
m_networkCanvas.m_yCenter);
+ setCenter(((Double) value).doubleValue(),
m_networkCanvas.m_yCenter);
} else if (vp == TwoDVisualLexicon.NETWORK_CENTER_Y_LOCATION) {
- setCenter(m_networkCanvas.m_xCenter, ((Double)
o).doubleValue());
+ setCenter(m_networkCanvas.m_xCenter, ((Double)
value).doubleValue());
} else if (vp == TwoDVisualLexicon.NETWORK_SCALE_FACTOR) {
- setZoom(((Double) o).doubleValue());
+ setZoom(((Double) value).doubleValue());
}
}
@@ -2826,7 +2823,6 @@
// TODO Auto-generated method stub
}
-
/**
* Common API for all rendering engines.
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/FontTwoDVisualProperty.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/FontTwoDVisualProperty.java
2011-03-23 22:26:39 UTC (rev 24563)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/FontTwoDVisualProperty.java
2011-03-23 22:29:20 UTC (rev 24564)
@@ -38,7 +38,6 @@
import java.util.HashSet;
import java.util.Set;
-import org.cytoscape.ding.ArrowShape;
import org.cytoscape.view.model.AbstractVisualProperty;
import org.cytoscape.view.model.DiscreteRangeImpl;
import org.cytoscape.view.model.Range;
@@ -68,6 +67,7 @@
Font font = null;
if (text != null) {
+ // e.g. "Monospaced,plain,12"
String name =
text.replaceAll("(\\.[bB]old)?,[a-zA-Z]+,\\d+(\\.\\d+)?", "");
boolean bold = text.matches("(?i).*\\.bold,[a-zA-Z]+,.*");
--
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.
