X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalviewLite.java;h=311e48d7953c8c60845ed917a3bf3cf6bcff8b2f;hb=e9aa1cee679000405c5549829ee08e1c08b2ffd5;hp=562bc92ca1bff533f07acbfcaeacd667d438d7ad;hpb=2d6be9a94eb65474a7272d3766881521ed35a760;p=jalview.git

diff --git a/src/jalview/bin/JalviewLite.java b/src/jalview/bin/JalviewLite.java
index 562bc92..311e48d 100644
--- a/src/jalview/bin/JalviewLite.java
+++ b/src/jalview/bin/JalviewLite.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
@@ -492,6 +492,8 @@ public class JalviewLite extends Applet implements
       boolean seqlimits = suffix.equalsIgnoreCase("true");
       if (alf.viewport.getSelectionGroup() != null)
       {
+        // JBPNote: getSelectionAsNewSequence behaviour has changed - this method now returns a full copy of sequence data
+        // TODO consider using getSequenceSelection instead here
         String reply = new AppletFormatAdapter().formatSequences(format,
                 new Alignment(alf.viewport.getSelectionAsNewSequence()),
                 seqlimits);
@@ -716,6 +718,29 @@ public class JalviewLite extends Applet implements
   /*
    * (non-Javadoc)
    * 
+   * @see jalview.bin.JalviewLiteJsApi#loadAnnotation(java.lang.String)
+   */
+  public void loadFeatures(String features, boolean autoenabledisplay)
+  {
+    loadFeaturesFrom(getDefaultTargetFrame(), features, autoenabledisplay);
+  }
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see
+   * jalview.bin.JalviewLiteJsApi#loadAnnotationFrom(jalview.appletgui.AlignFrame
+   * , java.lang.String)
+   */
+  public void loadFeaturesFrom(AlignFrame alf, String features, boolean autoenabledisplay)
+  {
+    alf.parseFeaturesFile(features, AppletFormatAdapter.PASTE, autoenabledisplay);
+  }
+
+
+  /*
+   * (non-Javadoc)
+   * 
    * @see jalview.bin.JalviewLiteJsApi#getFeatures(java.lang.String)
    */
   public String getFeatures(String format)