Changeset 3875

Timestamp:

Sep 29, 2010, 12:24:49 PM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removed method getExtractForm from FormFactory.

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/ActionFactory.java (modified) (1 diff)
• action/extract/AddExtract.java (modified) (1 diff)
• action/extract/AddLabeledExtract.java (modified) (1 diff)
• action/extract/NewExtract.java (modified) (2 diffs)
• action/extract/SaveExtract.java (modified) (1 diff)
• action/extract/ViewActiveExtract.java (modified) (3 diffs)
• gui/form/ExtractForm.java (added)
• gui/form/FormFactory.java (modified) (3 diffs)
• gui/form/RemainingQuantityField.java (modified) (1 diff)

trunk/client/servlet/src/org/proteios/action/ActionFactory.java

@@ -789 +789 @@
     return asPopup;
   }
+
+  public void modifyForPopup(Fieldset fs)
+  {
+    if (getAsPopup())
+    {
+      TextField<Boolean> asPopup = new TextField<Boolean>(ActionFactory.VPOPUP);
+      asPopup.setHidden(true);
+      asPopup.setValue(true);
+      fs.add(asPopup);
+    }
+  }
+
 }

trunk/client/servlet/src/org/proteios/action/extract/AddExtract.java

@@ -51 +51 @@
      * Verify parameters
      */
-    Form form = getFormFactory().getExtractForm(null);
+    ExtractForm form = new ExtractForm();
+  getActionFactory().modifyForPopup(form.fs);
     verifyParameters(form);
     verifySessionAttributes(NewExtract.VSAMPLEID);

trunk/client/servlet/src/org/proteios/action/extract/AddLabeledExtract.java

@@ -52 +52 @@
      * Verify parameters
      */
-    Form form = getFormFactory().getExtractForm(null);
+    ExtractForm form = new ExtractForm();
+  getActionFactory().modifyForPopup(form.fs);
     verifyParameters(form);
     verifySessionAttributes(ViewActiveExtract.VEXTRACTID);

trunk/client/servlet/src/org/proteios/action/extract/NewExtract.java

@@ -33 +33 @@
 import org.proteios.gui.Title;
 import org.proteios.gui.Toolbar;
-import org.proteios.gui.form.Form;
+import org.proteios.gui.form.*;
 import org.proteios.gui.layout.RowLayout;
 
@@ -68 +68 @@
       sample = Sample.getById(dc, sampleId);
     }
-    Form form = getFormFactory().getExtractForm(null);
+    ExtractForm form = new ExtractForm();
+  getActionFactory().modifyForPopup(form.fs);
     if (sample != null)
     {

trunk/client/servlet/src/org/proteios/action/extract/SaveExtract.java

@@ -50 +50 @@
      * Verify parameters
      */
-    Form form = getFormFactory().getExtractForm(null);
+    ExtractForm form = new ExtractForm();
+  getActionFactory().modifyForPopup(form.fs);
     verifyParameters(form);
     /***********************************************************************

trunk/client/servlet/src/org/proteios/action/extract/ViewActiveExtract.java

@@ -51 +51 @@
 import org.proteios.gui.Title;
 import org.proteios.gui.Toolbar;
-import org.proteios.gui.form.Form;
+import org.proteios.gui.form.*;
 import org.proteios.gui.form.FormFactory;
 import org.proteios.gui.form.TextField;
@@ -88 +88 @@
      Annotator anna;
      Extract extract;
-     Form form, aform;
+     Form aform;
+     ExtractForm form;
      Toolbar tb, tba, tbf, toolbar;
      TableFactory tableFactory;
@@ -114 +115 @@
     anna = new Annotator(itemFactory);
     extract = itemFactory.getById(Extract.class, extractId);
-    form = getFormFactory().getExtractForm(extract);
+    form = new ExtractForm(extract);
+  getActionFactory().modifyForPopup(form.fs);
     // Extract form tool bar
     tb = new Toolbar();

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

@@ -364 +364 @@
   public void modifyForPopup(Fieldset fs)
   {
-    if (actionFactory.getAsPopup())
-    {
-      TextField<Boolean> asPopup = new TextField<Boolean>(
-        ActionFactory.VPOPUP);
-      asPopup.setHidden(true);
-      asPopup.setValue(true);
-      fs.add(asPopup);
-    }
+  actionFactory.modifyForPopup(fs);
   }
 
@@ -2210 +2203 @@
 
 
- //Cleaning up from here
+
 
 
@@ -2295 +2288 @@
   }
 
-
-  public Form getExtractForm(Extract extract)
-  {
-    Form form = new Form("extractForm");
-    form.setTitle("New Extract");
-    Fieldset fs = new Fieldset();
-    modifyForPopup(fs);
-    fs.setTitle("Properties");
-    form.addFieldset(fs);
-    //
-    TextField<String> nameF = new NameField();
-    fs.add(nameF);
-    // 
-    TextField<String> externalIdF = new ExternalIdField();
-    fs.add(externalIdF);
-    //
-    TextArea descriptionF = new DescriptionField();
-    fs.add(descriptionF);
-    //
-    TextField<String> storageLocationF = new StorageLocationField();
-    fs.add(storageLocationF);
-    //
-    Fieldset quantityFS = new Fieldset();
-    quantityFS.setTitle("Quantity");
-    form.addFieldset(quantityFS);
-    //
-    TextField<Float> quantityF = newOriginalQuantityField();
-    quantityF.setLabel("ExtractOriginalQuantity");
-    quantityFS.add(quantityF);
-    //
-    TextField<Float> concF = new ConcentrationField();
-    quantityFS.add(concF);
-    if (extract != null)
-    {
-      TextField<Integer> itemIdF = newHiddenItemIdField();
-      fs.add(itemIdF);
-      itemIdF.setValue(extract.getId());
-      nameF.setValue(extract.getName());
-      externalIdF.setValue(extract.getExternalId());
-      descriptionF.setValue(extract.getDescription());
-      storageLocationF.setValue(extract.getStorageLocation());
-      quantityF.setValue(extract.getOriginalQuantityInMicroLiters());
-      quantityFS.add(newRemainingQuantityField(extract
-        .getRemainingQuantityInMicroLiters()));
-      concF.setValue(extract.getConcentrationInGramsPerLiter());
-    }
-    return form;
-  }
+ //Cleaning up from here
 
 

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

@@ -40 +40 @@
   this.setLabel("Remaining");
  }
+
+ public RemainingQuantityField(Float value)
+ {
+  this();
+  this.setValue(value);
+ }
 }