X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FWsJobParameters.java;h=440a7148dea737885f736043e5b29f5d7a5d6f33;hb=c42398f840e2a6709c5ccc45f84de2a12011c90a;hp=918724c8c842606bbd9c326ab21fbfef8bebd01d;hpb=d09be4494b8e9402ae3d2980a1b516829dfaf9e1;p=jalview.git
diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java
index 918724c..440a714 100644
--- a/src/jalview/gui/WsJobParameters.java
+++ b/src/jalview/gui/WsJobParameters.java
@@ -1,3 +1,20 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ */
package jalview.gui;
import java.awt.BorderLayout;
@@ -6,6 +23,8 @@ import java.awt.Component;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
import java.awt.GridLayout;
import java.awt.Rectangle;
import java.awt.event.ActionEvent;
@@ -108,6 +127,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
ActionListener, DocumentListener
{
URL linkImageURL = getClass().getResource("/images/link.gif");
+
private static final String SVC_DEF = "Defaults"; // this is the null
// parameter set as shown to
// user
@@ -124,8 +144,11 @@ public class WsJobParameters extends JPanel implements ItemListener,
JSplitPane settingsPanel = new JSplitPane();
JSplitPane jobPanel = new JSplitPane();
- boolean split=true;
- JTabbedPane tabpanels=new JTabbedPane();
+
+ boolean split = true;
+
+ JTabbedPane tabpanels = new JTabbedPane();
+
JPanel jobOptions = new JPanel();
JScrollPane jobOptionsPane = new JScrollPane();
@@ -225,17 +248,23 @@ public class WsJobParameters extends JPanel implements ItemListener,
(int) (deskr.getCenterY() - 250), 480, 500));
frame.setContentPane(this);
// should recover defaults from user prefs.
- //settingsPanel.setDividerLocation(0.4);
- //jobPanel.setDividerLocation(0.5);
+ // settingsPanel.setDividerLocation(0.4);
+ // jobPanel.setDividerLocation(0.5);
frame.validate();
- if (split) {
- javax.swing.SwingUtilities.invokeLater(new Runnable() {
- public void run() {
+ if (split)
+ {
+ javax.swing.SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
settingsPanel.setDividerLocation(0.5);
- jobPanel.setDividerLocation(setDescr.getLineCount()>3 ? 0.35 : 0.16 );
+ jobPanel.setDividerLocation(setDescr.getLineCount() > 3 ? 0.35
+ : 0.16);
}
});
- } else {
+ }
+ else
+ {
tabpanels.setSelectedComponent(jobOptionsPane);
}
frame.setVisible(true);
@@ -247,10 +276,10 @@ public class WsJobParameters extends JPanel implements ItemListener,
return false;
}
-
private void jbInit()
{
- updatepref = JvSwingUtils.makeButton("Update", "Update this existing user parameter set.",
+ updatepref = JvSwingUtils.makeButton("Update",
+ "Update this existing user parameter set.",
new ActionListener()
{
@@ -259,7 +288,8 @@ public class WsJobParameters extends JPanel implements ItemListener,
update_actionPerformed(e);
}
});
- deletepref = JvSwingUtils.makeButton("Delete", "Delete the currently selected user parameter set.",
+ deletepref = JvSwingUtils.makeButton("Delete",
+ "Delete the currently selected user parameter set.",
new ActionListener()
{
@@ -268,7 +298,8 @@ public class WsJobParameters extends JPanel implements ItemListener,
delete_actionPerformed(e);
}
});
- createpref = JvSwingUtils.makeButton("Create", "Create a new parameter set with the current settings.",
+ createpref = JvSwingUtils.makeButton("Create",
+ "Create a new parameter set with the current settings.",
new ActionListener()
{
@@ -278,7 +309,8 @@ public class WsJobParameters extends JPanel implements ItemListener,
}
});
revertpref = JvSwingUtils.makeButton("Revert",
- "Undo all changes to the current parameter set", new ActionListener()
+ "Undo all changes to the current parameter set",
+ new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -286,20 +318,22 @@ public class WsJobParameters extends JPanel implements ItemListener,
revert_actionPerformed(e);
}
});
- startjob = JvSwingUtils.makeButton("Start Job", "Start Job with current settings.",new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- startjob_actionPerformed(e);
- }
- });
- canceljob = JvSwingUtils.makeButton("Cancel Job", "Close this dialog and cancel job.", new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- canceljob_actionPerformed(e);
- }
- });
+ startjob = JvSwingUtils.makeButton("Start Job",
+ "Start Job with current settings.", new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ startjob_actionPerformed(e);
+ }
+ });
+ canceljob = JvSwingUtils.makeButton("Cancel Job",
+ "Close this dialog and cancel job.", new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ canceljob_actionPerformed(e);
+ }
+ });
setDetails.setBorder(new TitledBorder("Details"));
setDetails.setLayout(new BorderLayout());
@@ -317,8 +351,9 @@ public class WsJobParameters extends JPanel implements ItemListener,
setName.addItemListener(this);
setName.getEditor().addActionListener(this);
JPanel setNameInfo = new JPanel(new FlowLayout(FlowLayout.LEFT));
- SetNamePanel.setLayout(new GridLayout(2, 1));
- SetNamePanel.setMinimumSize(new Dimension(300, 40));
+ GridBagLayout gbl = new GridBagLayout();
+ SetNamePanel.setLayout(gbl);
+ SetNamePanel.setMinimumSize(new Dimension(300, 60));
JLabel setNameLabel = new JLabel("Current parameter set name :");
setNameLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
// setNameLabel.setHorizontalAlignment(FlowLayout.LEFT);
@@ -341,9 +376,17 @@ public class WsJobParameters extends JPanel implements ItemListener,
JPanel buttonArea = new JPanel(new GridLayout(1, 1));
buttonArea.add(setsavebuts);
SetNamePanel.add(setNameInfo);
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridheight = 2;
+ gbl.setConstraints(setNameInfo, gbc);
SetNamePanel.add(buttonArea);
+ gbc = new GridBagConstraints();
+ gbc.gridx=0;
+ gbc.gridy=2;
+ gbc.gridheight = 1;
+ gbl.setConstraints(buttonArea, gbc);
setDetails.add(setDescrView, BorderLayout.CENTER);
- //setDetails.setPreferredSize(new Dimension(360, 100));
+ // setDetails.setPreferredSize(new Dimension(360, 100));
jobParameters.setBorder(new TitledBorder("Parameters"));
jobParameters.setLayout(new BorderLayout());
paramPane.setPreferredSize(new Dimension(360, 300));
@@ -357,23 +400,26 @@ public class WsJobParameters extends JPanel implements ItemListener,
jobOptionsPanel.setBorder(new TitledBorder("Options"));
jobOptionsPane.getViewport().setView(jobOptions);
jobOptionsPanel.add(jobOptionsPane, BorderLayout.CENTER);
-
+
setLayout(new BorderLayout());
jobPanel.setLeftComponent(setDetails);
- if (split) {
+ if (split)
+ {
settingsPanel.setLeftComponent(jobOptionsPanel);
settingsPanel.setRightComponent(jobParameters);
settingsPanel.setOrientation(JSplitPane.VERTICAL_SPLIT);
jobPanel.setRightComponent(settingsPanel);
- } else {
- jobPanel.setRightComponent(tabpanels);
- jobOptionsPane.setName("Options");
- tabpanels.add(jobOptionsPane);
- paramPane.setName("Parameters");
- tabpanels.add(paramPane);
+ }
+ else
+ {
+ jobPanel.setRightComponent(tabpanels);
+ jobOptionsPane.setName("Options");
+ tabpanels.add(jobOptionsPane);
+ paramPane.setName("Parameters");
+ tabpanels.add(paramPane);
}
jobPanel.setOrientation(JSplitPane.VERTICAL_SPLIT);
- add(SetNamePanel, BorderLayout.NORTH);
+ add(SetNamePanel, BorderLayout.NORTH);
add(jobPanel, BorderLayout.CENTER);
JPanel dialogpanel = new JPanel();
dialogpanel.add(startjob);
@@ -620,7 +666,9 @@ public class WsJobParameters extends JPanel implements ItemListener,
jobOptions.setPreferredSize(new Dimension(PARAM_WIDTH, optSet.size()
* OPTSET_HEIGHT));
- jobOptions.setLayout(new GridLayout(optSet.size(), 1));
+ FlowLayout fl;
+ jobOptions.setLayout(fl=new FlowLayout(FlowLayout.LEFT));
+
refreshParamLayout();
paramPane.validate();
revalidate();
@@ -869,12 +917,20 @@ public class WsJobParameters extends JPanel implements ItemListener,
finfo = parm.getFurtherDetails();
if (finfo != null)
{
- showDesc.setToolTipText(""+JvSwingUtils.wrapTooltip("Click to show brief description
Right click for further information.")+"");
+ showDesc.setToolTipText(""
+ + JvSwingUtils
+ .wrapTooltip("Click to show brief description
Right click for further information.")
+ + "");
showDesc.addMouseListener(this);
}
else
{
- showDesc.setToolTipText(""+JvSwingUtils.wrapTooltip("Click to show brief description.")+"");
+ showDesc.setToolTipText(""
+ + JvSwingUtils
+ .wrapTooltip("Click to show brief description.")
+ + "");
}
showDesc.addActionListener(new ActionListener()
{
@@ -1222,7 +1278,9 @@ public class WsJobParameters extends JPanel implements ItemListener,
{
hasLink = true;
// optlabel.setToolTipText("
"+opt.getDescription()+"
");
- enabled.setToolTipText("" + JvSwingUtils.wrapTooltip(opt.getDescription()+"
")
+ enabled.setToolTipText(""
+ + JvSwingUtils.wrapTooltip(opt.getDescription()
+ + "
")
+ "");
// optlabel.addMouseListener(this);
enabled.addMouseListener(this);
@@ -1230,7 +1288,9 @@ public class WsJobParameters extends JPanel implements ItemListener,
else
{
// optlabel.setToolTipText(opt.getDescription());
- enabled.setToolTipText(""+JvSwingUtils.wrapTooltip(opt.getDescription())+"");
+ enabled.setToolTipText(""
+ + JvSwingUtils.wrapTooltip(opt.getDescription())
+ + "");
}
add(enabled, BorderLayout.NORTH);
if (opt.getPossibleValues().size() > 1)
@@ -1883,17 +1943,22 @@ public class WsJobParameters extends JPanel implements ItemListener,
String msg = null;
if (isServicePreset(newname))
{
- final String oldname = curSetName!=null ? curSetName : lastParmSet;
- final Component ourframe=this;
- settingDialog=true;
+ final String oldname = curSetName != null ? curSetName
+ : lastParmSet;
+ final Component ourframe = this;
+ settingDialog = true;
setName.getEditor().setItem(oldname);
- settingDialog=false;
- javax.swing.SwingUtilities.invokeLater(new Runnable() {public void run() {
- JOptionPane.showMessageDialog(ourframe,
- "Invalid name - preset already exists.", "Invalid name",
- JOptionPane.WARNING_MESSAGE);
- }});
-
+ settingDialog = false;
+ javax.swing.SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ JOptionPane.showMessageDialog(ourframe,
+ "Invalid name - preset already exists.",
+ "Invalid name", JOptionPane.WARNING_MESSAGE);
+ }
+ });
+
return;
}
curSetName = newname;
@@ -1957,4 +2022,4 @@ public class WsJobParameters extends JPanel implements ItemListener,
return paramStore.getPreset(lastParmSet);
}
}
-}
\ No newline at end of file
+}