X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FWsJobParameters.java;h=83cc76693c89085b699a0cf5f8bc6f7048453da5;hb=304e64fb34b32659be1bbfd39fb4e15b2f79586e;hp=c1a925d1ca57249c3f2ea72deb21ed98f991ab9c;hpb=cfb79b69d9fa44595560659bd95d1d1cd27677ad;p=jalview.git diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java index c1a925d..83cc766 100644 --- a/src/jalview/gui/WsJobParameters.java +++ b/src/jalview/gui/WsJobParameters.java @@ -190,10 +190,8 @@ public class WsJobParameters extends JPanel implements ItemListener, WsParamSetI preset, List jobArgset) { super(); - // parameters dialog in 'expanded' format (help text boxes) opanp = new OptsAndParamsPage(this, false); - jbInit(); this.paramStore = paramStorei; if (paramStore == null && service != null) @@ -205,6 +203,7 @@ public class WsJobParameters extends JPanel implements ItemListener, validate(); } + /** * Shows a modal dialog containing the parameters and Start or Cancel options. * Answers true if the job is started, false if cancelled. @@ -213,6 +212,7 @@ public class WsJobParameters extends JPanel implements ItemListener, */ public CompletionStage showRunDialog() { + // Should JFrame hahve a parent of getDesktop ? frame = new JFrame(); frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); if (service != null) @@ -242,6 +242,7 @@ public class WsJobParameters extends JPanel implements ItemListener, }); frame.setVisible(true); + return completionStage; } @@ -359,7 +360,6 @@ public class WsJobParameters extends JPanel implements ItemListener, paramPane.getViewport().setView(jp); paramPane.setBorder(null); setLayout(new BorderLayout()); - JPanel jobPanel = new JPanel(); jobPanel.setPreferredSize(null); jobPanel.setLayout(new BorderLayout()); @@ -479,7 +479,6 @@ public class WsJobParameters extends JPanel implements ItemListener, exnames.put(SVC_DEF, SVC_DEF); servicePresets.put(SVC_DEF, SVC_DEF); } - // String curname = (p == null ? "" : p.getName()); for (WsParamSetI pr : paramStore.getPresets()) { @@ -520,6 +519,7 @@ public class WsJobParameters extends JPanel implements ItemListener, } } settingDialog = false; + } private void updateTable(WsParamSetI p, List jobArgset) @@ -629,6 +629,7 @@ public class WsJobParameters extends JPanel implements ItemListener, return modifiedElements.size() > 0; } + /** * reset gui and modification state settings */ @@ -868,6 +869,8 @@ public class WsJobParameters extends JPanel implements ItemListener, paramPane.revalidate(); revalidate(); } + + public boolean isServiceDefaults() { return (!isModified() @@ -879,6 +882,7 @@ public class WsJobParameters extends JPanel implements ItemListener, return opanp.getCurrentSettings(); } + /* * Hashtable editedParams = new Hashtable(); @@ -1019,8 +1023,8 @@ public class WsJobParameters extends JPanel implements ItemListener, && e.getStateChange() == ItemEvent.SELECTED) { final String setname = (String) setName.getSelectedItem(); - // System.out.println("Item state changed for " + setname - // + " (handling ? " + !settingDialog + ")"); + System.out.println("Item state changed for " + setname + + " (handling ? " + !settingDialog + ")"); if (settingDialog) { // ignore event