Author: mes
Date: 2010-02-02 13:40:25 -0800 (Tue, 02 Feb 2010)
New Revision: 19147
Added:
cytoscape/trunk/src/cytoscape/visual/properties/NodeShowNestedNetworkProp.java
Removed:
cytoscape/trunk/src/cytoscape/visual/properties/NodeNestedNetworkVisibleProp.java
Modified:
cytoscape/trunk/src/cytoscape/visual/VisualPropertyType.java
cytoscape/trunk/src/cytoscape/visual/ui/VizMapperMainPanel.java
cytoscape/trunk/src/cytoscape/visual/ui/editors/continuous/DiscreteTrackRenderer.java
Log:
changed visual property type name to NODE_SHOW_NESTED_NETWORK
Modified: cytoscape/trunk/src/cytoscape/visual/VisualPropertyType.java
===================================================================
--- cytoscape/trunk/src/cytoscape/visual/VisualPropertyType.java
2010-02-02 21:39:08 UTC (rev 19146)
+++ cytoscape/trunk/src/cytoscape/visual/VisualPropertyType.java
2010-02-02 21:40:25 UTC (rev 19147)
@@ -78,7 +78,7 @@
import cytoscape.visual.properties.NodeSizeProp;
import cytoscape.visual.properties.NodeToolTipProp;
import cytoscape.visual.properties.NodeWidthProp;
-import cytoscape.visual.properties.NodeNestedNetworkVisibleProp;
+import cytoscape.visual.properties.NodeShowNestedNetworkProp;
import cytoscape.visual.parsers.*;
import cytoscape.visual.ui.EditorDisplayer;
import cytoscape.visual.ui.EditorDisplayer.EditorType;
@@ -233,10 +233,10 @@
"defaultEdgeLabelWidth", Number.class, new
EdgeLabelWidthProp(),
new FloatParser(), false, true),
- NODE_NESTED_NETWORK_VISIBLE("Node Nested Network Visible",
"nodeNestedNetworkVisible",
- "node.nestedNetworkVisible",
"defaultNodeNestedNetworkVisible",
- Boolean.class, new
NodeNestedNetworkVisibleProp(),
- new BooleanParser(), true, true),
+ NODE_SHOW_NESTED_NETWORK("Node Show Nested Network",
"nodeShowNestedNetwork",
+ "node.showNestedNetwork",
"defaultNodeShowNestedNetwork",
+ Boolean.class, new NodeShowNestedNetworkProp(),
+ new BooleanParser(), true, true),
;
/*
Deleted:
cytoscape/trunk/src/cytoscape/visual/properties/NodeNestedNetworkVisibleProp.java
===================================================================
---
cytoscape/trunk/src/cytoscape/visual/properties/NodeNestedNetworkVisibleProp.java
2010-02-02 21:39:08 UTC (rev 19146)
+++
cytoscape/trunk/src/cytoscape/visual/properties/NodeNestedNetworkVisibleProp.java
2010-02-02 21:40:25 UTC (rev 19147)
@@ -1,114 +0,0 @@
-/*
- Copyright (c) 2007, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-package cytoscape.visual.properties;
-
-import cytoscape.visual.VisualPropertyType;
-
-import cytoscape.visual.ui.icon.NodeIcon;
-
-import cytoscape.visual.VisualPropertyDependency;
-
-import giny.view.NodeView;
-
-import java.awt.Font;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Graphics;
-
-import java.util.Properties;
-
-import javax.swing.Icon;
-
-
-/**
- *
- */
-public class NodeNestedNetworkVisibleProp extends AbstractVisualProperty {
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public VisualPropertyType getType() {
- return VisualPropertyType.NODE_NESTED_NETWORK_VISIBLE;
- }
-
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public Icon getIcon(final Object value) {
- final NodeIcon icon = new NodeIcon() {
- public void paintIcon(Component c, Graphics g, int x, int y) {
- super.setColor(new Color(10, 10, 10, 25));
- super.paintIcon(c, g, x, y);
- g2d.setFont(new Font("SansSerif", Font.BOLD, 24));
- g2d.setColor(Color.DARK_GRAY);
- g2d.drawString(value.toString(), c.getX() + 7,
- (int) ((c.getHeight() / 2) + 7));
- g2d.setFont(new Font("SansSerif", Font.BOLD, 12));
- }
- };
-
- icon.setBottomPadding(-2);
-
- return icon;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param nv DOCUMENT ME!
- * @param o DOCUMENT ME!
- */
- public void applyToNodeView(NodeView nv, Object o,
VisualPropertyDependency dep) {
- if ((o == null) || (nv == null) || o instanceof Boolean ==
false)
- return;
-
- if (((Boolean) o) != nv.nestedNetworkIsVisible())
- nv.showNestedNetwork((Boolean) o);
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public Object getDefaultAppearanceObject() {
- return Boolean.TRUE;
- }
-}
Copied:
cytoscape/trunk/src/cytoscape/visual/properties/NodeShowNestedNetworkProp.java
(from rev 19129,
cytoscape/trunk/src/cytoscape/visual/properties/NodeNestedNetworkVisibleProp.java)
===================================================================
---
cytoscape/trunk/src/cytoscape/visual/properties/NodeShowNestedNetworkProp.java
(rev 0)
+++
cytoscape/trunk/src/cytoscape/visual/properties/NodeShowNestedNetworkProp.java
2010-02-02 21:40:25 UTC (rev 19147)
@@ -0,0 +1,114 @@
+/*
+ Copyright (c) 2007, The Cytoscape Consortium (www.cytoscape.org)
+
+ The Cytoscape Consortium is:
+ - Institute for Systems Biology
+ - University of California San Diego
+ - Memorial Sloan-Kettering Cancer Center
+ - Institut Pasteur
+ - Agilent Technologies
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
+ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
+ documentation provided hereunder is on an "as is" basis, and the
+ Institute for Systems Biology and the Whitehead Institute
+ have no obligations to provide maintenance, support,
+ updates, enhancements or modifications. In no event shall the
+ Institute for Systems Biology and the Whitehead Institute
+ be liable to any party for direct, indirect, special,
+ incidental or consequential damages, including lost profits, arising
+ out of the use of this software and its documentation, even if the
+ Institute for Systems Biology and the Whitehead Institute
+ have been advised of the possibility of such damage. See
+ the GNU Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+package cytoscape.visual.properties;
+
+import cytoscape.visual.VisualPropertyType;
+
+import cytoscape.visual.ui.icon.NodeIcon;
+
+import cytoscape.visual.VisualPropertyDependency;
+
+import giny.view.NodeView;
+
+import java.awt.Font;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+
+import java.util.Properties;
+
+import javax.swing.Icon;
+
+
+/**
+ *
+ */
+public class NodeShowNestedNetworkProp extends AbstractVisualProperty {
+ /**
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ public VisualPropertyType getType() {
+ return VisualPropertyType.NODE_SHOW_NESTED_NETWORK;
+ }
+
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ public Icon getIcon(final Object value) {
+ final NodeIcon icon = new NodeIcon() {
+ public void paintIcon(Component c, Graphics g, int x, int y) {
+ super.setColor(new Color(10, 10, 10, 25));
+ super.paintIcon(c, g, x, y);
+ g2d.setFont(new Font("SansSerif", Font.BOLD, 24));
+ g2d.setColor(Color.DARK_GRAY);
+ g2d.drawString(value.toString(), c.getX() + 7,
+ (int) ((c.getHeight() / 2) + 7));
+ g2d.setFont(new Font("SansSerif", Font.BOLD, 12));
+ }
+ };
+
+ icon.setBottomPadding(-2);
+
+ return icon;
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param nv DOCUMENT ME!
+ * @param o DOCUMENT ME!
+ */
+ public void applyToNodeView(NodeView nv, Object o,
VisualPropertyDependency dep) {
+ if ((o == null) || (nv == null) || o instanceof Boolean ==
false)
+ return;
+
+ if (((Boolean) o) != nv.nestedNetworkIsVisible())
+ nv.showNestedNetwork((Boolean) o);
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ public Object getDefaultAppearanceObject() {
+ return Boolean.TRUE;
+ }
+}
Modified: cytoscape/trunk/src/cytoscape/visual/ui/VizMapperMainPanel.java
===================================================================
--- cytoscape/trunk/src/cytoscape/visual/ui/VizMapperMainPanel.java
2010-02-02 21:39:08 UTC (rev 19146)
+++ cytoscape/trunk/src/cytoscape/visual/ui/VizMapperMainPanel.java
2010-02-02 21:40:25 UTC (rev 19147)
@@ -1619,7 +1619,7 @@
break;
- case NODE_NESTED_NETWORK_VISIBLE:
+ case NODE_SHOW_NESTED_NETWORK:
setDiscreteProps(type,
discMapping, attrSet, booleanCellEditor,
defCellRenderer,
calculatorTypeProp);
break;
Modified:
cytoscape/trunk/src/cytoscape/visual/ui/editors/continuous/DiscreteTrackRenderer.java
===================================================================
---
cytoscape/trunk/src/cytoscape/visual/ui/editors/continuous/DiscreteTrackRenderer.java
2010-02-02 21:39:08 UTC (rev 19146)
+++
cytoscape/trunk/src/cytoscape/visual/ui/editors/continuous/DiscreteTrackRenderer.java
2010-02-02 21:40:25 UTC (rev 19147)
@@ -646,7 +646,7 @@
case NODE_TOOLTIP:
case EDGE_LABEL:
case EDGE_TOOLTIP:
- case NODE_NESTED_NETWORK_VISIBLE:
+ case NODE_SHOW_NESTED_NETWORK:
if(key != null) {
g.drawString(key.toString(), 0,
g.getFont().getSize()*2);
}
--
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.
