From 0616883e9c584c0f8600cfec79d9bf50cde337a4 Mon Sep 17 00:00:00 2001 From: gmungoc Date: Wed, 26 Nov 2014 14:26:39 +0000 Subject: [PATCH] JAL-1528 NullPointer check / more informative PDB fetch status bar --- src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java | 2 +- src/jalview/gui/ChimeraViewFrame.java | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java index fb03f04..0042041 100644 --- a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java +++ b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java @@ -782,7 +782,7 @@ public abstract class JalviewChimeraBinding extends private void waitForChimera() { - while (viewer.isBusy()) + while (viewer != null && viewer.isBusy()) { try { Thread.sleep(15); diff --git a/src/jalview/gui/ChimeraViewFrame.java b/src/jalview/gui/ChimeraViewFrame.java index 02865e1..513659f 100644 --- a/src/jalview/gui/ChimeraViewFrame.java +++ b/src/jalview/gui/ChimeraViewFrame.java @@ -840,8 +840,13 @@ public class ChimeraViewFrame extends GStructureViewer implements Runnable, { if (progressBar != null) { - progressBar.setProgressBar( - MessageManager.getString("label.state_completed"), hdl); + progressBar + .setProgressBar( + pdbid + + " " + + MessageManager + .getString("label.state_completed"), + hdl); } } /* -- 1.7.10.2