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
Merge commit 'alpha/update_2_12_for_2_11_2_series_merge^2' into HEAD
[jalview.git]
/
src
/
jalview
/
gui
/
WsJobParameters.java
diff --git
a/src/jalview/gui/WsJobParameters.java
b/src/jalview/gui/WsJobParameters.java
index
c1a925d
..
83cc766
100644
(file)
--- 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<ArgumentI> jobArgset)
{
super();
WsParamSetI preset, List<ArgumentI> jobArgset)
{
super();
-
// parameters dialog in 'expanded' format (help text boxes)
opanp = new OptsAndParamsPage(this, false);
// parameters dialog in 'expanded' format (help text boxes)
opanp = new OptsAndParamsPage(this, false);
-
jbInit();
this.paramStore = paramStorei;
if (paramStore == null && service != null)
jbInit();
this.paramStore = paramStorei;
if (paramStore == null && service != null)
@@
-205,6
+203,7
@@
public class WsJobParameters extends JPanel implements ItemListener,
validate();
}
validate();
}
+
/**
* Shows a modal dialog containing the parameters and Start or Cancel options.
* Answers true if the job is started, false if cancelled.
/**
* 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<Boolean> showRunDialog()
{
*/
public CompletionStage<Boolean> showRunDialog()
{
+ // Should JFrame hahve a parent of getDesktop ?
frame = new JFrame();
frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
if (service != null)
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);
});
frame.setVisible(true);
+
return completionStage;
}
return completionStage;
}
@@
-359,7
+360,6
@@
public class WsJobParameters extends JPanel implements ItemListener,
paramPane.getViewport().setView(jp);
paramPane.setBorder(null);
setLayout(new BorderLayout());
paramPane.getViewport().setView(jp);
paramPane.setBorder(null);
setLayout(new BorderLayout());
-
JPanel jobPanel = new JPanel();
jobPanel.setPreferredSize(null);
jobPanel.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);
}
exnames.put(SVC_DEF, SVC_DEF);
servicePresets.put(SVC_DEF, SVC_DEF);
}
-
// String curname = (p == null ? "" : p.getName());
for (WsParamSetI pr : paramStore.getPresets())
{
// String curname = (p == null ? "" : p.getName());
for (WsParamSetI pr : paramStore.getPresets())
{
@@
-520,6
+519,7
@@
public class WsJobParameters extends JPanel implements ItemListener,
}
}
settingDialog = false;
}
}
settingDialog = false;
+
}
private void updateTable(WsParamSetI p, List<ArgumentI> jobArgset)
}
private void updateTable(WsParamSetI p, List<ArgumentI> jobArgset)
@@
-629,6
+629,7
@@
public class WsJobParameters extends JPanel implements ItemListener,
return modifiedElements.size() > 0;
}
return modifiedElements.size() > 0;
}
+
/**
* reset gui and modification state settings
*/
/**
* reset gui and modification state settings
*/
@@
-868,6
+869,8
@@
public class WsJobParameters extends JPanel implements ItemListener,
paramPane.revalidate();
revalidate();
}
paramPane.revalidate();
revalidate();
}
+
+
public boolean isServiceDefaults()
{
return (!isModified()
public boolean isServiceDefaults()
{
return (!isModified()
@@
-879,6
+882,7
@@
public class WsJobParameters extends JPanel implements ItemListener,
return opanp.getCurrentSettings();
}
return opanp.getCurrentSettings();
}
+
/*
* Hashtable<String, Object[]> editedParams = new Hashtable<String,
* Object[]>();
/*
* Hashtable<String, Object[]> editedParams = new Hashtable<String,
* Object[]>();
@@
-1019,8
+1023,8
@@
public class WsJobParameters extends JPanel implements ItemListener,
&& e.getStateChange() == ItemEvent.SELECTED)
{
final String setname = (String) setName.getSelectedItem();
&& 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
if (settingDialog)
{
// ignore event