X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalview.java;h=ff8d52ff32103d4de206a81118357d463332cb1b;hb=984b20fa94376c549b75bda56bf4ec2fecb4cdd6;hp=d716c25d4f7009b54e7994ec5a1b5c9f94663c95;hpb=d82d17a7ba88f90e6b8b1b591245a7ee70b3975c;p=jalview.git
diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index d716c25..ff8d52f 100755
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -20,14 +20,22 @@
*/
package jalview.bin;
+import jalview.api.AlignCalcWorkerI;
+import jalview.api.AlignFrameI;
import jalview.api.AlignViewportI;
import jalview.api.JalviewApp;
+import jalview.api.StructureSelectionManagerProvider;
import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
+import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.HiddenColumns;
import jalview.datamodel.PDBEntry;
+import jalview.datamodel.SequenceGroup;
import jalview.datamodel.SequenceI;
import jalview.ext.so.SequenceOntology;
import jalview.gui.AlignFrame;
import jalview.gui.AlignViewport;
+import jalview.gui.AlignmentPanel;
+import jalview.gui.CalculationChooser;
import jalview.gui.Desktop;
import jalview.gui.Preferences;
import jalview.gui.PromptUserConfig;
@@ -44,12 +52,18 @@ import jalview.io.HtmlSvgOutput;
import jalview.io.IdentifyFile;
import jalview.io.NewickFile;
import jalview.io.gff.SequenceOntologyFactory;
+import jalview.javascript.JSFunctionExec;
+import jalview.javascript.MouseOverStructureListener;
+import jalview.renderer.seqfeatures.FeatureRenderer;
import jalview.schemes.ColourSchemeI;
import jalview.schemes.ColourSchemeProperty;
+import jalview.structure.SelectionSource;
+import jalview.structure.VamsasSource;
import jalview.util.MessageManager;
import jalview.util.Platform;
import jalview.ws.jws2.Jws2Discoverer;
+import java.applet.AppletContext;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileOutputStream;
@@ -67,17 +81,16 @@ import java.security.PermissionCollection;
import java.security.Permissions;
import java.security.Policy;
import java.util.HashMap;
+import java.util.Hashtable;
import java.util.Map;
import java.util.Vector;
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.swing.LookAndFeel;
import javax.swing.UIManager;
import groovy.lang.Binding;
import groovy.util.GroovyScriptEngine;
+import netscape.javascript.JSObject;
/**
* Main class for Jalview Application
@@ -94,7 +107,7 @@ import groovy.util.GroovyScriptEngine;
* @author $author$
* @version $Revision$
*/
-public class Jalview implements ApplicationSingletonI
+public class Jalview implements ApplicationSingletonI, JalviewJSApi
{
public static Jalview getInstance()
@@ -127,6 +140,34 @@ public class Jalview implements ApplicationSingletonI
public String appletResourcePath;
+ JalviewAppLoader appLoader;
+
+ protected JSFunctionExec jsFunctionExec;
+
+ private boolean noCalculation, noMenuBar, noStatus;
+
+ private boolean noAnnotation;
+
+ public boolean getStartCalculations()
+ {
+ return !noCalculation;
+ }
+
+ public boolean getAllowMenuBar()
+ {
+ return !noMenuBar;
+ }
+
+ public boolean getShowStatus()
+ {
+ return !noStatus;
+ }
+
+ public boolean getShowAnnotation()
+ {
+ return !noAnnotation;
+ }
+
public static AlignFrame getCurrentAlignFrame()
{
return getInstance().currentAlignFrame;
@@ -232,50 +273,12 @@ public class Jalview implements ApplicationSingletonI
*/
public static void main(String[] args)
{
- // setLogging(); // BH - for event debugging in JavaScript
+ // Platform.startJavaLogging();
getInstance().doMain(args);
}
- private static void logClass(String name)
- {
- // BH - for event debugging in JavaScript
- ConsoleHandler consoleHandler = new ConsoleHandler();
- consoleHandler.setLevel(Level.ALL);
- Logger logger = Logger.getLogger(name);
- logger.setLevel(Level.ALL);
- logger.addHandler(consoleHandler);
- }
@SuppressWarnings("unused")
- private static void setLogging()
- {
-
- /**
- * @j2sIgnore
- *
- */
- {
- System.out.println("not in js");
- }
-
- // BH - for event debugging in JavaScript (Java mode only)
- if (!Platform.isJS())
- /**
- * Java only
- *
- * @j2sIgnore
- */
- {
- Logger.getLogger("").setLevel(Level.ALL);
- logClass("java.awt.EventDispatchThread");
- logClass("java.awt.EventQueue");
- logClass("java.awt.Component");
- logClass("java.awt.focus.Component");
- logClass("java.awt.focus.DefaultKeyboardFocusManager");
- }
-
- }
-
/**
* @param args
*/
@@ -283,7 +286,11 @@ public class Jalview implements ApplicationSingletonI
{
boolean isJS = Platform.isJS();
- if (!isJS)
+ if (isJS)
+ {
+ Platform.setAppClass(this);
+ }
+ else
{
System.setSecurityManager(null);
}
@@ -298,6 +305,15 @@ public class Jalview implements ApplicationSingletonI
String usrPropsFile = aparser.getValue(ArgsParser.PROPS);
Cache.loadProperties(usrPropsFile);
+
+ if (aparser.contains(ArgsParser.NODISPLAY)
+ || aparser.contains(ArgsParser.NOGUI)
+ || aparser.contains(ArgsParser.HEADLESS)
+ || "true".equals(System.getProperty("java.awt.headless")))
+ {
+ headless = true;
+ }
+
if (isJS)
{
isJavaAppletTag = aparser.isApplet();
@@ -329,13 +345,7 @@ public class Jalview implements ApplicationSingletonI
showUsage();
System.exit(0);
}
- if (aparser.contains(ArgsParser.NODISPLAY)
- || aparser.contains(ArgsParser.NOGUI)
- || aparser.contains(ArgsParser.HEADLESS)
- || "true".equals(System.getProperty("java.awt.headless")))
- {
- headless = true;
- }
+
// anything else!
@@ -391,7 +401,13 @@ public class Jalview implements ApplicationSingletonI
try
{
- UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+ if (!isJS && Platform.isWin())
+ {
+ UIManager.setLookAndFeel(
+ headless ? "javax.swing.plaf.metal.MetalLookAndFeel"
+ : UIManager.getSystemLookAndFeelClassName());
+// UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+ }
} catch (Exception ex)
{
System.err.println("Unexpected Look and Feel Exception");
@@ -439,7 +455,7 @@ public class Jalview implements ApplicationSingletonI
* configure 'full' SO model if preferences say to,
* else use the default (SO Lite)
*/
- if (Cache.getDefault("USE_FULL_SO", false))
+ if (Cache.getDefault(Preferences.USE_FULL_SO, false))
{
SequenceOntologyFactory.setSequenceOntology(new SequenceOntology());
}
@@ -481,7 +497,7 @@ public class Jalview implements ApplicationSingletonI
}
else
{
- if (Cache.getProperty("NOQUESTIONNAIRES") == null)
+ if (Cache.getProperty(Preferences.NOQUESTIONNAIRES) == null)
{
// Start the desktop questionnaire prompter with the specified
// questionnaire
@@ -510,15 +526,49 @@ public class Jalview implements ApplicationSingletonI
}
}
+ parseArguments(aparser, true);
+ }
+ /**
+ * Allow an outside entity to initiate the second half of argument parsing
+ * (only).
+ *
+ * @param args
+ * @return null is good
+ */
+ @Override
+ public Object parseArguments(String[] args)
+ {
+
+ try
+ {
+ ArgsParser aparser = new ArgsParser(args);
+ return parseArguments(aparser, false);
+ } catch (Throwable t)
+ {
+ return t;
+ }
+ }
+
+ /**
+ *
+ * @param aparser
+ * @param isStartup
+ * @return
+ */
+ private Object parseArguments(ArgsParser aparser, boolean isStartup)
+ {
+ boolean isJS = Platform.isJS();
+
+ Desktop desktop = (headless ? null : Desktop.getInstance());
// script to execute after all loading is
// completed one way or another
// extract groovy argument and execute if necessary
String groovyscript = (isJS ? null
: aparser.getValue(ArgsParser.GROOVY, true));
String file = aparser.getValue(ArgsParser.OPEN, true);
- String file2 = (isJavaAppletTag ? aparser.getAppletValue("file2", null)
- : null);
+ // BH this here to allow split frame; not working as of 5/17/2019
+ String file2 = aparser.getValue(ArgsParser.OPEN2, true);
String fileFormat = (isJavaAppletTag
? aparser.getAppletValue("format", null)
: null);
@@ -533,8 +583,27 @@ public class Jalview implements ApplicationSingletonI
boolean haveImport = checkStartVamas(aparser);
// Finally, deal with the remaining input data.
long progress = -1;
+ if (file == null && isJavaAppletTag)
+ {
+ // Maybe the sequences are added as parameters
+ StringBuffer data = new StringBuffer("PASTE");
+ int i = 1;
+ while ((file = aparser.getAppletValue("sequence" + i, null)) != null)
+ {
+ data.append(file.toString() + "\n");
+ i++;
+ }
+ if (data.length() > 5)
+ {
+ file = data.toString();
+ }
+ }
+
+ String data;
+
if (file != null)
{
+
if (!headless)
{
desktop.setProgressBar(
@@ -581,9 +650,32 @@ public class Jalview implements ApplicationSingletonI
// TODO ?
}
+ if (aparser.contains(ArgsParser.NOMENUBAR))
+ {
+ noMenuBar = true;
+ System.out.println("CMD [nomenu] executed successfully!");
+ }
+
+ if (aparser.contains(ArgsParser.NOSTATUS))
+ {
+ noStatus = true;
+ System.out.println("CMD [nostatus] executed successfully!");
+ }
+
+ if (aparser.contains(ArgsParser.NOANNOTATION)
+ || aparser.contains(ArgsParser.NOANNOTATION2))
+ {
+ noAnnotation = true;
+ System.out.println("CMD no-annotation executed successfully!");
+ }
+ if (aparser.contains(ArgsParser.NOCALCULATION))
+ {
+ noCalculation = true;
+ System.out.println("CMD [nocalculation] executed successfully!");
+ }
+
AlignFrame af = new FileLoader(!headless).loadFileWaitTillLoaded(file,
- protocol,
- format);
+ protocol, format);
if (af == null)
{
System.out.println("error");
@@ -602,9 +694,8 @@ public class Jalview implements ApplicationSingletonI
{
// TODO ?
}
- AlignFrame af2 = new FileLoader(!headless).loadFileWaitTillLoaded(
- file2,
- protocol, format);
+ AlignFrame af2 = new FileLoader(!headless)
+ .loadFileWaitTillLoaded(file2, protocol, format);
if (af2 == null)
{
System.out.println("error");
@@ -615,6 +706,8 @@ public class Jalview implements ApplicationSingletonI
af.getViewport().getAlignment(),
af2.getViewport().getAlignment(), "",
AlignViewport.SPLIT_FRAME);
+ System.out.println(
+ "CMD [-open2 " + file2 + "] executed successfully!");
}
}
@@ -622,7 +715,7 @@ public class Jalview implements ApplicationSingletonI
// TODO: file2 How to implement file2 for the applet spit screen?
- String data = aparser.getValue(ArgsParser.COLOUR, true);
+ data = aparser.getValue(ArgsParser.COLOUR, true);
if (data != null)
{
data.replaceAll("%20", " ");
@@ -666,6 +759,13 @@ public class Jalview implements ApplicationSingletonI
System.out.println(
"CMD [-annotations " + data + "] executed successfully!");
}
+
+ if (aparser.contains(ArgsParser.SHOWOVERVIEW))
+ {
+ af.overviewMenuItem_actionPerformed(null);
+ System.out.println("CMD [showoverview] executed successfully!");
+ }
+
// set or clear the sortbytree flag.
if (aparser.contains(ArgsParser.SORTBYTREE))
{
@@ -675,13 +775,30 @@ public class Jalview implements ApplicationSingletonI
System.out.println("CMD [-sortbytree] executed successfully!");
}
}
- if (aparser.contains(ArgsParser.NOANNOTATION)
- || aparser.contains(ArgsParser.NOANNOTATION2))
+
+ boolean doUpdateAnnotation = false;
+
+ /**
+ * we do this earlier in JalviewJS because of a complication with
+ * SHOWOVERVIEW
+ *
+ * For now, just fixing this in JalviewJS.
+ *
+ *
+ * @j2sIgnore
+ *
+ */
{
- af.getViewport().setShowAnnotation(false);
- if (!af.getViewport().isShowAnnotation())
+ if (aparser.contains(ArgsParser.NOANNOTATION)
+ || aparser.contains(ArgsParser.NOANNOTATION2))
{
- System.out.println("CMD no-annotation executed successfully!");
+ af.getViewport().setShowAnnotation(false);
+ if (!af.getViewport().isShowAnnotation())
+ {
+ doUpdateAnnotation = true;
+ System.out
+ .println("CMD no-annotation executed successfully!");
+ }
}
}
if (aparser.contains(ArgsParser.NOSORTBYTREE))
@@ -689,10 +806,16 @@ public class Jalview implements ApplicationSingletonI
af.getViewport().setSortByTree(false);
if (!af.getViewport().getSortByTree())
{
+ doUpdateAnnotation = true;
System.out
.println("CMD [-nosortbytree] executed successfully!");
}
}
+ if (doUpdateAnnotation)
+ { // BH 2019.07.24
+ af.setMenusForViewport();
+ af.alignPanel.updateLayout();
+ }
data = aparser.getValue(ArgsParser.TREE, true);
if (data != null)
{
@@ -735,11 +858,11 @@ public class Jalview implements ApplicationSingletonI
+ "] executed successfully!");
groovyscript = null;
}
- checkOutputFile(aparser, af, format);
- while (aparser.getSize() > 0)
- {
- System.out.println("Unknown arg: " + aparser.nextValue());
- }
+ }
+ createOutputFiles(aparser, af, format);
+ while (aparser.getSize() > 0)
+ {
+ System.out.println("Unknown arg: " + aparser.nextValue());
}
}
}
@@ -792,8 +915,7 @@ public class Jalview implements ApplicationSingletonI
}
startUpAlframe = new FileLoader(!headless)
- .loadFileWaitTillLoaded(file, protocol,
- format);
+ .loadFileWaitTillLoaded(file, protocol, format);
// extract groovy arguments before anything else.
}
@@ -821,6 +943,8 @@ public class Jalview implements ApplicationSingletonI
}
desktop.setInBatchMode(false);
}
+
+ return null;
}
private boolean checkStartVamas(ArgsParser aparser)
@@ -904,7 +1028,8 @@ public class Jalview implements ApplicationSingletonI
// the Jalview specific remnants can now be imported into the new
// session at the user's leisure.
Cache.log.info(
- "Skipping Push for import of data into existing vamsas session."); // TODO:
+ "Skipping Push for import of data into existing vamsas session.");
+ // TODO:
// enable
// this
// when
@@ -915,18 +1040,35 @@ public class Jalview implements ApplicationSingletonI
return haveImport;
}
- private void checkOutputFile(ArgsParser aparser, AlignFrame af,
+ /**
+ * Writes an output file for each format (if any) specified in the
+ * command-line arguments. Supported formats are currently
+ *