Author: paperwing
Date: 2011-08-22 11:32:50 -0700 (Mon, 22 Aug 2011)
New Revision: 26622
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/Graphics.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindMapRenderingEngineFactory.java
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:
changed RenderingEngine to use NetworkAboutToBeDestroyed event
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/Graphics.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/Graphics.java
2011-08-22 18:15:06 UTC (rev 26621)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/Graphics.java
2011-08-22 18:32:50 UTC (rev 26622)
@@ -8,27 +8,17 @@
package org.cytoscape.paperwing.internal;
import java.awt.Color;
import java.awt.Component;
-import java.awt.Font;
-import java.awt.Graphics2D;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
-import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphVector;
-import java.awt.geom.Rectangle2D;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import java.util.Collection;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
import java.util.Set;
import java.util.TreeMap;
-import java.util.TreeSet;
-
import javax.media.opengl.GL;
import javax.media.opengl.GL2;
import javax.media.opengl.GLAutoDrawable;
@@ -39,13 +29,11 @@
import com.jogamp.opengl.util.Animator;
import com.jogamp.opengl.util.FPSAnimator;
-import com.jogamp.opengl.util.awt.TextRenderer;
import com.jogamp.opengl.util.gl2.GLUT;
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyEdge.Type;
-import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyNode;
import org.cytoscape.view.model.CyNetworkView;
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindMapRenderingEngineFactory.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindMapRenderingEngineFactory.java
2011-08-22 18:15:06 UTC (rev 26621)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindMapRenderingEngineFactory.java
2011-08-22 18:32:50 UTC (rev 26622)
@@ -3,6 +3,7 @@
import java.util.Properties;
import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.events.NetworkAboutToBeDestroyedListener;
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.model.View;
@@ -10,7 +11,6 @@
import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.cytoscape.view.presentation.RenderingEngineManager;
-import
org.cytoscape.view.presentation.events.RenderingEngineAboutToBeRemovedListener;
/** This class is capable of creating instances of the WindMapRenderingEngine
*
@@ -68,8 +68,8 @@
//System.out.println("map engine active?: " +
engine.isActive());
-
serviceRegistrar.registerService(engine.getEngineRemovedListener(),
- RenderingEngineAboutToBeRemovedListener.class,
+
serviceRegistrar.registerService(engine.getAboutToBeRemovedListener(),
+ NetworkAboutToBeDestroyedListener.class,
new Properties());
return engine;
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
2011-08-22 18:15:06 UTC (rev 26621)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngine.java
2011-08-22 18:32:50 UTC (rev 26622)
@@ -1,39 +1,29 @@
package org.cytoscape.paperwing.internal;
import java.awt.BorderLayout;
-import java.awt.Color;
import java.awt.Container;
import java.awt.Image;
-import java.awt.event.ContainerEvent;
-import java.awt.event.ContainerListener;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
-import java.awt.image.BufferedImage;
import java.awt.print.Printable;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyVetoException;
-import java.beans.VetoableChangeListener;
import java.util.Properties;
-import javax.media.opengl.GLAutoDrawable;
import javax.media.opengl.GLCapabilities;
import javax.media.opengl.GLProfile;
import javax.media.opengl.awt.GLJPanel;
import javax.swing.Icon;
-import javax.swing.ImageIcon;
import javax.swing.JComponent;
import javax.swing.JInternalFrame;
import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.events.NetworkAboutToBeDestroyedEvent;
+import org.cytoscape.model.events.NetworkAboutToBeDestroyedListener;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.model.View;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.presentation.RenderingEngine;
-import
org.cytoscape.view.presentation.events.RenderingEngineAboutToBeRemovedEvent;
-import
org.cytoscape.view.presentation.events.RenderingEngineAboutToBeRemovedListener;
-
import com.jogamp.opengl.util.FPSAnimator;
/** This class represents a WindRenderingEngine, responsible for
@@ -95,18 +85,18 @@
*
* @return A listener object handling certain cleanup
*/
- public RenderingEngineAboutToBeRemovedListener
getEngineRemovedListener() {
+ public NetworkAboutToBeDestroyedListener getAboutToBeRemovedListener() {
// System.out.println("getEngineRemovedListener call");
- return new RenderingEngineAboutToBeRemovedListener(){
+ return new NetworkAboutToBeDestroyedListener(){
@Override
- public void
handleEvent(RenderingEngineAboutToBeRemovedEvent evt) {
- System.out.println("Rendering engine about to
be removed event: " + evt.getRenderingEngine());
- System.out.println("Current engine: " +
selfPointer);
+ public void handleEvent(NetworkAboutToBeDestroyedEvent
evt) {
+ // System.out.println("Rendering engine about
to be removed event: " + evt.getRenderingEngine());
+ // System.out.println("Current engine: " +
selfPointer);
- if (evt.getRenderingEngine() == selfPointer) {
+ if (evt.getNetwork() == networkView.getModel())
{
System.out.println("Rendering engine
about to be removed, stopping animator");
animator.stop();
}
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
2011-08-22 18:15:06 UTC (rev 26621)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngineFactory.java
2011-08-22 18:32:50 UTC (rev 26622)
@@ -3,6 +3,7 @@
import java.util.Properties;
import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.events.NetworkAboutToBeDestroyedListener;
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.model.View;
@@ -10,7 +11,6 @@
import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.cytoscape.view.presentation.RenderingEngineManager;
-import
org.cytoscape.view.presentation.events.RenderingEngineAboutToBeRemovedListener;
/** The RenderingEngineFactory for the WindRenderingEngine
*
@@ -70,8 +70,9 @@
// System.out.println("registering service to " +
serviceRegistrar + ": " + engine.getEngineRemovedListener()
// + ", " +
RenderingEngineAboutToBeRemovedListener.class);
-
serviceRegistrar.registerService(engine.getEngineRemovedListener(),
- RenderingEngineAboutToBeRemovedListener.class,
new Properties());
+
serviceRegistrar.registerService(engine.getAboutToBeRemovedListener(),
+ NetworkAboutToBeDestroyedListener.class,
+ new Properties());
return engine;
}
--
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.
