Author: paperwing
Date: 2012-02-03 12:37:13 -0800 (Fri, 03 Feb 2012)
New Revision: 28191
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/CyActivator.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/view/VisualPropertyKeeper.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/view/WindNetworkView.java
Log:
Updated method for updating current the current node, edge, and network
properties to match the new visual style
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/CyActivator.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/CyActivator.java
2012-02-03 20:16:32 UTC (rev 28190)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/CyActivator.java
2012-02-03 20:37:13 UTC (rev 28191)
@@ -41,10 +41,6 @@
WindNetworkViewFactory windNetworkViewFactory =
new WindNetworkViewFactory(cyServiceRegistrarRef,
windVisualLexicon, visualMappingManagerServiceRef);
- if (visualMappingManagerServiceRef == null) {
- System.out.println("failed to find vmm");
- }
-
Properties windNetworkViewFactoryProps = new Properties();
windNetworkViewFactoryProps.setProperty("serviceType",
"factory");
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/view/VisualPropertyKeeper.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/view/VisualPropertyKeeper.java
2012-02-03 20:16:32 UTC (rev 28190)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/view/VisualPropertyKeeper.java
2012-02-03 20:37:13 UTC (rev 28191)
@@ -16,8 +16,13 @@
}
public <T> T getVisualProperty(VisualProperty<T> visualProperty) {
+ VisualPropertyValueHolder<?> valueHolder =
valueHolders.get(visualProperty.getIdString());
- return (T)
valueHolders.get(visualProperty.getIdString()).getValue();
+ if (valueHolder != null) {
+ return (T) valueHolder.getValue();
+ } else {
+ return null;
+ }
}
public <T, V extends T> void setVisualProperty(VisualProperty<? extends
T> visualProperty, V value) {
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/view/WindNetworkView.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/view/WindNetworkView.java
2012-02-03 20:16:32 UTC (rev 28190)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/cytoscape/view/WindNetworkView.java
2012-02-03 20:37:13 UTC (rev 28191)
@@ -283,27 +283,16 @@
// Update visual properties according to the current visual
style
VisualStyle visualStyle =
visualMappingManager.getVisualStyle(this);
- for (View<CyNode> nodeView : getNodeViews()) {
+ for (View<? extends CyTableEntry> view : getAllViews()) {
for (VisualProperty<?> visualProperty :
visualLexicon.getAllVisualProperties()) {
- if (visualProperty.getTargetDataType() ==
CyNode.class
+ if (view.getVisualProperty(visualProperty) !=
null
&&
visualStyle.getDefaultValue(visualProperty) != null
&&
visualStyle.getVisualMappingFunction(visualProperty) == null
&&
!exemptProperties.contains(visualProperty)) {
-
nodeView.setVisualProperty(visualProperty, (Object)
visualStyle.getDefaultValue(visualProperty));
+ view.setVisualProperty(visualProperty,
(Object) visualStyle.getDefaultValue(visualProperty));
}
}
}
-
- for (View<CyEdge> edgeView : getEdgeViews()) {
- for (VisualProperty<?> visualProperty :
visualLexicon.getAllVisualProperties()) {
- if (visualProperty.getTargetDataType() ==
CyEdge.class
- &&
visualStyle.getDefaultValue(visualProperty) != null
- &&
visualStyle.getVisualMappingFunction(visualProperty) == null
- &&
!exemptProperties.contains(visualProperty)) {
-
edgeView.setVisualProperty(visualProperty, (Object)
visualStyle.getDefaultValue(visualProperty));
- }
- }
- }
}
@Override
--
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.
