java-game-lib-cvs Mailing List for Lightweight Java Game Library

Revision: 2909
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2909&view=rev
Author:   matzon
Date:     2007-10-24 14:55:39 -0700 (Wed, 24 Oct 2007)

Log Message:
-----------
miscellaneous minor fixes to improve the loading and displaying of the applet

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2007-10-24 21:25:54 UTC (rev 2908)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2007-10-24 21:55:39 UTC (rev 2909)
@@ -33,8 +33,8 @@
 
 import java.applet.Applet;
 import java.applet.AppletStub;
+import java.awt.BorderLayout;
 import java.awt.Color;
-import java.awt.FlowLayout;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Image;
@@ -207,6 +207,8 @@
 	 */
 	public void init() {
 		
+		state = STATE_INIT;
+		
 		// sanity check
 		String[] requiredArgs = {"al_main", "al_logo", "al_progressbar", "al_jars"};
 		for(int i=0; i<requiredArgs.length; i++) {
@@ -221,6 +223,8 @@
 		
 		// get colors of applet
 		bgColor 		= getColor("al_bgcolor", Color.white);
+		setBackground(bgColor);
+
 		fgColor 		= getColor("al_fgcolor", Color.black);
 		errorColor 		= getColor("al_errorcolor", Color.red);		
 
@@ -621,7 +625,7 @@
 	 * replace the current applet with the lwjgl applet
 	 * using AppletStub and initialise and start it
 	 */
-	protected void switchApplet() throws Exception {
+	protected synchronized void switchApplet() throws Exception {
 		
 		state = STATE_SWITCHING_APPLET;
 		percentage = 100;
@@ -636,7 +640,7 @@
 		lwjglApplet.setStub(this);
 		lwjglApplet.setSize(getWidth(), getHeight());
 
-		setLayout(new FlowLayout(FlowLayout.LEADING, 0, 0));
+		setLayout(new BorderLayout());
 		add(lwjglApplet);
 
 		state = STATE_INITIALIZE_REAL_APPLET;
@@ -644,7 +648,12 @@
 
 		state = STATE_START_REAL_APPLET;
 		lwjglApplet.start();
+
+		
+		// fix for issue with applet not showing up in firefox
+		setVisible(false);
 		validate();
+		setVisible(true);
 	}
 
 	/**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2908
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2908&view=rev
Author:   matzon
Date:     2007-10-24 14:25:54 -0700 (Wed, 24 Oct 2007)

Log Message:
-----------
reworked urlconnection.getInputStream to threaded usage, to avoid Opera issue (detective work: kappaOne)

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2007-10-24 21:23:32 UTC (rev 2907)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2007-10-24 21:25:54 UTC (rev 2908)
@@ -44,6 +44,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Method;
@@ -468,7 +469,7 @@
 		
 		state = STATE_CHECKING_CACHE;
 		
-		percentage = 5;
+ 		percentage = 5;
 
 		try {
 			if(debugMode) {
@@ -677,7 +678,7 @@
 			urlconnection = urlList[i].openConnection();
 
 			String currentFile = getFileName(urlList[i]);
-			InputStream inputstream = urlconnection.getInputStream();
+			InputStream inputstream = getJarInputStream(currentFile, urlconnection);
 			FileOutputStream fos = new FileOutputStream(path + currentFile);
 			
 
@@ -691,11 +692,62 @@
 				percentage = initialPercentage + ((currentSizeDownload * 55) / totalSizeDownload);
 				subtaskMessage = "Retrieving: " + currentFile + " " + ((currentSizeDownload * 100) / totalSizeDownload) + "%";
 			}
+			
+			inputstream.close();
+			fos.close();
 		}
 		subtaskMessage = "";
 	}
 
 	/**
+	 * Retrieves a jar files input stream. This method exists primarily to fix an Opera hang in getInputStream
+	 * @param urlconnection connection to get input stream from
+	 * @return InputStream or null if not possible
+	 */
+	private InputStream getJarInputStream(final String currentFile, final URLConnection urlconnection) throws Exception {
+		final InputStream[] is = new InputStream[1];
+		
+		// try to get the input stream 3 times. 
+		// Wait at most 5 seconds before interrupting the thread
+		for (int j = 0; j < 3 && is[0] == null; j++) {
+			Thread t = new Thread() {
+				public void run() {
+					try {
+						is[0] = urlconnection.getInputStream();
+					} catch (IOException e) {
+						/* ignored */
+					}
+				}
+			};
+			t.setName("JarInputStreamThread");
+			t.start();
+			
+			int iterationCount = 0;
+			while(is == null && iterationCount++ < 5) {
+				try {
+					t.join(1000);
+				} catch (InterruptedException inte) {
+					/* ignored */
+				}
+			}
+			
+			try {
+				t.interrupt();
+				t.join();
+			} catch (InterruptedException inte) {
+				/* ignored */
+			}				
+		}
+		
+		if(is[0] == null) {
+			throw new Exception("Unable to get input stream for " + currentFile);
+		}
+
+		
+		return is[0];
+	}
+
+	/**
 	 * This method will extract all file from the native jar and extract them
 	 * to the subdirectory called "natives" in the local path, will also check
 	 * to see if the native jar files is signed properly 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2907
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2907&view=rev
Author:   matzon
Date:     2007-10-24 14:23:32 -0700 (Wed, 24 Oct 2007)

Log Message:
-----------
removed annotation

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/jinput/LWJGLEnvironmentPlugin.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/jinput/LWJGLEnvironmentPlugin.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/jinput/LWJGLEnvironmentPlugin.java	2007-10-22 20:54:16 UTC (rev 2906)
+++ trunk/LWJGL/src/java/org/lwjgl/util/jinput/LWJGLEnvironmentPlugin.java	2007-10-24 21:23:32 UTC (rev 2907)
@@ -41,7 +41,6 @@
         return controllers;
     }
 
-	@Override
 	public boolean isSupported() {
 		return true;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.