AfflictionNetworks/getdown
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't complain if text_shadow is missing as it isn't required

Browse Source
This commit is contained in:
Charlie Groves
2009-09-04 21:06:13 +00:00
parent 7332c71e5d
commit bfe11646bf
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/getdown/data/Application.java
+9 -2
View File
@@ -582,7 +582,7 @@ public class Application
ui.progressBar = parseColor(cdata, "ui.progress_bar", ui.progressBar); ui.progressBar = parseColor(cdata, "ui.progress_bar", ui.progressBar);
ui.status = parseRect(cdata, "ui.status", ui.status); ui.status = parseRect(cdata, "ui.status", ui.status);
ui.statusText = parseColor(cdata, "ui.status_text", ui.statusText); ui.statusText = parseColor(cdata, "ui.status_text", ui.statusText);
ui.textShadow = parseColor(cdata, "ui.text_shadow", ui.textShadow); ui.textShadow = parseColor(cdata, "ui.text_shadow", ui.textShadow, false);
ui.backgroundImage = (String)cdata.get("ui.background_image"); ui.backgroundImage = (String)cdata.get("ui.background_image");
if (ui.backgroundImage == null) { // support legacy format if (ui.backgroundImage == null) { // support legacy format
ui.backgroundImage = (String)cdata.get("ui.background"); ui.backgroundImage = (String)cdata.get("ui.background");
@@ -1350,10 +1350,17 @@ public class Application
/** Used to parse color specifications from the config file. */ /** Used to parse color specifications from the config file. */
protected Color parseColor (HashMap<String,Object> cdata, String name, Color def) protected Color parseColor (HashMap<String,Object> cdata, String name, Color def)
{
return parseColor(cdata, name, def, true);
}
/** Used to parse color specifications from the config file. */
protected Color parseColor (HashMap<String, Object> cdata, String name, Color def,
boolean required)
{ {
String value = (String)cdata.get(name); String value = (String)cdata.get(name);
Color color = parseColor(value); Color color = parseColor(value);
if (color == null) { if (color == null && required) {
log.warning("Ignoring invalid '" + name + "' config '" + value + "'."); log.warning("Ignoring invalid '" + name + "' config '" + value + "'.");
} else { } else {
return color; return color;