From: <ka...@us...> - 2010-07-25 11:41:05
|
Revision: 3387 http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3387&view=rev Author: kappa1 Date: 2010-07-25 11:40:58 +0000 (Sun, 25 Jul 2010) Log Message: ----------- AppletLoader: fix error message so that it actually uses the error message string. 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 2010-07-24 20:00:58 UTC (rev 3386) +++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2010-07-25 11:40:58 UTC (rev 3387) @@ -211,9 +211,6 @@ /** whether a fatal error occured */ protected boolean fatalError; - /** fatal error that occured */ - protected String fatalErrorDescription; - /** whether we're running in debug mode */ protected boolean debugMode; @@ -454,10 +451,6 @@ if (fatalError) { String[] errorMessage = (certificateRefused) ? certificateRefusedMessage : genericErrorMessage; - if (!certificateRefused) { - errorMessage[errorMessage.length-1] = fatalErrorDescription; - } - for(int i=0; i<errorMessage.length; i++) { if(errorMessage[i] != null) { int messageX = (offscreen.getWidth(null) - fm.stringWidth(errorMessage[i])) / 2; @@ -767,7 +760,7 @@ fatalErrorOccured(ace.getMessage(), ace); certificateRefused = true; } catch (Exception e) { - fatalErrorOccured(e.getMessage(), e); + fatalErrorOccured("This occurred while '" + getDescriptionForState() + "'", e); } finally { loaderThread = null; } @@ -1547,9 +1540,10 @@ */ protected void fatalErrorOccured(String error, Exception e) { fatalError = true; - fatalErrorDescription = "This occurred while '" + getDescriptionForState() + "'"; - System.out.println(fatalErrorDescription); + genericErrorMessage[genericErrorMessage.length-1] = error; + System.out.println(error); if(e != null) { + System.out.println(e.getMessage()); System.out.println(generateStacktrace(e)); } repaint(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |