Changeset 3838

Timestamp:

Sep 8, 2010, 1:43:59 PM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Using OrganisationField and NextButtonNameField

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/directory/ViewActiveDirectory.java (modified) (4 diffs)
• action/file/PerformMascotSearch.java (modified) (1 diff)
• action/file/PerformOMSSASearch.java (modified) (1 diff)
• action/file/PerformXTandemSearch.java (modified) (1 diff)
• action/hit/SelectPrideProtocolFileStep1a.java (modified) (1 diff)
• action/mascot/SelectMascotParameterFileStep1a.java (modified) (1 diff)
• action/omssa/SelectOMSSAParameterFileStep1a.java (modified) (1 diff)
• action/user/SaveMyProfileProperties.java (modified) (1 diff)
• action/user/SaveUserProperties.java (modified) (1 diff)
• action/xTandemInput/SelectXTandemParameterFileStep1a.java (modified) (1 diff)
• gui/form/FormFactory.java (modified) (7 diffs)
• gui/form/ImportHitsWizardStep1Form.java (added)
• gui/form/NextButtonNameField.java (added)
• gui/form/OrganisationField.java (modified) (1 diff)

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

@@ -315 +315 @@
     String nextButtonName = fetchNextButtonName(select, selectMoveDir);
     fileTable.add(getFormFactory().createField(
-      FormFactory.VFILESELECTIONNEXTBUTTONNAME).setValue(nextButtonName));
+      NextButtonNameField.VPARAM).setValue(nextButtonName));
     // Use getRequest().getAttribute("table") in a
     // subsequent action to get the created table.
@@ -717 +717 @@
       try
       {
-        nextButtonName = getString(FormFactory.VFILESELECTIONNEXTBUTTONNAME);
+        nextButtonName = getString(NextButtonNameField.VPARAM);
       }
       catch (InvalidParameterValue e)
@@ -723 +723 @@
       if (nextButtonName == null || nextButtonName.equals(""))
       {
-        nextButtonName = getSessionAttribute(FormFactory.VFILESELECTIONNEXTBUTTONNAME);
+        nextButtonName = getSessionAttribute(NextButtonNameField.VPARAM);
       }
       if (nextButtonName == null || nextButtonName.equals(""))
@@ -791 +791 @@
       clickAction
         .addParameter(TitleField.VPARAM, formTitle);
-      clickAction.addParameter(FormFactory.VFILESELECTIONNEXTBUTTONNAME,
+      clickAction.addParameter(NextButtonNameField.VPARAM,
         nextButtonName);
       if (moveFilesMode)

trunk/client/servlet/src/org/proteios/action/file/PerformMascotSearch.java

@@ -61 +61 @@
     setSessionAttribute(ViewActiveDirectory.VSELECT, true);
     setSessionAttribute(TitleField.VPARAM, "SelectMascotSearchSpectrumFiles");
-    setSessionAttribute(FormFactory.VFILESELECTIONNEXTBUTTONNAME, "NextSelectMascotSearchUserData");
+    setSessionAttribute(NextButtonNameField.VPARAM, "NextSelectMascotSearchUserData");
     setForwardTo(ViewActiveDirectory.class);
   }

trunk/client/servlet/src/org/proteios/action/file/PerformOMSSASearch.java

@@ -61 +61 @@
     setSessionAttribute(ViewActiveDirectory.VSELECT, true);
     setSessionAttribute(TitleField.VPARAM, "SelectOMSSASearchSpectrumFiles");
-    setSessionAttribute(FormFactory.VFILESELECTIONNEXTBUTTONNAME, "NextSelectOMSSAParameterSet");
+    setSessionAttribute(NextButtonNameField.VPARAM, "NextSelectOMSSAParameterSet");
     setForwardTo(ViewActiveDirectory.class);
   }

trunk/client/servlet/src/org/proteios/action/file/PerformXTandemSearch.java

@@ -61 +61 @@
     setSessionAttribute(ViewActiveDirectory.VSELECT, true);
     setSessionAttribute(TitleField.VPARAM, "SelectXTandemSearchSpectrumFiles");
-    setSessionAttribute(FormFactory.VFILESELECTIONNEXTBUTTONNAME, "NextSelectXTandemParameterSet");
+    setSessionAttribute(NextButtonNameField.VPARAM, "NextSelectXTandemParameterSet");
     setForwardTo(ViewActiveDirectory.class);
   }

trunk/client/servlet/src/org/proteios/action/hit/SelectPrideProtocolFileStep1a.java

@@ -125 +125 @@
     setSessionAttribute(ViewActiveDirectory.VSELECT, true);
     setSessionAttribute(TitleField.VPARAM, "SelectPrideProtocolFile");
-    setSessionAttribute(FormFactory.VFILESELECTIONNEXTBUTTONNAME, "NextCreateExportJobs");
+    setSessionAttribute(NextButtonNameField.VPARAM, "NextCreateExportJobs");
     setSessionAttribute(FormFactory.VFWD2ACTION, forward2Id);
     setSessionAttribute(ForwardField.VPARAM, forwardId);

trunk/client/servlet/src/org/proteios/action/mascot/SelectMascotParameterFileStep1a.java

@@ -97 +97 @@
     setSessionAttribute(ViewActiveDirectory.VSELECT, true);
     setSessionAttribute(TitleField.VPARAM, "SelectMascotParameterTemplateFile");
