Allow the specification of installation error pages within the getdown.txt file. This will let applications direct users to a particular URL for installation support. If none is specified, the same old generic text will be used.
This commit is contained in:
@@ -83,6 +83,9 @@ public class Application
|
|||||||
|
|
||||||
/** The color of the text shadow. */
|
/** The color of the text shadow. */
|
||||||
public Color textShadow;
|
public Color textShadow;
|
||||||
|
|
||||||
|
/** Where to point the user for help with install errors. */
|
||||||
|
public String installError;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Used by {@link #verifyMetadata} to communicate status in
|
/** Used by {@link #verifyMetadata} to communicate status in
|
||||||
@@ -334,6 +337,15 @@ public class Application
|
|||||||
ui.backgroundImage = (String)cdata.get("ui.background");
|
ui.backgroundImage = (String)cdata.get("ui.background");
|
||||||
}
|
}
|
||||||
ui.progressImage = (String)cdata.get("ui.progress_image");
|
ui.progressImage = (String)cdata.get("ui.progress_image");
|
||||||
|
|
||||||
|
// On an installation error, where do we point the user.
|
||||||
|
ui.installError = (String)cdata.get("ui.install_error");
|
||||||
|
if (ui.installError == null) {
|
||||||
|
ui.installError = "m.default_install_error";
|
||||||
|
} else {
|
||||||
|
ui.installError = MessageUtil.taint(ui.installError);
|
||||||
|
}
|
||||||
|
|
||||||
return ui;
|
return ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -109,13 +109,15 @@ public class Getdown extends Thread
|
|||||||
Log.logStackTrace(e);
|
Log.logStackTrace(e);
|
||||||
String msg = e.getMessage();
|
String msg = e.getMessage();
|
||||||
if (msg == null) {
|
if (msg == null) {
|
||||||
msg = "m.unknown_error";
|
msg = MessageUtil.compose("m.unknown_error", _ifc.installError);
|
||||||
} else if (!msg.startsWith("m.")) {
|
} else if (!msg.startsWith("m.")) {
|
||||||
// try to do something sensible based on the type of error
|
// try to do something sensible based on the type of error
|
||||||
if (e instanceof FileNotFoundException) {
|
if (e instanceof FileNotFoundException) {
|
||||||
msg = MessageUtil.tcompose("m.missing_resource", msg);
|
msg = MessageUtil.compose("m.missing_resource",
|
||||||
|
MessageUtil.taint(msg), _ifc.installError);
|
||||||
} else {
|
} else {
|
||||||
msg = MessageUtil.tcompose("m.init_error", msg);
|
msg = MessageUtil.compose("m.init_error",
|
||||||
|
MessageUtil.taint(msg), _ifc.installError);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
updateStatus(msg);
|
updateStatus(msg);
|
||||||
@@ -341,13 +343,15 @@ public class Getdown extends Thread
|
|||||||
Log.logStackTrace(e);
|
Log.logStackTrace(e);
|
||||||
String msg = e.getMessage();
|
String msg = e.getMessage();
|
||||||
if (msg == null) {
|
if (msg == null) {
|
||||||
msg = "m.unknown_error";
|
msg = MessageUtil.compose("m.unknown_error", _ifc.installError);
|
||||||
} else if (!msg.startsWith("m.")) {
|
} else if (!msg.startsWith("m.")) {
|
||||||
// try to do something sensible based on the type of error
|
// try to do something sensible based on the type of error
|
||||||
if (e instanceof FileNotFoundException) {
|
if (e instanceof FileNotFoundException) {
|
||||||
msg = MessageUtil.tcompose("m.missing_resource", msg);
|
msg = MessageUtil.compose("m.missing_resource",
|
||||||
|
MessageUtil.taint(msg), _ifc.installError);
|
||||||
} else {
|
} else {
|
||||||
msg = MessageUtil.tcompose("m.init_error", msg);
|
msg = MessageUtil.compose("m.init_error", msg,
|
||||||
|
MessageUtil.taint(msg), _ifc.installError);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
updateStatus(msg);
|
updateStatus(msg);
|
||||||
|
|||||||
@@ -54,15 +54,16 @@ m.unable_to_repair = We were unable to download the necessary files after \
|
|||||||
fails you may need to uninstall and reinstall.
|
fails you may need to uninstall and reinstall.
|
||||||
|
|
||||||
m.unknown_error = The application has failed to launch due to some strange \
|
m.unknown_error = The application has failed to launch due to some strange \
|
||||||
error from which we could not recover. Please visit the support section \
|
error from which we could not recover. Please visit\n{0} for information on \
|
||||||
of the website for information on how to recover.
|
how to recover.
|
||||||
m.init_error = The application has failed to launch due to the following \
|
m.init_error = The application has failed to launch due to the following \
|
||||||
error:\n{0}\n\nPlease visit the support section of the website for \
|
error:\n{0}\n\nPlease visit\n{1} for \
|
||||||
information on how to handle such problems.
|
information on how to handle such problems.
|
||||||
|
|
||||||
m.missing_resource = The application has failed to launch due to a \
|
m.missing_resource = The application has failed to launch due to a \
|
||||||
missing resource:\n{0}\n\nPlease visit the support section of the \
|
missing resource:\n{0}\n\nPlease visit\n{1} for information on how to handle such problems.
|
||||||
website for information on how to handle such problems.
|
|
||||||
|
m.default_install_error = the support section of the website
|
||||||
|
|
||||||
# application/digest errors
|
# application/digest errors
|
||||||
m.missing_appbase = The configuration file is missing the 'appbase'.
|
m.missing_appbase = The configuration file is missing the 'appbase'.
|
||||||
|
|||||||
Reference in New Issue
Block a user