X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=getdown%2Fsrc%2Fgetdown%2Flauncher%2Fsrc%2Fmain%2Fjava%2Fcom%2Fthreerings%2Fgetdown%2Flauncher%2FStatusPanel.java;h=620182bf92307ff44a7e4286f409dcdee53a4841;hb=199ad468f742cf47b913ef6f5719efe6992c77dc;hp=f74546a68104970c69d6a1cc758d747f10fa96a1;hpb=2e803e937ea83ed611d917b6e74272983e79399a;p=jalview.git diff --git a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/StatusPanel.java b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/StatusPanel.java index f74546a..620182b 100644 --- a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/StatusPanel.java +++ b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/StatusPanel.java @@ -107,7 +107,7 @@ public final class StatusPanel extends JComponent // maybe update the progress label if (_progress != percent) { _progress = percent; - if (!_ifc.hideProgressText) { + if (_ifc != null && !_ifc.hideProgressText) { String msg = MessageFormat.format(get("m.complete"), percent); _newplab = createLabel(msg, new Color(_ifc.progressText, true)); } @@ -129,7 +129,7 @@ public final class StatusPanel extends JComponent } remaining /= values; - if (!_ifc.hideProgressText) { + if (_ifc != null && !_ifc.hideProgressText) { // now compute our display value int minutes = (int)(remaining / 60), seconds = (int)(remaining % 60); String remstr = minutes + ":" + ((seconds < 10) ? "0" : "") + seconds; @@ -266,16 +266,19 @@ public final class StatusPanel extends JComponent */ protected void updateStatusLabel () { + if (_ifc == null) { + return; + } String status = _status; if (!_displayError) { for (int ii = 0; ii < _statusDots; ii++) { status += " ."; } } - + StringBuilder labelText = new StringBuilder(); if (_ifc.displayVersion) { - labelText.append("version: "+Build.version()); + labelText.append("launcher version: "+Build.version()); labelText.append("\n"); } if (_ifc.displayAppbase) {