X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FMsaWSThread.java;fp=src%2Fjalview%2Fws%2FMsaWSThread.java;h=3be0c5622281da2d6374d8d4270a2c8d89e15a41;hb=aa9a4b5f3c7b97646d7ca7164f4211ab651c0862;hp=0dedce2f7b64f72d7b932ff49adb4dba37fcd505;hpb=825a9e8fcb05f794dc082ce84656c477cfff4918;p=jalview.git diff --git a/src/jalview/ws/MsaWSThread.java b/src/jalview/ws/MsaWSThread.java index 0dedce2..3be0c56 100644 --- a/src/jalview/ws/MsaWSThread.java +++ b/src/jalview/ws/MsaWSThread.java @@ -622,7 +622,7 @@ class MsaWSThread results[j] = null; } } - Object[] newview = input.getUpdatedView(results, orders, '-'); + Object[] newview = input.getUpdatedView(results, orders, getGapChar()); // trash references to original result data for (int j = 0; j < jobs.length; j++) { @@ -647,10 +647,9 @@ class MsaWSThread AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); - // >>>This is a fix for the moment, until a better solution is - // found!!<<< + // initialise with same renderer settings as in parent alignframe. af.getFeatureRenderer().transferSettings( - alignFrame.getFeatureRenderer()); + this.featureSettings); // update orders if (alorders.size() > 0) { @@ -714,7 +713,6 @@ class MsaWSThread } } - public boolean canMergeResults() { return false;