X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalview.java;h=0fe16645fc85cd09e4c7b740d85fdb438cf7c9a0;hb=fe72160257543fca39f7959fc1347665e95764a2;hp=e5a22e046d5dc23600c27803038c53521432b4d1;hpb=afcdc36e5f65333f8ff9ca3229b6cffdb27edca7;p=jalview.git
diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index e5a22e0..0fe1664 100755
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -1,6 +1,6 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
@@ -20,13 +20,6 @@
*/
package jalview.bin;
-import jalview.gui.AlignFrame;
-import jalview.gui.Desktop;
-import jalview.io.HtmlSvgOutput;
-import jalview.util.MessageManager;
-import jalview.util.Platform;
-import jalview.ws.jws2.Jws2Discoverer;
-
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.BufferedReader;
@@ -45,11 +38,19 @@ import java.security.CodeSource;
import java.security.PermissionCollection;
import java.security.Permissions;
import java.security.Policy;
-import java.util.Hashtable;
+import java.util.HashMap;
import java.util.Map;
import java.util.Vector;
import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+
+import jalview.gui.AlignFrame;
+import jalview.gui.Desktop;
+import jalview.io.HtmlSvgOutput;
+import jalview.util.MessageManager;
+import jalview.util.Platform;
+import jalview.ws.jws2.Jws2Discoverer;
/**
* Main class for Jalview Application
@@ -80,11 +81,6 @@ public class Jalview
}
/**
- * Put protein=true for get a protein example
- */
- private static boolean protein = false;
-
- /**
* main class for Jalview application
*
* @param args
@@ -97,12 +93,23 @@ public class Jalview
System.out.println(System.getProperty("os.arch") + " "
+ System.getProperty("os.name") + " "
+ System.getProperty("os.version"));
- if (new Platform().isAMac())
- {
- System.setProperty("com.apple.mrj.application.apple.menu.about.name",
- "Jalview");
- System.setProperty("apple.laf.useScreenMenuBar", "true");
- }
+ // if (new Platform().isAMac())
+ // {
+ // // System.setProperty("com.apple.mrj.application.apple.menu.about.name",
+ // // "Jalview");
+ // // System.setProperty("apple.laf.useScreenMenuBar", "true");
+ // try
+ // {
+ // UIManager.setLookAndFeel(ch.randelshofer.quaqua.QuaquaManager
+ // .getLookAndFeel());
+ // System.out
+ // .println("--------------------------------------------> in here");
+ // } catch (UnsupportedLookAndFeelException e)
+ // {
+ // // TODO Auto-generated catch block
+ // e.printStackTrace();
+ // }
+ // }
ArgsParser aparser = new ArgsParser(args);
boolean headless = false;
@@ -178,6 +185,21 @@ public class Jalview
} catch (Exception ex)
{
}
+ if (new Platform().isAMac())
+ {
+ System.setProperty("com.apple.mrj.application.apple.menu.about.name",
+ "Jalview");
+ System.setProperty("apple.laf.useScreenMenuBar", "true");
+ try
+ {
+ UIManager.setLookAndFeel(ch.randelshofer.quaqua.QuaquaManager
+ .getLookAndFeel());
+ } catch (UnsupportedLookAndFeelException e)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
if (!headless)
{
@@ -403,6 +425,10 @@ public class Jalview
{
af.getViewport().setSortByTree(true);
}
+ if (aparser.contains("no-annotation"))
+ {
+ af.getViewport().setShowAnnotation(false);
+ }
if (aparser.contains("nosortbytree"))
{
af.getViewport().setSortByTree(false);
@@ -536,8 +562,7 @@ public class Jalview
// ////////////////////
if (!headless && file == null && vamsasImport == null
- && jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true)
- && protein == true)
+ && jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true))
{
file = jalview.bin.Cache.getDefault(
"STARTUP_FILE",
@@ -669,7 +694,7 @@ public class Jalview
public void run()
{
Cache.log
- .info("Initialising googletracker for usage stats.");
+ .debug("Initialising googletracker for usage stats.");
Cache.initGoogleTracker();
Cache.log.debug("Tracking enabled.");
}
@@ -677,7 +702,7 @@ public class Jalview
{
public void run()
{
- Cache.log.info("Not enabling Google Tracking.");
+ Cache.log.debug("Not enabling Google Tracking.");
}
}, null, true);
desktop.addDialogThread(prompter);
@@ -795,7 +820,7 @@ public class Jalview
* = new Binding(); binding.setVariable("input", "world");
* gse.run("hello.groovy", binding);
*/
- Class[] bspec;
+ Class>[] bspec;
Object[] binding;
int blen = ((jalviewContext[0] == null) ? 0 : 1)
+ ((jalviewContext[1] == null) ? 0 : 1);
@@ -805,7 +830,7 @@ public class Jalview
binding = new Object[blen * 2];
blen = 0;
ClassLoader cl = null;
- Map vbinding = new Hashtable();
+ Map vbinding = new HashMap();
for (int jc = 0; jc < jalviewContext.length; jc++)
{
if (jalviewContext[jc] != null)
@@ -822,8 +847,8 @@ public class Jalview
blen++;
}
}
- Class gbindingc = cl.loadClass("groovy.lang.Binding");
- Constructor gbcons;
+ Class> gbindingc = cl.loadClass("groovy.lang.Binding");
+ Constructor> gbcons;
Object gbinding;
try
{
@@ -833,15 +858,15 @@ public class Jalview
{
// old style binding config - using series of string/object values to
// setVariable.
- gbcons = gbindingc.getConstructor(null);
- gbinding = gbcons.newInstance(null);
+ gbcons = gbindingc.getConstructor();
+ gbinding = gbcons.newInstance();
java.lang.reflect.Method setvar = gbindingc.getMethod(
"setVariable", bspec);
setvar.invoke(gbinding, binding);
}
- ;
- Class gsec = cl.loadClass("groovy.util.GroovyScriptEngine");
- Constructor gseccons = gsec.getConstructor(new Class[]
+
+ Class> gsec = cl.loadClass("groovy.util.GroovyScriptEngine");
+ Constructor> gseccons = gsec.getConstructor(new Class[]
{ URL[].class }); // String[].class });
Object gse = gseccons.newInstance(new Object[]
{ new URL[]
@@ -941,7 +966,7 @@ public class Jalview
private static FeatureFetcher startFeatureFetching(final Vector dasSources)
{
FeatureFetcher ff = new FeatureFetcher();
- AlignFrame afs[] = Desktop.getAlignframes();
+ AlignFrame afs[] = Desktop.getAlignFrames();
if (afs == null || afs.length == 0)
{
return null;