Author: paperwing
Date: 2012-02-28 14:49:32 -0800 (Tue, 28 Feb 2012)
New Revision: 28389
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/WindBirdsEyeRenderingEngineFactory.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngine.java
Log:
Removed deprecated GLProfile.initSingleton() call, fixed "ERROR: JarContent:
Unable to read bytes. java.lang.IllegalStateException: zip file closed" that
appeared error when Cytoscape shuts down
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
2012-02-28 22:18:48 UTC (rev 28388)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/Graphics.java
2012-02-28 22:49:32 UTC (rev 28389)
@@ -67,14 +67,6 @@
private GraphicsHandler handler;
- /** Initialize a singleton that seems to help with JOGL in some
compatibility
- * aspects
- */
- public static void initSingleton() {
-// GLProfile.initSingleton(false);
- //System.out.println("initSingleton called");
- }
-
/** Create a new Graphics object
*
* @param networkView The CyNetworkView object, representing the
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindBirdsEyeRenderingEngineFactory.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindBirdsEyeRenderingEngineFactory.java
2012-02-28 22:18:48 UTC (rev 28388)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindBirdsEyeRenderingEngineFactory.java
2012-02-28 22:49:32 UTC (rev 28389)
@@ -30,7 +30,6 @@
protected WindRenderingEngine getNewRenderingEngine(Object container,
View<CyNetwork> viewModel, VisualLexicon visualLexicon)
{
-
System.out.println("WindBirdsEyeRenderingEngineFactory.getNewRenderingEngine()
called");
return new WindBirdsEyeRenderingEngine(container, viewModel,
visualLexicon);
}
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-02-28 22:18:48 UTC (rev 28388)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngine.java
2012-02-28 22:49:32 UTC (rev 28389)
@@ -12,6 +12,7 @@
import javax.media.opengl.GLCapabilities;
import javax.media.opengl.GLProfile;
+import javax.media.opengl.GLProfile.ShutdownType;
import javax.media.opengl.awt.GLJPanel;
import javax.swing.Icon;
import javax.swing.JComponent;
@@ -84,6 +85,9 @@
*/
public void setUpCanvas(Object container) {
+ // TODO: Addition of this line prevents an "ERROR: JarContent:
Unable to read bytes." when Cytoscape shuts down, why?
+ ShutdownType shutdownType = ShutdownType.COMPLETE;
+
// TODO: The current presentation API seems to require this
cast, check
// if there's a way around it
this.networkView = (CyNetworkView) viewModel;
@@ -98,7 +102,6 @@
// Use the system's default version of OpenGL
GLProfile profile = GLProfile.getDefault();
GLCapabilities capabilities = new
GLCapabilities(profile);
-
// TODO: check if this line should be moved to
graphics object
capabilities.setDoubleBuffered(true);
@@ -106,7 +109,6 @@
// TODO: check whether to use GLCanvas or
GLJPanel
panel = new GLJPanel(capabilities);
-
// TODO: check if negative effects produced by
this
panel.setIgnoreRepaint(true);
// panel.setDoubleBuffered(true);
--
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.
