git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated with latest from mchmmer branch
[jalview.git]
/
src
/
jalview
/
bin
/
Jalview.java
diff --git
a/src/jalview/bin/Jalview.java
b/src/jalview/bin/Jalview.java
index
9ec0033
..
bc93c37
100755
(executable)
--- a/
src/jalview/bin/Jalview.java
+++ b/
src/jalview/bin/Jalview.java
@@
-20,9
+20,6
@@
*/
package jalview.bin;
*/
package jalview.bin;
-import groovy.lang.Binding;
-import groovy.util.GroovyScriptEngine;
-
import jalview.ext.so.SequenceOntology;
import jalview.gui.AlignFrame;
import jalview.gui.Desktop;
import jalview.ext.so.SequenceOntology;
import jalview.gui.AlignFrame;
import jalview.gui.Desktop;
@@
-66,6
+63,9
@@
import java.util.Vector;
import javax.swing.UIManager;
import javax.swing.UIManager;
+import groovy.lang.Binding;
+import groovy.util.GroovyScriptEngine;
+
/**
* Main class for Jalview Application <br>
* <br>
/**
* Main class for Jalview Application <br>
* <br>
@@
-175,6
+175,8
@@
public class Jalview
*
* @param args
* open <em>filename</em>
*
* @param args
* open <em>filename</em>
+ * @throws InterruptedException
+ * @throws IOException
*/
public static void main(String[] args)
{
*/
public static void main(String[] args)
{
@@
-184,6
+186,8
@@
public class Jalview
/**
* @param args
/**
* @param args
+ * @throws InterruptedException
+ * @throws IOException
*/
void doMain(String[] args)
{
*/
void doMain(String[] args)
{
@@
-970,7
+974,7
@@
public class Jalview
}
try
{
}
try
{
- Map<String, Object> vbinding = new HashMap<String, Object>();
+ Map<String, Object> vbinding = new HashMap<>();
vbinding.put("Jalview", this);
if (af != null)
{
vbinding.put("Jalview", this);
if (af != null)
{
@@
-1036,7
+1040,7
@@
public class Jalview
+ nickname + "|" + url);
if (source == null)
{
+ nickname + "|" + url);
if (source == null)
{
- source = new Vector<String>();
+ source = new Vector<>();
}
source.addElement(nickname);
}
}
source.addElement(nickname);
}
@@
-1054,7
+1058,7
@@
public class Jalview
System.out.println("adding source '" + data + "'");
if (source == null)
{
System.out.println("adding source '" + data + "'");
if (source == null)
{
- source = new Vector<String>();
+ source = new Vector<>();
}
source.addElement(data);
}
}
source.addElement(data);
}