Author: kono
Date: 2009-04-29 11:27:06 -0700 (Wed, 29 Apr 2009)
New Revision: 16704

Added:
   
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/AttributeRenderer.java
   
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/NetworkRenderer.java
   
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/twod/TwoDVisualLexicon.java
Removed:
   
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/Presentation.java
   
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/twod/TwoDVisualProperties.java
Modified:
   
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/Renderer.java
   
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/twod/AbstractTwoDVisualProperty.java
Log:
Presentation has been renamed to NetworkRenderer.  Fixed VisualProperty 
implementations to support VisualLexicon.

Added: 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/AttributeRenderer.java
===================================================================
--- 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/AttributeRenderer.java
   2009-04-29 18:25:08 UTC (rev 16703)
+++ 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/AttributeRenderer.java
   2009-04-29 18:27:06 UTC (rev 16704)
@@ -0,0 +1,5 @@
+package org.cytoscape.view.presentation;
+
+public interface AttributeRenderer extends Renderer {
+       // Currently not in use.
+}

Copied: 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/NetworkRenderer.java
 (from rev 16691, 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/Presentation.java)
===================================================================
--- 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/Presentation.java
        2009-04-24 23:35:54 UTC (rev 16691)
+++ 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/NetworkRenderer.java
     2009-04-29 18:27:06 UTC (rev 16704)
@@ -0,0 +1,97 @@
+/*
+ Copyright (c) 2006, 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 org.cytoscape.view.presentation;
+
+import java.awt.Image;
+import java.awt.print.Printable;
+import java.util.Properties;
+
+import javax.swing.Icon;
+
+import org.cytoscape.view.model.VisualProperty;
+
+/**
+ * Represents an presentation, i.e., actual 2D/3D visualization.
+ * 
+ * Rendering engines should implement this interface.
+ * 
+ * @author mes
+ * @author kono
+ * 
+ * @since Cytoscape 3.0
+ * 
+ */
+public interface NetworkRenderer extends Renderer {
+       /**
+        * 
+        * 
+        * @param props
+        *            DOCUMENT ME!
+        */
+       public void setProperties(Properties props);
+
+       /**
+        * DOCUMENT ME!
+        * 
+        * @return DOCUMENT ME!
+        */
+       public Properties getProperties();
+
+       /**
+        * For export image function.
+        * 
+        * @return DOCUMENT ME!
+        */
+       public Printable getPrintable();
+
+       /**
+        * Generate image from the current presentation.
+        * 
+        * @return Image object created from current window.
+        */
+       public Image getImage(int width, int height);
+       
+       /**
+        *  For a given Visual Property, render an Icon based on the default 
value
+        *  of the Visual Property.
+        *
+        * @param vp Visual Property.
+        *
+        * @return  DOCUMENT ME!
+        *
+        * @exception IllegalArgumentException if vp is not in the lexicon.
+        */
+       public Icon getDefaultIcon(VisualProperty<?> vp);
+}

Deleted: 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/Presentation.java
===================================================================
--- 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/Presentation.java
        2009-04-29 18:25:08 UTC (rev 16703)
+++ 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/Presentation.java
        2009-04-29 18:27:06 UTC (rev 16704)
@@ -1,84 +0,0 @@
-
-/*
- Copyright (c) 2006, 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 org.cytoscape.view.presentation;
-
-import java.awt.Image;
-import java.awt.print.Printable;
-
-import java.util.Properties;
-
-
-/**
- * Represents an presentation, i.e., actual 2D/3D visualization.
- * 
- * Rendering engines should implement this interface.
- * 
- * @author mes
- * @author kono
- * 
- * @since Cytoscape 3.0
- * 
-  */
-public interface Presentation {
-       /**
-        *  
-        *
-        * @param props DOCUMENT ME!
-        */
-       public void setProperties(Properties props);
-
-       /**
-        *  DOCUMENT ME!
-        *
-        * @return  DOCUMENT ME!
-        */
-       public Properties getProperties();
-
-       /**
-        *  For export image function.
-        *
-        * @return  DOCUMENT ME!
-        */
-       public Printable getPrintable();
-
-       /**
-        * Generate image from the current presentation. 
-        *
-        * @return  Image object created from current window.
-        */
-       public Image getImage();
-}

Modified: 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/Renderer.java
===================================================================
--- 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/Renderer.java
    2009-04-29 18:25:08 UTC (rev 16703)
+++ 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/Renderer.java
    2009-04-29 18:27:06 UTC (rev 16704)
@@ -1,10 +1,8 @@
 package org.cytoscape.view.presentation;
 
-import java.util.Collection;
+import org.cytoscape.view.model.VisualLexicon;
 
-import org.cytoscape.view.model.VisualProperty;
 
