X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FWsJobParameters.java;h=9164cc00131931cdb23a61c3d082a717105aab75;hb=8a6fa9ea9900d0f106529c3f6283e7f9d76dd2cb;hp=09499ffde6168f132075c695b71a35262ce3d90e;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git

diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java
index 09499ff..9164cc0 100644
--- a/src/jalview/gui/WsJobParameters.java
+++ b/src/jalview/gui/WsJobParameters.java
@@ -125,6 +125,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
@@ -141,8 +142,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();
@@ -242,17 +246,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);
@@ -264,10 +274,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()
             {
 
@@ -276,7 +286,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()
             {
 
@@ -285,7 +296,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()
             {
 
@@ -295,7 +307,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)
@@ -303,20 +316,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());
@@ -360,7 +375,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
     SetNamePanel.add(setNameInfo);
     SetNamePanel.add(buttonArea);
     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));
@@ -374,23 +389,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);
@@ -886,12 +904,20 @@ public class WsJobParameters extends JPanel implements ItemListener,
       finfo = parm.getFurtherDetails();
       if (finfo != null)
       {
-        showDesc.setToolTipText("<html>"+JvSwingUtils.wrapTooltip("Click to show brief description<br><img src=\"" + linkImageURL + "\"/> Right click for further information.")+"</html>");
+        showDesc.setToolTipText("<html>"
+                + JvSwingUtils
+                        .wrapTooltip("Click to show brief description<br><img src=\""
+                                + linkImageURL
+                                + "\"/> Right click for further information.")
+                + "</html>");
         showDesc.addMouseListener(this);
       }
       else
       {
-        showDesc.setToolTipText("<html>"+JvSwingUtils.wrapTooltip("Click to show brief description.")+"</html>");
+        showDesc.setToolTipText("<html>"
+                + JvSwingUtils
+                        .wrapTooltip("Click to show brief description.")
+                + "</html>");
       }
       showDesc.addActionListener(new ActionListener()
       {
@@ -1239,7 +1265,9 @@ public class WsJobParameters extends JPanel implements ItemListener,
       {
         hasLink = true;
         // optlabel.setToolTipText("<html><p>"+opt.getDescription()+"</p><img src=\""+linkImageURL+"\"/></html>");
-        enabled.setToolTipText("<html>" + JvSwingUtils.wrapTooltip(opt.getDescription()+"<br><img src=\"" + linkImageURL + "\"/>")
+        enabled.setToolTipText("<html>"
+                + JvSwingUtils.wrapTooltip(opt.getDescription()
+                        + "<br><img src=\"" + linkImageURL + "\"/>")
                 + "</html>");
         // optlabel.addMouseListener(this);
         enabled.addMouseListener(this);
@@ -1247,7 +1275,9 @@ public class WsJobParameters extends JPanel implements ItemListener,
       else
       {
         // optlabel.setToolTipText(opt.getDescription());
-        enabled.setToolTipText("<html>"+JvSwingUtils.wrapTooltip(opt.getDescription())+"</html>");
+        enabled.setToolTipText("<html>"
+                + JvSwingUtils.wrapTooltip(opt.getDescription())
+                + "</html>");
       }
       add(enabled, BorderLayout.NORTH);
       if (opt.getPossibleValues().size() > 1)
@@ -1900,17 +1930,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;