AppletLoader: fix error message so that it actually uses the error message string.

This commit is contained in:
kappa1 2010-07-25 11:40:58 +00:00
parent a7b892b7ab
commit bf68b287da

View file

@ -211,9 +211,6 @@ public class AppletLoader extends Applet implements Runnable, AppletStub {
/** 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 @@ public class AppletLoader extends Applet implements Runnable, AppletStub {
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 @@ public class AppletLoader extends Applet implements Runnable, AppletStub {
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 @@ public class AppletLoader extends Applet implements Runnable, AppletStub {
*/
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();