-
 /**
  * A function to draw a given network object.
  * Will be used by pluggable-renderer
@@ -14,7 +12,6 @@
        /**
         * Return a list of visual attributes this renderer can use
         */
-       public Collection<VisualProperty<?>> getSupportedVisualProperties();
-       
+       public VisualLexicon getVisualLexicon();
        public String getName();
 }

Modified: 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/twod/AbstractTwoDVisualProperty.java
===================================================================
--- 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/twod/AbstractTwoDVisualProperty.java
     2009-04-29 18:25:08 UTC (rev 16703)
+++ 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/twod/AbstractTwoDVisualProperty.java
     2009-04-29 18:27:06 UTC (rev 16704)
@@ -54,11 +54,12 @@
 
        public String getObjectType() { return  ot; }
 
-       public Class<T> getType() { return (Class<T>)(def.getClass()); }
+       @SuppressWarnings("unchecked")
+       public Class<T> getType() { return (Class<T>) def.getClass(); }
 
        public T getDefault() { return def; }
 
-       public String getSerializableName() { return id; }
+       public String getIdString() { return id; }
 
        public String getDisplayName() { return name; }
 

Copied: 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/twod/TwoDVisualLexicon.java
 (from rev 16691, 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/twod/TwoDVisualProperties.java)
===================================================================
--- 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/twod/TwoDVisualProperties.java
   2009-04-24 23:35:54 UTC (rev 16691)
+++ 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/twod/TwoDVisualLexicon.java
      2009-04-29 18:27:06 UTC (rev 16704)
