Author: kono
Date: 2011-09-27 14:59:02 -0700 (Tue, 27 Sep 2011)
New Revision: 26997
Modified:
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
Log:
Made default style replaceable.
Modified:
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
===================================================================
---
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
2011-09-27 21:31:34 UTC (rev 26996)
+++
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
2011-09-27 21:59:02 UTC (rev 26997)
@@ -41,6 +41,7 @@
import java.util.Set;
import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.model.CyNode;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.presentation.property.MinimalVisualLexicon;
@@ -59,6 +60,7 @@
private static final Logger logger =
LoggerFactory.getLogger(VisualMappingManagerImpl.class);
+ // title for the default visual style.
public static final String DEFAULT_STYLE_NAME = "default";
// Default Style
@@ -73,7 +75,7 @@
private static final Double NODE_HEIGHT = 35d;
private static final Color EDGE_LABEL_COLOR = Color.BLACK;
- private final VisualStyle defaultStyle;
+ private VisualStyle defaultStyle;
private final Map<CyNetworkView, VisualStyle> network2VisualStyleMap;
private final Set<VisualStyle> visualStyles;
@@ -96,6 +98,7 @@
this.visualStyles.add(defaultStyle);
}
+
private VisualStyle buildGlobalDefaultStyle(final VisualStyleFactory
factory) {
final VisualStyle defStyle =
factory.getInstance(DEFAULT_STYLE_NAME);
@@ -132,12 +135,7 @@
}
/**
- * DOCUMENT ME!
- *
- * @param vs
- * DOCUMENT ME!
- * @param nv
- * DOCUMENT ME!
+ * {@inheritDoc}
*/
@Override
public void setVisualStyle(final VisualStyle vs, final CyNetworkView
nv) {
@@ -194,20 +192,22 @@
*/
@Override
public void addVisualStyle(final VisualStyle vs) {
- if(vs == null)
- throw new NullPointerException("Visual Style is null.");
+ if(vs == null) {
+ logger.warn("Tried to add null to VMM.");
+ return;
+ }
this.visualStyles.add(vs);
logger.info("New visual Style registered to VMM: " +
vs.getTitle());
logger.info("Total Number of VS in VMM = " +
visualStyles.size());
+ if(vs.getTitle() != null &&
vs.getTitle().equals(DEFAULT_STYLE_NAME))
+ defaultStyle = vs;
cyEventHelper.fireEvent(new VisualStyleAddedEvent(this, vs));
}
/**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
+ * {@inheritDoc}
*/
@Override
public Set<VisualStyle> getAllVisualStyles() {
--
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.
