Changeset 3874

Timestamp:

Sep 29, 2010, 11:58:11 AM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removed method getMascotResultRetrievalForm from FormFactory and placed it within the one action that uses it.

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/directory/MascotResultRetrievalExtension.java (modified) (5 diffs)
• gui/form/FormFactory.java (modified) (1 diff)

trunk/client/servlet/src/org/proteios/action/directory/MascotResultRetrievalExtension.java

@@ -24 +24 @@
 package org.proteios.action.directory;
 
+import org.proteios.MascotPropertiesFile;
 import org.proteios.ActionLink;
 import org.proteios.Context;
@@ -34 +35 @@
 import org.proteios.gui.Title;
 import org.proteios.gui.Toolbar;
-import org.proteios.gui.form.Form;
-import org.proteios.gui.form.FormFactory;
+import org.proteios.gui.form.*;
 import org.proteios.gui.layout.RowLayout;
 
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
+import se.lu.thep.waf.constraints.VString;
+import se.lu.thep.waf.constraints.VBoolean;
+import se.lu.thep.waf.constraints.VInteger;
 
 import java.util.ArrayList;
@@ -55 +58 @@
     implements ContextEnabled
 {
+
+  public static final VInteger VDIRID = new VInteger("dirId", 1, true);
 
   @Override
@@ -97 +102 @@
      * retrieving search result files from a Mascot server.
      */
-    Form impForm = getFormFactory().getMascotResultRetrievalForm(dir);
+    Form impForm = getMascotResultRetrievalForm(dir);
     /*
      * Add the tool bar with one button labeled 'Next' to the form.
@@ -113 +118 @@
     layout.add(impForm);
     setLayout(layout);
+  }
+
+
+  /**
+   * Form for setting parameters for Mascot result retrieval.
+   * 
+   * @param dir Directory Directory to put retrieved Mascot result files in.
+   * @return Form A form for setting Mascot result retrieval parameters.
+   */
+  public Form getMascotResultRetrievalForm(Directory dir)
+  {
+    Form form = new Form("MascotResultRetrieval");
+    form.setTitle("MascotResultRetrieval");
+    Fieldset fs = new Fieldset();
+    fs.setTitle("MascotResultRetrievalParameters");
+    // Get Mascot server URL string from Mascot properties file
+    MascotPropertiesFile pf = new MascotPropertiesFile();
+    String mascotServerURLStr = pf.getProperty("mascot.server.url");
+    // Mascot server URL string (disabled)
+    TextField<String> mascotServerUrlF = new DummyField();
+    mascotServerUrlF.setDisabled(true);
+    mascotServerUrlF.setLabel("MascotServerURL");
+    fs.add(mascotServerUrlF);
+    mascotServerUrlF.setValue(mascotServerURLStr);
+    // Mascot output directory (disabled)
+    TextField<String> dirF = new DummyField();
+    dirF.setDisabled(true);
+    dirF.setLabel("MascotOutputDirectory");
+    fs.add(dirF);
+    dirF.setValue(dir.getName());
+    // Mascot output directory id (hidden)
+    TextField<Integer> dirIdF = new TextField<Integer>(VDIRID);
+    dirIdF.setHidden(true);
+    dirIdF.setLabel("MascotOutputDirectoryId");
+    fs.add(dirIdF);
+    dirIdF.setValue(dir.getId());
+    // Mascot result date
+    TextField<String> dateF = new TextField<String>(MascotResultRetrieval.VMASCOTRESULTDATE);
+    dateF.setLabel("MascotResultDate");
+    fs.add(dateF);
+    dateF.setValue("");
+    // Mascot first search number
+    TextField<Integer> firstSearchNumberF = new TextField<Integer>(MascotResultRetrieval.VMASCOTFIRSTSEARCHNUMBER);
+    firstSearchNumberF.setLabel("MascotFirstSearchNumber");
+    fs.add(firstSearchNumberF);
+    firstSearchNumberF.setValue(null);
+    // Mascot last search number
+    TextField<Integer> lastSearchNumberF = new TextField<Integer>(MascotResultRetrieval.VMASCOTLASTSEARCHNUMBER);
+    lastSearchNumberF.setLabel("MascotLastSearchNumber");
+    fs.add(lastSearchNumberF);
+    lastSearchNumberF.setValue(null);
+    // Mascot export show unassigned flag
+    Checkbox<VBoolean> showUnassignedCB = new Checkbox<VBoolean>(
+      MascotResultRetrieval.VMASCOTSHOWUNASSIGNED);
+    showUnassignedCB.setLabel("MascotShowUnassigned");
+    showUnassignedCB.setValue("true");
+    showUnassignedCB.isChecked(false);
+    fs.add(showUnassignedCB);
+    // Mascot export show unassigned flag
+    Checkbox<VBoolean> queryPeaksCB = new Checkbox<VBoolean>(
+      MascotResultRetrieval.VMASCOTQUERYPEAKS);
+    queryPeaksCB.setLabel("MascotQueryPeaks");
+    queryPeaksCB.setValue("true");
+    queryPeaksCB.isChecked(false);
+    fs.add(queryPeaksCB);
+    //
+    form.addFieldset(fs);
+    return form;
   }
 

trunk/client/servlet/src/org/proteios/gui/form/FormFactory.java

@@ -2211 +2211 @@
 
  //Cleaning up from here
-
-
-
-  /**
-   * Form for setting parameters for Mascot result retrieval.
-   * 
-   * @param dir Directory Directory to put retrieved Mascot result files in.
-   * @return Form A form for setting Mascot result retrieval parameters.
-   */
-  public Form getMascotResultRetrievalForm(Directory dir)
-  {
-    Form form = new Form("MascotResultRetrieval");
-    form.setTitle("MascotResultRetrieval");
-    Fieldset fs = new Fieldset();
-    fs.setTitle("MascotResultRetrievalParameters");
-    // Get Mascot server URL string from Mascot properties file
-    MascotPropertiesFile pf = new MascotPropertiesFile();
-    String mascotServerURLStr = pf.getProperty("mascot.server.url");
-    // Mascot server URL string (disabled)
-    TextField<String> mascotServerUrlF = new DummyField();
-    mascotServerUrlF.setDisabled(true);
-    mascotServerUrlF.setLabel("MascotServerURL");
-    fs.add(mascotServerUrlF);
-    mascotServerUrlF.setValue(mascotServerURLStr);
-    // Mascot output directory (disabled)
-    TextField<String> dirF = new DummyField();
-    dirF.setDisabled(true);
-    dirF.setLabel("MascotOutputDirectory");
-    fs.add(dirF);
-    dirF.setValue(dir.getName());
-    // Mascot output directory id (hidden)
-    TextField<Integer> dirIdF = new TextField<Integer>(VDIRID);
-    dirIdF.setHidden(true);
-    dirIdF.setLabel("MascotOutputDirectoryId");
-    fs.add(dirIdF);
-    dirIdF.setValue(dir.getId());
-    // Mascot result date
-    TextField<String> dateF = new TextField<String>(MascotResultRetrieval.VMASCOTRESULTDATE);
-    dateF.setLabel("MascotResultDate");
-    fs.add(dateF);
-    dateF.setValue("");
-    // Mascot first search number
-    TextField<Integer> firstSearchNumberF = new TextField<Integer>(MascotResultRetrieval.VMASCOTFIRSTSEARCHNUMBER);
-    firstSearchNumberF.setLabel("MascotFirstSearchNumber");
-    fs.add(firstSearchNumberF);
-    firstSearchNumberF.setValue(null);
-    // Mascot last search number
-    TextField<Integer> lastSearchNumberF = new TextField<Integer>(MascotResultRetrieval.VMASCOTLASTSEARCHNUMBER);
-    lastSearchNumberF.setLabel("MascotLastSearchNumber");
-    fs.add(lastSearchNumberF);
-    lastSearchNumberF.setValue(null);
-    // Mascot export show unassigned flag
-    Checkbox<VBoolean> showUnassignedCB = new Checkbox<VBoolean>(
-      MascotResultRetrieval.VMASCOTSHOWUNASSIGNED);
-    showUnassignedCB.setLabel("MascotShowUnassigned");
-    showUnassignedCB.setValue("true");
-    showUnassignedCB.isChecked(false);
-    fs.add(showUnassignedCB);
-    // Mascot export show unassigned flag
-    Checkbox<VBoolean> queryPeaksCB = new Checkbox<VBoolean>(
-      MascotResultRetrieval.VMASCOTQUERYPEAKS);
-    queryPeaksCB.setLabel("MascotQueryPeaks");
-    queryPeaksCB.setValue("true");
-    queryPeaksCB.isChecked(false);
-    fs.add(queryPeaksCB);
-    //
-    form.addFieldset(fs);
-    return form;
-  }