@@ -0,0 +1,129 @@
+
+/*
+ Copyright (c) 2008, 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 org.cytoscape.view.presentation.twod;
+
+import static org.cytoscape.model.GraphObject.EDGE;
+import static org.cytoscape.model.GraphObject.NETWORK;
+import static org.cytoscape.model.GraphObject.NODE;
+
+import java.awt.Color;
+import java.awt.Paint;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.cytoscape.view.model.VisualLexicon;
+import org.cytoscape.view.model.VisualProperty;
+
+/**
+ * Should be implemented as a service.
+ * 'Renderer' is simply anything that provides VisualProperties.
+ * With a 'VisualProperties as annotations' this won't be needed.
+ */
+public abstract class TwoDVisualLexicon implements VisualLexicon {
+
+       protected final Set<VisualProperty<?>> visualPropertySet;
+
+       public static final VisualProperty<? extends Paint> NODE_COLOR
+               = new ColorTwoDVisualProperty(NODE,Color.RED,"NODE_COLOR","Node 
Color");
+       public static final VisualProperty<String> NODE_LABEL
+               = new StringTwoDVisualProperty(NODE,"","NODE_LABEL","Node 
Label");
+       public static final VisualProperty<? extends Paint> NODE_LABEL_COLOR
+               = new 
ColorTwoDVisualProperty(NODE,Color.BLACK,"NODE_LABEL_COLOR","Node Label Color");
+       public static final VisualProperty<Double> NODE_X_LOCATION
+               = new DoubleTwoDVisualProperty(NODE,0.0,"NODE_X_LOCATION","Node 
X Location");
+       public static final VisualProperty<Double> NODE_Y_LOCATION
+               = new DoubleTwoDVisualProperty(NODE,0.0,"NODE_Y_LOCATION","Node 
Y Location");
+       public static final VisualProperty<Boolean> NODE_VISIBLE
+               = new BooleanTwoDVisualProperty(NODE,true,"NODE_VISIBLE","Node 
Visible");
+       public static final VisualProperty<Boolean> NODE_SELECTED
+               = new 
BooleanTwoDVisualProperty(NODE,false,"NODE_SELECTED","Node Selected");
+       public static final VisualProperty<? extends Paint> EDGE_COLOR
+               = new 
ColorTwoDVisualProperty(EDGE,Color.BLUE,"EDGE_COLOR","Edge Color");
+       public static final VisualProperty<String> EDGE_LABEL
+               = new StringTwoDVisualProperty(EDGE,"","EDGE_LABEL","Edge 
Label");
+       public static final VisualProperty<? extends Paint> EDGE_LABEL_COLOR
+               = new 
ColorTwoDVisualProperty(EDGE,Color.BLACK,"EDGE_LABEL_COLOR","Edge Label Color");
+       public static final VisualProperty<Boolean> EDGE_VISIBLE
+               = new BooleanTwoDVisualProperty(EDGE,true,"EDGE_VISIBLE","Edge 
Visible");
+       public static final VisualProperty<Boolean> EDGE_SELECTED
+               = new 
BooleanTwoDVisualProperty(EDGE,false,"EDGE_SELECTED","Edge Selected");
+       public static final VisualProperty<Double> NETWORK_SCALE_FACTOR 
+               = new 
DoubleTwoDVisualProperty(NETWORK,1.0,"NETWORK_SCALE_FACTOR","Network Scale 
Factor");
+       public static final VisualProperty<Double> NETWORK_CENTER_X_LOCATION
+               = new 
DoubleTwoDVisualProperty(NETWORK,0.0,"NETWORK_CENTER_X_LOCATION","Network 
Center X Location");
+       public static final VisualProperty<Double> NETWORK_CENTER_Y_LOCATION 
+               = new 
DoubleTwoDVisualProperty(NETWORK,0.0,"NETWORK_CENTER_Y_LOCATION","Network 
Center Y Location");
+       public static final VisualProperty<Double> NETWORK_WIDTH 
+               = new 
DoubleTwoDVisualProperty(NETWORK,100.0,"NETWORK_WIDTH","Network Width");
+       public static final VisualProperty<Double> NETWORK_HEIGHT 
+               = new 
DoubleTwoDVisualProperty(NETWORK,100.0,"NETWORK_HEIGHT","Network Height");
+
+       public static final VisualProperty<? extends Paint> 
NETWORK_BACKGROUND_COLOR
+               = new 
ColorTwoDVisualProperty(NETWORK,Color.WHITE,"NETWORK_BACKGROUND_COLOR","Network 
Background Color");
+       public static final VisualProperty<String> NETWORK_TITLE 
+               = new 
StringTwoDVisualProperty(NETWORK,"","NETWORK_TITLE","Network Title");
+
+       public TwoDVisualLexicon() {
+
+               visualPropertySet = new HashSet<VisualProperty<?>>();
+
+               visualPropertySet.add(NODE_COLOR);
+               visualPropertySet.add(NODE_LABEL);
+               visualPropertySet.add(NODE_LABEL_COLOR);
+               visualPropertySet.add(NODE_X_LOCATION);
+               visualPropertySet.add(NODE_Y_LOCATION);
+               visualPropertySet.add(NODE_VISIBLE);
+               visualPropertySet.add(NODE_SELECTED);
+               visualPropertySet.add(EDGE_COLOR);
+               visualPropertySet.add(EDGE_LABEL);
+               visualPropertySet.add(EDGE_LABEL_COLOR);
+               visualPropertySet.add(EDGE_VISIBLE);
+               visualPropertySet.add(EDGE_SELECTED);
+               visualPropertySet.add(NETWORK_SCALE_FACTOR);
+               visualPropertySet.add(NETWORK_CENTER_X_LOCATION);
+               visualPropertySet.add(NETWORK_CENTER_Y_LOCATION);
+               visualPropertySet.add(NETWORK_WIDTH);
+               visualPropertySet.add(NETWORK_HEIGHT);
+               visualPropertySet.add(NETWORK_BACKGROUND_COLOR);
+               visualPropertySet.add(NETWORK_TITLE);
+       }
+
+       public Set<VisualProperty<?>> getAllVisualProperties() {
+               return Collections.unmodifiableSet( visualPropertySet );
+       }
+
+}

Deleted: 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/twod/TwoDVisualProperties.java
===================================================================
--- 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/twod/TwoDVisualProperties.java
   2009-04-29 18:25:08 UTC (rev 16703)
+++ 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/twod/TwoDVisualProperties.java
   2009-04-29 18:27:06 UTC (rev 16704)
@@ -1,128 +0,0 @@
-
-/*
- Copyright (c) 2008, 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 org.cytoscape.view.presentation.twod;
-
-import org.cytoscape.view.model.Renderer;
-import org.cytoscape.view.model.VisualProperty;
-
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Collections;
-
-import java.awt.Paint;
-import java.awt.Color;
-
-import static org.cytoscape.model.GraphObject.*;
-
-/**
- * Should be implemented as a service.
- * 'Renderer' is simply anything that provides VisualProperties.
- * With a 'VisualProperties as annotations' this won't be needed.
- */
-public abstract class TwoDVisualProperties implements Renderer {
-
-       protected Set<VisualProperty<?>> visualPropertySet;
-
-       public static final VisualProperty<? extends Paint> NODE_COLOR
-               = new ColorTwoDVisualProperty(NODE,Color.RED,"NODE_COLOR","Node 
Color");
-       public static final VisualProperty<String> NODE_LABEL
-               = new StringTwoDVisualProperty(NODE,"","NODE_LABEL","Node 
Label");
-       public static final VisualProperty<? extends Paint> NODE_LABEL_COLOR
-               = new 
ColorTwoDVisualProperty(NODE,Color.BLACK,"NODE_LABEL_COLOR","Node Label Color");
-       public static final VisualProperty<Double> NODE_X_LOCATION
-               = new DoubleTwoDVisualProperty(NODE,0.0,"NODE_X_LOCATION","Node 
X Location");
-       public static final VisualProperty<Double> NODE_Y_LOCATION
-               = new DoubleTwoDVisualProperty(NODE,0.0,"NODE_Y_LOCATION","Node 
Y Location");
-       public static final VisualProperty<Boolean> NODE_VISIBLE
-               = new BooleanTwoDVisualProperty(NODE,true,"NODE_VISIBLE","Node 
Visible");
-       public static final VisualProperty<Boolean> NODE_SELECTED
-               = new 
BooleanTwoDVisualProperty(NODE,false,"NODE_SELECTED","Node Selected");
-       public static final VisualProperty<? extends Paint> EDGE_COLOR
-               = new 
ColorTwoDVisualProperty(EDGE,Color.BLUE,"EDGE_COLOR","Edge Color");
-       public static final VisualProperty<String> EDGE_LABEL
-               = new StringTwoDVisualProperty(EDGE,"","EDGE_LABEL","Edge 
Label");
-       public static final VisualProperty<? extends Paint> EDGE_LABEL_COLOR
-               = new 
ColorTwoDVisualProperty(EDGE,Color.BLACK,"EDGE_LABEL_COLOR","Edge Label Color");
-       public static final VisualProperty<Boolean> EDGE_VISIBLE
-               = new BooleanTwoDVisualProperty(EDGE,true,"EDGE_VISIBLE","Edge 
Visible");
-       public static final VisualProperty<Boolean> EDGE_SELECTED
-               = new 
BooleanTwoDVisualProperty(EDGE,false,"EDGE_SELECTED","Edge Selected");
-       public static final VisualProperty<Double> NETWORK_SCALE_FACTOR 
-               = new 
DoubleTwoDVisualProperty(NETWORK,1.0,"NETWORK_SCALE_FACTOR","Network Scale 
Factor");
-       public static final VisualProperty<Double> NETWORK_CENTER_X_LOCATION
-               = new 
DoubleTwoDVisualProperty(NETWORK,0.0,"NETWORK_CENTER_X_LOCATION","Network 
Center X Location");
-       public static final VisualProperty<Double> NETWORK_CENTER_Y_LOCATION 
-               = new 
DoubleTwoDVisualProperty(NETWORK,0.0,"NETWORK_CENTER_Y_LOCATION","Network 
Center Y Location");
-       public static final VisualProperty<Double> NETWORK_WIDTH 
-               = new 
DoubleTwoDVisualProperty(NETWORK,100.0,"NETWORK_WIDTH","Network Width");
-       public static final VisualProperty<Double> NETWORK_HEIGHT 
-               = new 
DoubleTwoDVisualProperty(NETWORK,100.0,"NETWORK_HEIGHT","Network Height");
-
-       public static final VisualProperty<? extends Paint> 
NETWORK_BACKGROUND_COLOR
-               = new 
ColorTwoDVisualProperty(NETWORK,Color.WHITE,"NETWORK_BACKGROUND_COLOR","Network 
Background Color");
-       public static final VisualProperty<String> NETWORK_TITLE 
-               = new 
StringTwoDVisualProperty(NETWORK,"","NETWORK_TITLE","Network Title");
-
-       public TwoDVisualProperties() {
-
-               visualPropertySet = new HashSet<VisualProperty<?>>();
-
-               visualPropertySet.add(NODE_COLOR);
-               visualPropertySet.add(NODE_LABEL);
-               visualPropertySet.add(NODE_LABEL_COLOR);
-               visualPropertySet.add(NODE_X_LOCATION);
-               visualPropertySet.add(NODE_Y_LOCATION);
-               visualPropertySet.add(NODE_VISIBLE);
-               visualPropertySet.add(NODE_SELECTED);
-               visualPropertySet.add(EDGE_COLOR);
-               visualPropertySet.add(EDGE_LABEL);
-               visualPropertySet.add(EDGE_LABEL_COLOR);
-               visualPropertySet.add(EDGE_VISIBLE);
-               visualPropertySet.add(EDGE_SELECTED);
-               visualPropertySet.add(NETWORK_SCALE_FACTOR);
-               visualPropertySet.add(NETWORK_CENTER_X_LOCATION);
-               visualPropertySet.add(NETWORK_CENTER_Y_LOCATION);
-               visualPropertySet.add(NETWORK_WIDTH);
-               visualPropertySet.add(NETWORK_HEIGHT);
-               visualPropertySet.add(NETWORK_BACKGROUND_COLOR);
-               visualPropertySet.add(NETWORK_TITLE);
-       }
-
-       public Set<VisualProperty<?>> getVisualProperties() {
-               return Collections.unmodifiableSet( visualPropertySet );
-       }
-
-}


--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---

Reply via email to