Changeset 3839

Timestamp:

Sep 9, 2010, 1:22:49 PM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removed getImportHitsWizardStep1Form method from FormFactory

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/hit/ImportHitsWizard.java (modified) (2 diffs)
• action/hit/ImportHitsWizardStep1a.java (modified) (1 diff)
• gui/form/FormFactory.java (modified) (1 diff)
• gui/form/ImportHitsWizardStep1Form.java (modified) (1 diff)
• gui/form/TitleField.java (modified) (1 diff)

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

@@ -41 +41 @@
 import org.proteios.gui.ColumnContainer;
 import org.proteios.gui.RowContainer;
-import org.proteios.gui.form.Form;
+import org.proteios.gui.form.*;
 import org.proteios.gui.layout.RowLayout;
 import se.lu.thep.waf.ActionException;
@@ -83 +83 @@
     toolbar.add(next);
 
-    step1 = getFormFactory().getImportHitsWizardStep1Form(project);
+    step1 = new ImportHitsWizardStep1Form(dc, ImportHitsWizardStep1b.class.getName());
      step1.setToolbar(toolbar);
 

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

@@ -57 +57 @@
     DbControl dc = newDbControl();
     Project project = isProjectActive(dc);
-    Form impForm = getFormFactory().getImportHitsWizardStep1Form(project);
+    Form impForm = new ImportHitsWizardStep1Form(dc,ImportHitsWizardStep1b.class.getName());
     verifyParameters(impForm);
     saveToSession(ExternalGelIdField.VPARAM);

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

@@ -2153 +2153 @@
 
  // Cleaning up from here
-
-  public Form getImportHitsWizardStep1Form(Project project)
-  {
-    DbControl dc = project.getDbControl();
-    Form form = new Form("importHitsWizardStep1Form");
-    if (dc != null && dc.isConnected())
-    {
-      // Properties fieldset
-      Fieldset properties = new Fieldset();
-      properties.getLegendTitle().setTitle("ImportHitsWizardStep1FormLegend");
-      form.addFieldset(properties);
-      /*
-       * Hidden text field for storing plugin id to use.
-       */
-      TextField<Integer> pluginIdF = new PluginIdField();
-      PluginDefinition pluginDef = PluginDefinition.getByClassName(
-        project.getDbControl(),
-        "org.proteios.plugins.GelSpotPlatePosToHitPlugin");
-      pluginIdF.setValue(pluginDef.getId());
-      properties.add(pluginIdF);
-      /*
-       * This hidden text field sets title to be used for file selection
-       * form.
-       */
-      TextField<String> titleF = new TitleField();
-      titleF.setValue("Step 1a. Select Robot Result File[s]");
-      properties.add(titleF);
-      /*
-       * This hidden text field sets name to be used for the "Next" button
-       * in the file selection form.
-       */
-      TextField<String> buttonNameF = new NextButtonNameField();
-      buttonNameF.setValue("Import");
-      properties.add(buttonNameF);
-      /*
-       * This hidden forward field sets action id used by the file
-       * selection action called by ImportHitsWizardStep1a.
-       */
-      TextField<String> forwardF = new ForwardField();
-      forwardF.setValue(actionFactory.getId(ImportHitsWizardStep1b.class));
-      properties.add(forwardF);
-      // Gel id (optional)
-      properties.add(new ExternalGelIdField(false));
-    }
-    return form;
-  }
-
 
   public Form getImportHitsWizardStep2Form(Project project)

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

@@ -1 +1 @@
 /*
- $Id$
-
- Copyright (C) 2010 Gregory Vincic
-
- Files are copyright by their respective authors. The contributions to
- files where copyright is not explicitly stated can be traced with the
- source code revision system.
-
- This file is part of Proteios.
- Available at http://www.proteios.org/
-
- Proteios 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 2
- of the License, or (at your option) any later version.
-
- Proteios 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 this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 339.
- Boston, MA 02111-1307, USA.
+  $Id$
+        
+  Copyright (C) 2010 Gregory Vincic
+        
+  Files are copyright by their respective authors. The contributions to
+  files where copyright is not explicitly stated can be traced with the
+  source code revision system.
+        
+  This file is part of Proteios.
+  Available at http://www.proteios.org/
+        
+  Proteios 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 2
+  of the License, or (at your option) any later version.
+        
+  Proteios 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 this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place - Suite 339.
+  Boston, MA 02111-1307, USA.
 */
 
 package org.proteios.gui.form;
+
+import org.proteios.core.PluginDefinition;
+import org.proteios.core.DbControl;
+
 /**
- */
+*/
 public class ImportHitsWizardStep1Form extends Form
 {
+  public final Fieldset properties;
+  public final TextField<Integer> pluginIdF;
+  public final PluginDefinition pluginDef;
+  public final TextField<String> titleF, buttonNameF, forwardF;
+      
+  /**
+    @param dc DbControl used to get a plugin definition, must not be null nor disconnected
+  */
+  public ImportHitsWizardStep1Form(DbControl dc, String nextAction)
+  {
+    super("importHitsWizardStep1Form");
+    /*
+      * Hidden text field for storing plugin id to use.
+    */
+    pluginIdF = new PluginIdField();
+    pluginDef = PluginDefinition.getByClassName(
+    dc,
+    "org.proteios.plugins.GelSpotPlatePosToHitPlugin");
+    pluginIdF.setValue(pluginDef.getId());
+    /*
+      * This hidden text field sets title to be used for file selection
+      * form.
+    */
+    titleF = new TitleField("Step 1a. Select Robot Result File[s]");
+    
+    /*
+      * This hidden text field sets name to be used for the "Next" button
+      * in the file selection form.
+    */
+    buttonNameF = new NextButtonNameField();
+    buttonNameF.setValue("Import");
+    
+    /*
+      * This hidden forward field sets action id used by the file
+      * selection action called by ImportHitsWizardStep1a.
+    */
+    forwardF = new ForwardField(); 
+    forwardF.setValue(nextAction);
+    
+    properties = new Fieldset();
+    properties.getLegendTitle().setTitle("ImportHitsWizardStep1FormLegend");
+    addFieldset(properties);
+    properties.add(pluginIdF);
+    properties.add(titleF);
+    properties.add(buttonNameF);
+    properties.add(forwardF);
+    // Gel id (optional)
+    properties.add(new ExternalGelIdField(false));
+  }
 }

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

@@ -43 +43 @@
   setHidden(true);
  }
+
+ public TitleField(String title)
+ {
+   this();
+  setValue(title);
+ }
+
 }