X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FRestServiceEditorPane.java;h=213a979c5e3eaf74176a186d2997dc2d4fca5713;hb=0751c58086542f9e0466201b624f84d1efd547bb;hp=2e2593b0b8a3fad6904c4b7768231912c0373a38;hpb=3d0101179759ef157b088ea135423cd909512d9f;p=jalview.git diff --git a/src/jalview/gui/RestServiceEditorPane.java b/src/jalview/gui/RestServiceEditorPane.java index 2e2593b..213a979 100644 --- a/src/jalview/gui/RestServiceEditorPane.java +++ b/src/jalview/gui/RestServiceEditorPane.java @@ -147,9 +147,9 @@ public class RestServiceEditorPane extends GRestServiceEditorPane } - Vector _iparam = new Vector(); + Vector _iparam = new Vector<>(); - Vector _rparam = new Vector(); + Vector _rparam = new Vector<>(); /** * generate an editable URL service string and parameter list using the @@ -351,7 +351,7 @@ public class RestServiceEditorPane extends GRestServiceEditorPane private boolean updateServiceFromGui() { - Map inputTypes = new HashMap(); + Map inputTypes = new HashMap<>(); StringBuffer warnings = new StringBuffer(); for (String its : _iparam) { @@ -455,6 +455,10 @@ public class RestServiceEditorPane extends GRestServiceEditorPane } + /** + * @j2sIgnore + * @param args + */ public static void main(String[] args) { if (args.length == 0) @@ -463,6 +467,7 @@ public class RestServiceEditorPane extends GRestServiceEditorPane { boolean visible = true; + @Override public void run() { boolean nulserv = true; @@ -471,10 +476,13 @@ public class RestServiceEditorPane extends GRestServiceEditorPane final Thread runner = Thread.currentThread(); JFrame df = new JFrame(); df.getContentPane().setLayout(new BorderLayout()); - df.getContentPane().add((nulserv = !nulserv) - ? new RestServiceEditorPane(jalview.ws.rest.RestClient - .makeShmmrRestClient().getRestDescription()) - : new RestServiceEditorPane(), BorderLayout.CENTER); + df.getContentPane().add( + (nulserv = !nulserv) ? new RestServiceEditorPane( + jalview.ws.rest.clientdefs.ShmrRestClient + .makeShmmrRestClient() + .getRestDescription()) + : new RestServiceEditorPane(), + BorderLayout.CENTER); df.setBounds(100, 100, 600, 400); df.addComponentListener(new ComponentListener() { @@ -514,7 +522,6 @@ public class RestServiceEditorPane extends GRestServiceEditorPane } catch (Exception x) { } - ; } visible = true; }