X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalviewLite.java;h=9c23a0af68dd02273967ac7632163da45ae57925;hb=aa213924876640ba82e866da5a750d9cdaa816d2;hp=342ff4c255ffd4347f73957e610a612f8dff53f6;hpb=a79f9e113c51c032070c670e45ce3eb464691166;p=jalview.git diff --git a/src/jalview/bin/JalviewLite.java b/src/jalview/bin/JalviewLite.java index 342ff4c..9c23a0a 100644 --- a/src/jalview/bin/JalviewLite.java +++ b/src/jalview/bin/JalviewLite.java @@ -732,9 +732,9 @@ public class JalviewLite extends Applet implements * jalview.bin.JalviewLiteJsApi#loadAnnotationFrom(jalview.appletgui.AlignFrame * , java.lang.String) */ - public void loadFeaturesFrom(AlignFrame alf, String features, boolean autoenabledisplay) + public boolean loadFeaturesFrom(AlignFrame alf, String features, boolean autoenabledisplay) { - alf.parseFeaturesFile(features, AppletFormatAdapter.PASTE, autoenabledisplay); + return alf.parseFeaturesFile(features, AppletFormatAdapter.PASTE, autoenabledisplay); } @@ -1871,12 +1871,13 @@ public class JalviewLite extends Applet implements String sScoreFile = applet.getParameter("scoreFile"); if( sScoreFile != null && !"".equals(sScoreFile) ) { try { - URL urlScore = new URL(sScoreFile); - newAlignFrame.loadScoreFile(urlScore); - - } - catch( Exception e ) { - // TODO error message log (shows a warning dialogbox?) + if (debug) { + System.err.println("Attempting to load T-COFFEE score file from the scoreFile parameter"); + } + if (!newAlignFrame.loadScoreFile(sScoreFile)) { + System.err.println("Failed to parse T-COFFEE parameter as a valid score file ('"+sScoreFile+"')"); + } + }catch( Exception e ) { System.err.printf("Cannot read score file: '%s'. Cause: %s \n", sScoreFile, e.getMessage()); } }