Author: kono
Date: 2009-04-29 11:22:36 -0700 (Wed, 29 Apr 2009)
New Revision: 16700
Added:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/RootVisualLexicon.java
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualLexicon.java
Removed:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/Renderer.java
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualPropertyCatalog.java
Modified:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualProperty.java
Log:
VisualPropertyCatalog is renamed to RootVisualLexicon. Renderer is removed and
VisualLexicon replaces it.
Deleted:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/Renderer.java
===================================================================
---
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/Renderer.java
2009-04-29 17:53:20 UTC (rev 16699)
+++
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/Renderer.java
2009-04-29 18:22:36 UTC (rev 16700)
@@ -1,52 +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.model;
-
-import java.util.Set;
-
-
-/**
- * Should be implemented as a service.
- * 'Renderer' is simply anything that provides VisualProperties.
- * With a 'VisualProperties as annotations' this won't be needed.
- */
-public interface Renderer {
- /**
- * Returns the Set of VisualPropertys supported by this Renderer.
- *
- * @return DOCUMENT ME!
- */
- Set<VisualProperty<?>> getVisualProperties();
-}
Added:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/RootVisualLexicon.java
===================================================================
---
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/RootVisualLexicon.java
2009-04-29 17:53:20 UTC (rev 16699)
+++
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/RootVisualLexicon.java
2009-04-29 18:22:36 UTC (rev 16700)
@@ -0,0 +1,83 @@
+package org.cytoscape.view.model;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Collection of Lexicons. This is the superset of VisualLexicons. All Visual
+ * Properties will be available from this root object.
+ *
+ */
+public interface RootVisualLexicon extends VisualLexicon {
+
+ /**
+ * OSGi service listener method. Of course, this can be called from any
POJO
+ * (without OSGi).
+ *
+ * @param lexicon
+ * @param props
+ */
+
+ @SuppressWarnings("unchecked")
+ // This for Spring DM.
+ public void addVisualLexicon(VisualLexicon lexicon, Map props);
+
+ @SuppressWarnings("unchecked")
+ public void removeVisualLexicon(VisualLexicon lexicon, Map props);
+
+ /**
+ * Returns the collection of all those VisualProperties that are in use
for
+ * the given GraphObjects. I.e. these are the VisualProperties, for
which
+ * setting a value will actually change the displayed graph.
+ *
+ * Note: returns the same as collectionOfVisualProperties() if arg is
null.
+ *
+ * Note: using VisualProperty.GraphObjectType.NETWORK for objectType is
not
+ * really useful. For network VPs, use
+ * collectionOfVisualProperties(VisualProperty.GraphObjectType
objectType)
+ * instead.
+ *
+ * @param views
+ * for which the filtering is to be done
+ * @param objectType
+ * for which to filter
+ * @return VisualProperties, filtered with the DependentVisualProperty
+ * callbacks
+ */
+ Set<VisualProperty<?>> getVisualProperties(
+ Collection<? extends View<?>> views, String objectType);
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param networkview
+ * DOCUMENT ME!
+ * @param objectType
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ Set<VisualProperty<?>> getVisualProperties(CyNetworkView networkview,
+ String objectType);
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param objectType
+ * GraphObject type. i.e., NODE/EDGE/NETWORK.
+ *
+ * @return DOCUMENT ME!
+ */
+ Collection<VisualProperty<?>> getVisualProperties(String objectType);
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param name
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ public VisualProperty<?> getVisualProperty(String idString);
+}
Copied:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualLexicon.java
(from rev 16526,
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/Renderer.java)
===================================================================
---
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/Renderer.java
2009-04-10 20:21:30 UTC (rev 16526)
+++
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualLexicon.java
2009-04-29 18:22:36 UTC (rev 16700)
@@ -0,0 +1,51 @@
+/*
+ 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.model;
+
+import java.util.Set;
+
+/**
+ * Should be implemented as a service. 'Renderer' is simply anything that
+ * provides VisualProperties. With a 'VisualProperties as annotations' this
+ * won't be needed.
+ */
+public interface VisualLexicon {
+ /**
+ * Returns the Set of VisualPropertys supported by this Renderer.
+ *
+ * @return DOCUMENT ME!
+ */
+ public Set<VisualProperty<?>> getAllVisualProperties();
+}
Modified:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualProperty.java
===================================================================
---
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualProperty.java
2009-04-29 17:53:20 UTC (rev 16699)
+++
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualProperty.java
2009-04-29 18:22:36 UTC (rev 16700)
@@ -74,7 +74,7 @@
*
* @return DOCUMENT ME!
*/
- String getSerializableName();
+ String getIdString();
/**
* A short string suitable for presentation to humans. Should not be
used
Deleted:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualPropertyCatalog.java
===================================================================
---
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualPropertyCatalog.java
2009-04-29 17:53:20 UTC (rev 16699)
+++
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualPropertyCatalog.java
2009-04-29 18:22:36 UTC (rev 16700)
@@ -1,118 +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.model;
-
-import java.util.Collection;
-import java.util.Map;
-
-
-/**
- *
- */
-public interface VisualPropertyCatalog {
- /**
- * register the VisualProperties of the given Renderer
- *
- * @param renderer DOCUMENT ME!
- */
- @SuppressWarnings("unchecked")
- void addRenderer(Renderer renderer, Map props);
-
- /**
- * unregister the VisualProperties of the given Renderer.
- * Note that these VisualProperties might still be available, if some
other Renderer defines them
- *
- * @param renderer DOCUMENT ME!
- */
- @SuppressWarnings("unchecked")
- void removeRenderer(Renderer renderer, Map props);
-
- /**
- * DOCUMENT ME!
- *
- * @param name DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- VisualProperty<?> getVisualProperty(String name);
-
- /**
- * Returns the collection of all defined VisualProperties. Note that
not all
- * of these will be actually in use. For showing in a UI, use of ... is
- * recommended ... FIXME
- *
- * @return the Collection of all defined VisualProperties
- */
- Collection<VisualProperty<?>> collectionOfVisualProperties();
-
- /**
- * DOCUMENT ME!
- *
- * @param objectType DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- Collection<VisualProperty<?>> collectionOfVisualProperties(String
objectType);
-
- /**
- * DOCUMENT ME!
- *
- * @param networkview DOCUMENT ME!
- * @param objectType DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- Collection<VisualProperty<?>>
collectionOfVisualProperties(CyNetworkView networkview,
- String
objectType);
-
- /**
- * Returns the collection of all those VisualProperties that are in use
for
- * the given GraphObjects. I.e. these are the VisualProperties, for
which
- * setting a value will actually change the displayed graph.
- *
- * Note: returns the same as collectionOfVisualProperties() if
- * arg is null.
- *
- * Note: using VisualProperty.GraphObjectType.NETWORK for objectType is
not
- * really useful. For network VPs, use
collectionOfVisualProperties(VisualProperty.GraphObjectType
- * objectType) instead.
- *
- * @param views for which the filtering is to be done
- * @param objectType for which to filter
- * @return VisualProperties, filtered with the DependentVisualProperty
callbacks
- */
- Collection<VisualProperty<?>> collectionOfVisualProperties(Collection<?
extends View<?>> views,
- String
objectType);
-}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
