X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalviewLite.java;h=4e029846a6aa9394ab774641b5b4a08fac7feebc;hb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;hp=16f95cdfef257914947e01d4ac797fe9eaf59b39;hpb=1889827c44c51f6353fe8619e5d44b421158af23;p=jalview.git diff --git a/src/jalview/bin/JalviewLite.java b/src/jalview/bin/JalviewLite.java index 16f95cd..4e02984 100644 --- a/src/jalview/bin/JalviewLite.java +++ b/src/jalview/bin/JalviewLite.java @@ -1482,36 +1482,44 @@ public class JalviewLite extends Applet implements callInitCallback(); } } + private void initLiveConnect() { // try really hard to get the liveConnect thing working - boolean notFailed=false; - int tries=0; - while (!notFailed && tries<10) { - if (tries>0) + boolean notFailed = false; + int tries = 0; + while (!notFailed && tries < 10) + { + if (tries > 0) { System.err.println("LiveConnect request thread going to sleep."); } - try { - Thread.sleep(700*(1+tries)); + try + { + Thread.sleep(700 * (1 + tries)); + } catch (InterruptedException q) + { } - catch (InterruptedException q) {}; - if (tries++>0) + ; + if (tries++ > 0) { System.err.println("LiveConnect request thread woken up."); } - try { + try + { JSObject scriptObject = JSObject.getWindow(this); - if (scriptObject.eval("navigator")!=null) + if (scriptObject.eval("navigator") != null) { - notFailed=true; + notFailed = true; } } catch (JSException jsex) { - System.err.println("Attempt "+tries+" to access LiveConnect javascript failed."); + System.err.println("Attempt " + tries + + " to access LiveConnect javascript failed."); } } } + private void callInitCallback() { String initjscallback = getParameter("oninit"); @@ -1530,7 +1538,7 @@ public class JalviewLite extends Applet implements { } ; - // try really hard to let the browser plugin know we want liveconnect + // try really hard to let the browser plugin know we want liveconnect initLiveConnect(); if (scriptObject != null) @@ -1647,15 +1655,19 @@ public class JalviewLite extends Applet implements g.setColor(Color.cyan); g.fillRect(0, 0, getSize().width, getSize().height); g.setColor(Color.red); - g.drawString(MessageManager.getString("label.jalview_cannot_open_file"), 5, 15); + g.drawString( + MessageManager.getString("label.jalview_cannot_open_file"), + 5, 15); g.drawString("\"" + file + "\"", 5, 30); } else if (embedded) { g.setColor(Color.black); g.setFont(new Font("Arial", Font.BOLD, 24)); - g.drawString(MessageManager.getString("label.jalview_applet"), 50, getSize().height / 2 - 30); - g.drawString(MessageManager.getString("label.loading_data") + "...", 50, getSize().height / 2); + g.drawString(MessageManager.getString("label.jalview_applet"), 50, + getSize().height / 2 - 30); + g.drawString(MessageManager.getString("label.loading_data") + "...", + 50, getSize().height / 2); } } @@ -1862,10 +1874,14 @@ public class JalviewLite extends Applet implements if (protocol == jalview.io.AppletFormatAdapter.PASTE) { - newAlignFrame.setTitle(MessageManager.formatMessage("label.sequences_from", new String[]{applet.getDocumentBase().toString()})); + newAlignFrame.setTitle(MessageManager.formatMessage( + "label.sequences_from", new String[] + { applet.getDocumentBase().toString() })); } - newAlignFrame.statusBar.setText(MessageManager.formatMessage("label.successfully_loaded_file", new String []{file})); + newAlignFrame.statusBar.setText(MessageManager.formatMessage( + "label.successfully_loaded_file", new String[] + { file })); String treeFile = applet.getParameter("tree"); if (treeFile == null)