From: James Procter Date: Sun, 22 Oct 2023 10:59:21 +0000 (+0100) Subject: Merge branch 'patch/JAL-4298_synchronize_consoledoc' into develop X-Git-Tag: Release_2_11_4_0~130 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=86421995e1e02c7620bfe1661a6e19366068db18;p=jalview.git Merge branch 'patch/JAL-4298_synchronize_consoledoc' into develop Conflicts: src/jalview/gui/Console.java still needs some tidying up --- 86421995e1e02c7620bfe1661a6e19366068db18 diff --cc src/jalview/gui/Console.java index b8aad21,89380a3..cb60a3f --- a/src/jalview/gui/Console.java +++ b/src/jalview/gui/Console.java @@@ -621,14 -610,13 +622,10 @@@ public class Console extends WindowAdap { try { - this.wait(100); // ##### implicated BLOCKED - if (pin.available() == 0) - { - trimBuffer(false); - } + this.wait(100); -// if (pin.available() == 0) -// { -// trimBuffer(false); -// } } catch (InterruptedException ie) { + jalview.bin.Console.debug("pin.available() error", ie); } }