-    setSessionAttribute(FormFactory.VFILESELECTIONNEXTBUTTONNAME, "Next");
+    setSessionAttribute(NextButtonNameField.VPARAM, "Next");
     setSessionAttribute(FormFactory.VFWD2ACTION, forward2Id);
     setSessionAttribute(ForwardField.VPARAM, forwardId);

trunk/client/servlet/src/org/proteios/action/omssa/SelectOMSSAParameterFileStep1a.java

@@ -97 +97 @@
     setSessionAttribute(ViewActiveDirectory.VSELECT, true);
     setSessionAttribute(TitleField.VPARAM, "SelectOMSSAParameterTemplateFile");
-    setSessionAttribute(FormFactory.VFILESELECTIONNEXTBUTTONNAME, "Next");
+    setSessionAttribute(NextButtonNameField.VPARAM, "Next");
     setSessionAttribute(FormFactory.VFWD2ACTION, forward2Id);
     setSessionAttribute(ForwardField.VPARAM, forwardId);

trunk/client/servlet/src/org/proteios/action/user/SaveMyProfileProperties.java

@@ -58 +58 @@
     phone = getString(PhoneField.VPARAM);
     address = getString(AddressField.VPARAM);
-  organisation = getString(FormFactory.VORGANISATION);
+  organisation = getString(OrganisationField.VPARAM);
 
     // Save user

trunk/client/servlet/src/org/proteios/action/user/SaveUserProperties.java

@@ -60 +60 @@
     phone = getString(PhoneField.VPARAM);
     address = getString(AddressField.VPARAM);
-  organisation = getString(FormFactory.VORGANISATION);
+  organisation = getString(OrganisationField.VPARAM);
 
     // Save user

trunk/client/servlet/src/org/proteios/action/xTandemInput/SelectXTandemParameterFileStep1a.java

@@ -97 +97 @@
     setSessionAttribute(ViewActiveDirectory.VSELECT, true);
     setSessionAttribute(TitleField.VPARAM, "SelectXTandemParameterTemplateFile");
-    setSessionAttribute(FormFactory.VFILESELECTIONNEXTBUTTONNAME, "Next");
+    setSessionAttribute(NextButtonNameField.VPARAM, "Next");
     setSessionAttribute(FormFactory.VFWD2ACTION, forward2Id);
     setSessionAttribute(ForwardField.VPARAM, forwardId);

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

@@ -132 +132 @@
   public static final VInteger VSPECTRUMSEARCHCOUNT = new VInteger("spectrumSearchCount", 0, true);
   public static final VBoolean VREADONLYFORM = new VBoolean("readOnlyForm",false);
-  public static final VString VFILESELECTIONNEXTBUTTONNAME = new VString("fileSelectionNextButtonName", 0, 255, false);
   public static final VBoolean VCONFIRM = new VBoolean("confirm", false);
   public static final VString VCONFIRMMESSAGE = new VString("confirmMessage",0, 255, false);
@@ -485 +484 @@
     TextField<Boolean> field = new TextField<Boolean>(VREADONLYFORM)
       .setHidden(true);
-    return field;
-  }
-
-
-  private TextField<String> newHiddenFileSelectionNextButtonNameField()
-  {
-    TextField<String> field = new TextField<String>(
-      VFILESELECTIONNEXTBUTTONNAME).setHidden(true);
     return field;
   }
@@ -2193 +2184 @@
        * in the file selection form.
        */
-      TextField<String> buttonNameF = newHiddenFileSelectionNextButtonNameField();
+      TextField<String> buttonNameF = new NextButtonNameField();
       buttonNameF.setValue("Import");
       properties.add(buttonNameF);
@@ -2232 +2223 @@
        * in the file selection form.
        */
-      TextField<String> buttonNameF = newHiddenFileSelectionNextButtonNameField();
+      TextField<String> buttonNameF = new NextButtonNameField();
       buttonNameF.setValue("Import");
       properties.add(buttonNameF);
@@ -2299 +2290 @@
        * in the file selection form.
        */
-      TextField<String> buttonNameF = newHiddenFileSelectionNextButtonNameField();
+      TextField<String> buttonNameF = new NextButtonNameField();
       buttonNameF.setValue("Import");
       properties.add(buttonNameF);
@@ -2346 +2337 @@
        * in the file selection form.
        */
-      TextField<String> buttonNameF = newHiddenFileSelectionNextButtonNameField();
+      TextField<String> buttonNameF = new NextButtonNameField();
       buttonNameF.setValue("Import");
       properties.add(buttonNameF);
@@ -2420 +2411 @@
        * in the file selection form.
        */
-      TextField<String> buttonNameF = newHiddenFileSelectionNextButtonNameField();
+      TextField<String> buttonNameF = new NextButtonNameField();
       buttonNameF.setValue("Import");
       properties.add(buttonNameF);

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

@@ -29 +29 @@
 package org.proteios.gui.form;
 
-import org.proteios.gui.form.*;
 import se.lu.thep.waf.constraints.VString;
 
 /**
 */
-public class TestField extends TextField<String>
+public class OrganisationField extends TextField<String>
 {
   public static final VString VPARAM = new VString("organisation", 0, 255);
   
-  public Test()
+  public OrganisationField()
   {
-    super(Test.VPARAM);
+    super(OrganisationField.VPARAM);
     setLabel("Organisation");
   }