JAL-3446 removes all JalviewJSApp dependency from jalview.bin.Jalview;

[jalview.git] / src / jalview / api / JalviewJSApp.java

diff --git a/src/jalview/api/JalviewJSApp.java b/src/jalview/api/JalviewJSApp.java
index 693ea63..2975317 100644 (file)
--- a/src/jalview/api/JalviewJSApp.java
+++ b/src/jalview/api/JalviewJSApp.java
@@ -60,8 +60,6 @@ public class JalviewJSApp implements JalviewJSApi
 {
   private ArgsParser aparser;
 
-  private String j2sAppletID;
-
   private boolean debug;
 
   private String[] ret = new String[1];
@@ -70,11 +68,10 @@ public class JalviewJSApp implements JalviewJSApi
                                        // be '|', but many sequence IDS include
                                        // pipes.
 
+
   public JalviewJSApp(ArgsParser aparser)
   {
     this.aparser = aparser;
-    this.j2sAppletID = (String) aparser.getAppletValue("j2sAppletID",
-            "Jalview", true);
     Platform.setAppClass(this);
   }
 
@@ -103,11 +100,6 @@ public class JalviewJSApp implements JalviewJSApi
     loadPdbFiles(af);
   }
 
-  public String getAppID(String frameType)
-  {
-    return j2sAppletID + (frameType == null ? "" : "-" + frameType);
-  }
-
   // TODO BH 2019
   //
   // These are methods that are in JalviewLite that various classes call
@@ -2193,11 +2185,10 @@ public class JalviewJSApp implements JalviewJSApi
 
       }
 
-      Jalview jalview = Jalview.getInstance();
-      jalview.doSendCallback(_listener,
+      doSendCallback(_listener,
               new Object[]
-              { src, setid, jalview.arrayToSeparatorList(seqs),
-                  jalview.arrayToSeparatorList(cols) });
+              { src, setid, arrayToSeparatorList(seqs),
+                  arrayToSeparatorList(cols) });
     }
 
     public boolean isFor(AlignFrame af, String listener)