X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalview.java;h=0fe16645fc85cd09e4c7b740d85fdb438cf7c9a0;hb=10e637daad8983c41db8679baabea5563d7371f4;hp=5bb5e9808f3a1af061b8f570fe6cc489f6acd18c;hpb=89cb45bd28a34f30e807efe12552268e3b5628b8;p=jalview.git
diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 5bb5e98..0fe1664 100755
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -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,13 +38,20 @@ 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
*
@@ -820,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);
@@ -830,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)
@@ -847,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
{
@@ -858,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[]
@@ -966,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;