Author: kono
Date: 2011-09-23 16:04:13 -0700 (Fri, 23 Sep 2011)
New Revision: 26959
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/VizMapEventHandlerManagerImpl.java
Log:
Some OSGi listener method had been added to correctly register property change
listeners.
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
2011-09-23 22:01:29 UTC (rev 26958)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
2011-09-23 23:04:13 UTC (rev 26959)
@@ -228,6 +228,8 @@
registerServiceListener(bc,vpDependencyManager,"addDependency","removeDependency",VisualPropertyDependency.class);
registerServiceListener(bc,editorManager,"addRenderingEngineFactory","removeRenderingEngineFactory",RenderingEngineFactory.class);
registerServiceListener(bc,bypassManager,"addBypass","removeBypass",RenderingEngineFactory.class);
+
+
registerServiceListener(bc,vizMapEventHandlerManager,"registerPCL","unregisterPCL",
RenderingEngineFactory.class);
}
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
2011-09-23 22:01:29 UTC (rev 26958)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
2011-09-23 23:04:13 UTC (rev 26959)
@@ -52,7 +52,6 @@
import org.cytoscape.model.CyNetworkTableManager;
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyTableEntry;
-import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.ContinuousRange;
import org.cytoscape.view.model.DiscreteRange;
import org.cytoscape.view.model.Range;
@@ -167,6 +166,7 @@
public void addVisualPropertyEditor(VisualPropertyEditor<?> ve,
@SuppressWarnings("rawtypes") Map properties) {
logger.debug("### Got VP Editor " + ve.toString() + ", this is
for " + ve.getType());
this.editors.put(ve.getType(), ve);
+ logger.debug("Total editor count = " + editors.size());
}
@@ -312,7 +312,6 @@
}
public void addRenderingEngineFactory(RenderingEngineFactory<?>
factory, Map props) {
-
final VisualLexicon lexicon = factory.getVisualLexicon();
buildDiscreteEditors(lexicon);
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/VizMapEventHandlerManagerImpl.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/VizMapEventHandlerManagerImpl.java
2011-09-23 22:01:29 UTC (rev 26958)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/VizMapEventHandlerManagerImpl.java
2011-09-23 23:04:13 UTC (rev 26959)
@@ -8,6 +8,7 @@
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.model.CyNetworkTableManager;
+import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
import org.cytoscape.view.vizmap.gui.event.VizMapEventHandler;
@@ -69,26 +70,9 @@
private void createHandlers(PropertySheetPanel propertySheetPanel) {
AbstractVizMapEventHandler windowEventHandler = new
EditorWindowEventHandler();
- //FIXME
- eventHandlers.put(EditorManager.EDITOR_WINDOW_CLOSED,
- windowEventHandler);
- eventHandlers.put(EditorManager.EDITOR_WINDOW_OPENED,
- windowEventHandler);
-
-// eventHandlers.put(Cytoscape.CYTOSCAPE_INITIALIZED,
-// new InitializedEventHandler());
-
-// AbstractVizMapEventHandler loadHandler = new
DataLoadedEventHandler();
-// eventHandlers.put(Cytoscape.VIZMAP_LOADED, loadHandler);
-
- // TODO: create session event handler
- // eventHandlers.put(Cytoscape.SESSION_LOADED, loadHandler);
-
-// AbstractVizMapEventHandler attrHandler = new
AttributeUpdateEventHandler(
-// vizMapPropertySheetBuilder);
-// eventHandlers.put(Cytoscape.ATTRIBUTES_CHANGED, attrHandler);
-// eventHandlers.put(Cytoscape.NETWORK_LOADED, attrHandler);
-
+ // FIXME
+ eventHandlers.put(EditorManager.EDITOR_WINDOW_CLOSED,
windowEventHandler);
+ eventHandlers.put(EditorManager.EDITOR_WINDOW_OPENED,
windowEventHandler);
// Create handler for local property editor event.
eventHandlers.put(VALUE, new CellEditorEventHandler(manager,
@@ -103,10 +87,9 @@
// FIXME
for (PropertyEditor p : editorManager.getCellEditors()) {
p.addPropertyChangeListener(this);
-
- // if (p instanceof PropertyChangeListener)
- //
spcs.addPropertyChangeListener((PropertyChangeListener) p);
}
+
+ logger.debug("********** Editor registered: " +
editorManager.getCellEditors().size());
for (PropertyEditor p : editorManager.getAttributeSelectors()) {
p.addPropertyChangeListener(this);
@@ -117,20 +100,25 @@
mappingSelector.addPropertyChangeListener(this);
}
+
+
+ // Called through OSGi service listener mechanism.
+ public void registerPCL(RenderingEngineFactory<?> factory, Map props) {
+ registerCellEditorListeners();
+ }
+
+ public void unregisterPCL(RenderingEngineFactory<?> factory, Map props)
{
+ // TODO implement this
+ }
+
- /*
- * (non-Javadoc)
- *
- * @see
- *
org.cytoscape.application.swing.vizmap.gui.event.VizMapEventHandlerManager#getHandler(java
- * .lang.String)
- */
public VizMapEventHandler getHandler(String name) {
return eventHandlers.get(name);
}
@Override
public void propertyChange(PropertyChangeEvent e) {
+
logger.debug("###################### VizMap local property
change event called: "
+ e.getPropertyName());
--
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.
