Author: abeld
Date: 2009-03-15 05:08:32 -0700 (Sun, 15 Mar 2009)
New Revision: 16267
Modified:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualPropertyCatalog.java
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/VisualPropertyCatalogImpl.java
Log:
viewmodel: fix compile, and also expose add / remove VisualPropertiesOfRenderer
methods as part of the public API
Modified:
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-03-15 11:39:32 UTC (rev 16266)
+++
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualPropertyCatalog.java
2009-03-15 12:08:32 UTC (rev 16267)
@@ -42,13 +42,21 @@
*/
public interface VisualPropertyCatalog {
/**
- * DOCUMENT ME!
+ * register the VisualProperties of the given Renderer
*
* @param renderer DOCUMENT ME!
*/
void addVisualPropertiesOfRenderer(Renderer renderer);
/**
+ * 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!
+ */
+ void removeVisualPropertiesOfRenderer(Renderer renderer);
+
+ /**
* DOCUMENT ME!
*
* @param name DOCUMENT ME!
Modified:
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/VisualPropertyCatalogImpl.java
===================================================================
---
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/VisualPropertyCatalogImpl.java
2009-03-15 11:39:32 UTC (rev 16266)
+++
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/VisualPropertyCatalogImpl.java
2009-03-15 12:08:32 UTC (rev 16267)
@@ -195,12 +195,9 @@
return result;
}
- // The following two methods are listeners.
- // Handles dynamics of OSGi services.
-
- @SuppressWarnings("unchecked")
- public void addRenderer(Renderer renderer, Map props) {
- System.out.println("====> Renderer bound: " +
renderer.toString());
+ /** {...@inheritdoc}
+ */
+ public void addVisualPropertiesOfRenderer(Renderer renderer){
for (VisualProperty<?>vp: renderer.getVisualProperties()){
if (this.visualPropertySet.containsKey(vp)){
List<Renderer> renderers =
this.visualPropertySet.get(vp);
@@ -213,8 +210,9 @@
}
}
- @SuppressWarnings("unchecked")
- public void removeRenderer(Renderer renderer, Map props) {
+ /** {...@inheritdoc}
+ */
+ public void removeVisualPropertiesOfRenderer(Renderer renderer){
for (VisualProperty<?>vp: renderer.getVisualProperties()){
List<Renderer> renderers =
this.visualPropertySet.get(vp);
if (renderers.size() == 1){
@@ -226,4 +224,18 @@
}
}
}
+
+ // The following two methods are listeners.
+ // Handles dynamics of OSGi services.
+
+ @SuppressWarnings("unchecked")
+ public void addRenderer(Renderer renderer, Map props) {
+ System.out.println("====> Renderer bound: " +
renderer.toString());
+ addVisualPropertiesOfRenderer(renderer);
+ }
+
+ @SuppressWarnings("unchecked")
+ public void removeRenderer(Renderer renderer, Map props) {
+ removeVisualPropertiesOfRenderer(renderer);
+ }
}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
