Author: paperwing
Date: 2012-03-19 10:21:00 -0700 (Mon, 19 Mar 2012)
New Revision: 28573
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngine.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngineFactory.java
Log:
fixes #666 Animator is now only active for the current network window
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngine.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngine.java
2012-03-19 12:08:55 UTC (rev 28572)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngine.java
2012-03-19 17:21:00 UTC (rev 28573)
@@ -183,8 +183,8 @@
protected abstract void setUpAnimatorStarting(Container container,
FPSAnimator animator);
- //public void setUpListeners(CyServiceRegistrar serviceRegistrar) {
- public void setUpNetworkViewDestroyedListener(CyServiceRegistrar
serviceRegistrar) {
+ public void setUpListeners(CyServiceRegistrar serviceRegistrar) {
+ //public void setUpNetworkViewDestroyedListener(CyServiceRegistrar
serviceRegistrar) {
this.serviceRegistrar = serviceRegistrar;
// NetworkViewDestroyedEvent listener
@@ -197,7 +197,6 @@
new Properties());
}
- /*
if (setCurrentRenderingEngineListener == null) {
final RenderingEngine<CyNetwork> renderingEngine =
this;
@@ -212,8 +211,11 @@
}
}
};
+
+
serviceRegistrar.registerService(setCurrentRenderingEngineListener,
+ SetCurrentRenderingEngineListener.class,
+ new Properties());
}
- */
}
@@ -240,6 +242,7 @@
animator.stop();
serviceRegistrar.unregisterService(networkViewDestroyedListener,
NetworkViewAboutToBeDestroyedListener.class);
+
serviceRegistrar.unregisterService(setCurrentRenderingEngineListener,
SetCurrentRenderingEngineListener.class);
}
}
};
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngineFactory.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngineFactory.java
2012-03-19 12:08:55 UTC (rev 28572)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngineFactory.java
2012-03-19 17:21:00 UTC (rev 28573)
@@ -72,7 +72,7 @@
// engine.setUpNetworkView(networkViewManager);
engine.setUpCanvas(container);
- engine.setUpNetworkViewDestroyedListener(serviceRegistrar);
+ engine.setUpListeners(serviceRegistrar);
engine.setupTaskFactories(taskFactoryListener, taskManager,
submenuTaskManager);
//
serviceRegistrar.registerService(engine.getSetCurrentRenderingEngineListener(),
SetCurrentRenderingEngineListener.class, new Properties());
--
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.
