Changeset 3824

Timestamp:

Sep 8, 2010, 9:11:02 AM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removed VCONCENTRATION from FormFactory

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/extract/AddExtract.java (modified) (3 diffs)
• action/extract/AddLabeledExtract.java (modified) (3 diffs)
• action/extract/AddSecondaryExtract.java (modified) (3 diffs)
• action/extract/AddSecondaryLabeledExtract.java (modified) (3 diffs)
• action/extract/SaveExtract.java (modified) (3 diffs)
• action/extract/SaveLabeledExtract.java (modified) (3 diffs)
• action/hit/CombineHits.java (modified) (3 diffs)
• action/hit/CreateExclusionListJob.java (modified) (2 diffs)
• action/hit/CreateProteinAssemblyJob.java (modified) (2 diffs)
• action/hit/ExclusionList.java (modified) (3 diffs)
• gui/form/ConcentrationField.java (modified) (1 diff)
• gui/form/FormFactory.java (modified) (17 diffs)

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

@@ -28 +28 @@
 package org.proteios.action.extract;
 
-
-
 import org.proteios.action.ProteiosAction;
 import org.proteios.core.CreationEvent;
@@ -36 +34 @@
 import org.proteios.core.ItemFactory;
 import org.proteios.core.Sample;
+import org.proteios.gui.form.*;
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
-import org.proteios.gui.form.*;
 
 /**
@@ -103 +101 @@
     extract.setOriginalQuantityInMicroLiters(extractQuantity);
     extract
-      .setConcentrationInGramsPerLiter(getValidFloat(FormFactory.VCONCENTRATION));
+      .setConcentrationInGramsPerLiter(getValidFloat(ConcentrationField.VPARAM));
     dc.commit();
     setMessage("Extract saved");

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

@@ -28 +28 @@
 package org.proteios.action.extract;
 
-
-
 import org.proteios.action.ProteiosAction;
 import org.proteios.core.CreationEvent;
@@ -37 +35 @@
 import org.proteios.core.Label;
 import org.proteios.core.LabeledExtract;
+import org.proteios.gui.form.*;
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
-import org.proteios.gui.form.*;
 
 /**
@@ -100 +98 @@
     labeledExtract.setOriginalQuantityInMicroLiters(extractQuantity);
     labeledExtract
-      .setConcentrationInGramsPerLiter(getValidFloat(FormFactory.VCONCENTRATION));
+      .setConcentrationInGramsPerLiter(getValidFloat(ConcentrationField.VPARAM));
     dc.commit();
     setMessage("Extract saved");

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

@@ -28 +28 @@
 package org.proteios.action.extract;
 
-
-
 import org.proteios.action.ProteiosAction;
 import org.proteios.core.CreationEvent;
@@ -35 +33 @@
 import org.proteios.core.Extract;
 import org.proteios.core.ItemFactory;
+import org.proteios.gui.form.*;
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
-import org.proteios.gui.form.*;
 
 /**
@@ -91 +89 @@
     extract.setOriginalQuantityInMicroLiters(extractQuantity);
     extract
-      .setConcentrationInGramsPerLiter(getValidFloat(FormFactory.VCONCENTRATION));
+      .setConcentrationInGramsPerLiter(getValidFloat(ConcentrationField.VPARAM));
     dc.commit();
     setMessage("Extract saved");

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

@@ -28 +28 @@
 package org.proteios.action.extract;
 
-
-
 import org.proteios.action.ProteiosAction;
 import org.proteios.core.CreationEvent;
@@ -37 +35 @@
 import org.proteios.core.Label;
 import org.proteios.core.LabeledExtract;
+import org.proteios.gui.form.*;
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
-import org.proteios.gui.form.*;
 
 /**
@@ -103 +101 @@
     labeledExtract.setOriginalQuantityInMicroLiters(extractQuantity);
     labeledExtract
-      .setConcentrationInGramsPerLiter(getValidFloat(FormFactory.VCONCENTRATION));
+      .setConcentrationInGramsPerLiter(getValidFloat(ConcentrationField.VPARAM));
     dc.commit();
     setMessage("Extract saved");

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

@@ -28 +28 @@
 package org.proteios.action.extract;
 
-
 import org.proteios.action.ProteiosAction;
 import org.proteios.core.DbControl;
@@ -34 +33 @@
 import org.proteios.core.ItemFactory;
 import org.proteios.core.UpdateEvent;
+import org.proteios.gui.form.*;
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
-import org.proteios.gui.form.*;
 
 /**
@@ -78 +77 @@
     extract.setOriginalQuantityInMicroLiters(originalQuantity);
     //
-    Float concentration = getValidFloat(FormFactory.VCONCENTRATION);
+    Float concentration = getValidFloat(ConcentrationField.VPARAM);
     extract.setConcentrationInGramsPerLiter(concentration);
     //

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

@@ -28 +28 @@
 package org.proteios.action.extract;
 
-
-
 import org.proteios.action.ProteiosAction;
 import org.proteios.core.DbControl;
@@ -36 +34 @@
 import org.proteios.core.LabeledExtract;
 import org.proteios.core.UpdateEvent;
+import org.proteios.gui.form.*;
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
-import org.proteios.gui.form.*;
 
 /**
@@ -86 +84 @@
     extract.setOriginalQuantityInMicroLiters(originalQuantity);
     //
-    Float concentration = getValidFloat(FormFactory.VCONCENTRATION);
+    Float concentration = getValidFloat(ConcentrationField.VPARAM);
     extract.setConcentrationInGramsPerLiter(concentration);
     //

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

@@ -28 +28 @@
 package org.proteios.action.hit;
 
+import java.util.ArrayList;
+import java.util.List;
 import org.proteios.action.ProteiosAction;
 import org.proteios.action.job.ListJobs;
@@ -51 +53 @@
 import se.lu.thep.waf.constraints.VBoolean;
 import se.lu.thep.waf.constraints.VString;
-import java.util.ArrayList;
-import java.util.List;
-
 
 /**
@@ -84 +83 @@
     log.debug("gelId:" + gelId);
     log.debug("localSampleId:" + localSampleId);
-    String filename = getValidString(FormFactory.VFILENAME);
+    String filename = getValidString(FileNameField.VPARAM);
     String randomString = getValidString(FormFactory.VRANDOMSTRING);
     Float fdrCutOff = getValidFloat(FormFactory.VFDR);

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

@@ -40 +40 @@
 import org.proteios.core.Project;
 import org.proteios.core.StringParameterType;
-import org.proteios.gui.form.FormFactory;
-
+import org.proteios.gui.form.*;
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
@@ -79 +78 @@
     String localSampleId = getString(FormFactory.VLOCALSAMPLEIDSELECTED);
     log.debug("localSampleId:" + localSampleId);
-    String filename = getValidString(FormFactory.VFILENAME);
+    String filename = getValidString(FileNameField.VPARAM);
     String format = getValidString(VFORMAT);
     String externalId = getValidString(VEXTERNALID);

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

@@ -42 +42 @@
 import org.proteios.core.StringParameterType;
 import org.proteios.gui.form.*;
-
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
@@ -91 +90 @@
     log.debug("gelId:" + gelId);
     log.debug("localSampleId:" + localSampleId);
-    String filename = getValidString(FormFactory.VFILENAME);
+    String filename = getValidString(FileNameField.VPARAM);
     String label = getValidString(VLABEL);
     String decoyPrefix = getValidString(VDECOYPREFIX);

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

@@ -28 +28 @@
 package org.proteios.action.hit;
 
+import java.util.ArrayList;
+import java.util.List;
 import org.proteios.ActionLink;
 import org.proteios.Context;
@@ -36 +38 @@
 import org.proteios.core.Hit;
 import org.proteios.core.Project;
+import org.proteios.gui.ColumnContainer;
 import org.proteios.gui.Title;
 import org.proteios.gui.TitledWindow;
 import org.proteios.gui.Toolbar;
-import org.proteios.gui.form.Checkbox;
-import org.proteios.gui.form.Fieldset;
-import org.proteios.gui.form.Form;
-import org.proteios.gui.form.FormFactory;
-import org.proteios.gui.form.Option;
-import org.proteios.gui.form.Select;
-import org.proteios.gui.form.TextField;
+import org.proteios.gui.form.*;
 import org.proteios.gui.layout.RowLayout;
-import org.proteios.gui.ColumnContainer;
-
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
 import se.lu.thep.waf.constraints.VBoolean;
 import se.lu.thep.waf.constraints.VString;
-
-import java.util.ArrayList;
-import java.util.List;
 
 /**
@@ -97 +89 @@
       properties.add(getFormFactory().selectLocalSampleId(dc, project));
       TextField<String> nameF = new TextField<String>(
-        FormFactory.VFILENAME);
+        FileNameField.VPARAM);
       nameF.setValue("ExclusionList.txt");
       nameF.setLabel("OutputFileName");

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

@@ -1 +1 @@
 /*
- $Id$
+  $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.
+*/
 
- Copyright (C) 2006, 2007,2009 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-2.x 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 330,
- Boston, MA  02111-1307, USA.
- */
 package org.proteios.gui.form;
 
 import se.lu.thep.waf.constraints.VFloat;
 
-public final class ConcentrationField
- extends TextField<Float>
+/**
+*/
+public class ConcentrationField extends TextField<Float>
 {
-  public static final VFloat VPARAM = new VFloat("concentration", false);
-
- public ConcentrationField()
- {
-  super(ConcentrationField.VPARAM);
-  setLabel("ConcentrationInGramsPerLiter");
-  setHelp("Grams protein/liter");
- }
+  public static final VFloat VPARAM = new VFloat("concentration",false);
+  public ConcentrationField()
+  {
+    super(ConcentrationField.VPARAM);
+    setLabel("Concentration");
+    setHelp("Grams protein/liter");
+  }
 }

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

@@ -205 +205 @@
   public static final VInteger VPROJECTTYPE = new ProjectTypeID();
   public static final VInteger VPROJECTSTATUS = new ProjectStatus();
-  public static final VInteger VPROTOCOLFILEID = new VInteger(
-    "protocolfileId", 0, true);
-  public static final VBoolean VPROTOCOLFILERESET = new VBoolean(
-    "protocolFileReset", false);
-  public static final VInteger VANNOTYPEID = new VInteger("annotationTypeId",
-    0, true);
+  public static final VInteger VPROTOCOLFILEID = new VInteger("protocolfileId", 0, true);
+  public static final VBoolean VPROTOCOLFILERESET = new VBoolean("protocolFileReset", false);
+  public static final VInteger VANNOTYPEID = new VInteger("annotationTypeId",0, true);
   public static final VInteger VGROUPID = new VInteger("groupId", 1, false);
   public static final VString VNAME = NameField.VPARAM;
   public static final VString VUSERNAME = new VString("username", 1, 32, true);
-  public static final VString VANNONAME = new VString("annotationName", 1,
-    64, false);
+  public static final VString VANNONAME = new VString("annotationName", 1,64, false);
   public static final VString VDESCR = new VString("description", 0, 255);
   public static final VString VEMAIL = new VString("email", 1, 255, true);
@@ -226 +222 @@
   public static final VString VLOGIN = new VString("login", 1, 32, true);
   public static final VString VTYPE = new VString("type", 1, 64, true);
-  public static final VString VFILE = new VString("file", 1, 512); // Allow
-  public static final VString VFILENAME = new VString("fileName", 1, 255);
-  public static final VString VNONREQUIRED_FILENAME = new VString("fileName",
-    0, 255, false);
-  public static final VString VREQUIRED_FILENAME = new VString("fileName", 1,
-    255, true);
+  public static final VString VFILE = new VString("file", 1, 512); // Allowpublic static final VString VFILENAME = new VString("fileName", 1, 255);
+  public static final VString VNONREQUIRED_FILENAME = new VString("fileName",0, 255, false);
+  public static final VString VREQUIRED_FILENAME = new VString("fileName", 1,255, true);
   public static final VString VFWDACTION = ForwardField.VPARAM;
-  public static final VString VFWD2ACTION = new VString("forward2ActionId",
-    1, 255, false);
-  public static final VString VCLASSNAME = new VString("className", 1, 255,
-    true);
+  public static final VString VFWD2ACTION = new VString("forward2ActionId",1, 255, false);
+  public static final VString VCLASSNAME = new VString("className", 1, 255,true);
   public static final VString VURI = new VString("fileURI", 0, 255, false);
-  public static final VString VROLEPERMISSIONID = new VString("rolePermId",
-    1, 64, true);
-  public static final VString VWELLPOSITION = new VString("wellPosition", 0,
-    8, false);
-  public static final VString VREQUIRED_LOCALSAMPLEID = new VString(
-    "localSampleId", 0, 32, true);
-  public static final VString VLOCALSAMPLEID = new VString("localSampleId",
-    0, 32, false);
-  public static final VString VLOCALSAMPLEIDSELECTED = new VString(
-    "localSampleIdSelected", 0, 32, false);
+  public static final VString VROLEPERMISSIONID = new VString("rolePermId",1, 64, true);
+  public static final VString VWELLPOSITION = new VString("wellPosition", 0,8, false);
+  public static final VString VREQUIRED_LOCALSAMPLEID = new VString("localSampleId", 0, 32, true);
+  public static final VString VLOCALSAMPLEID = new VString("localSampleId",0, 32, false);
+  public static final VString VLOCALSAMPLEIDSELECTED = new VString("localSampleIdSelected", 0, 32, false);
   public static final VInteger VDIRID = new VInteger("dirId", 1, true);
   public static final VInteger VSPOTID = new VInteger("spotId", 0, false);
-  public static final VInteger VFILETYPEID = new VInteger("fileTypeId", 0,
-    true);
+  public static final VInteger VFILETYPEID = new VInteger("fileTypeId", 0,true);
   public static final VString VPERCENT = new VString("percent", 0, 4, false);
-  public static final VInteger VMASSSTART = new VInteger(
-    "massStartInKiloDaltons", 0, false);
-  public static final VInteger VMASSEND = new VInteger(
-    "massEndInKiloDaltons", 0, false);
-  public static final VInteger VSIZEX = new VInteger("sizeXInCentiMeters", 0,
-    false);
-  public static final VInteger VSIZEY = new VInteger("sizeYInCentiMeters", 0,
-    false);
-  public static final VInteger VPERCENTACRYLAMID = new VInteger(
-    "percentAcrylAmid", 0, 100, false);
-  public static final VString VDENATURATINGAGENT = new VString(
-    "denaturatingAgent", 0, 255, false);
-  public static final VString VPROTEINASSAY = new VString("proteinAssay", 0,
-    255, false);
-  public static final VString VSOLUBILIZATIONBUFFER = new VString(
-    "solubilizationBuffer", 0, 255, false);
-  public static final VFloat VCONCENTRATION = new VFloat("concentration",
-    false);
-  public static final VFloat VORIGINALQUANTITY = new VFloat(
-    "originalQuantity", true);
-  public static final VFloat VREMAININGQUANTITY = new VFloat(
-    "remainingQuantity", false);
+  public static final VInteger VMASSSTART = new VInteger("massStartInKiloDaltons", 0, false);
+  public static final VInteger VMASSEND = new VInteger("massEndInKiloDaltons", 0, false);
+  public static final VInteger VSIZEX = new VInteger("sizeXInCentiMeters", 0,false);
+  public static final VInteger VSIZEY = new VInteger("sizeYInCentiMeters", 0,false);
+  public static final VInteger VPERCENTACRYLAMID = new VInteger("percentAcrylAmid", 0, 100, false);
+  public static final VString VDENATURATINGAGENT = new VString("denaturatingAgent", 0, 255, false);
+  public static final VString VPROTEINASSAY = new VString("proteinAssay", 0,255, false);
+  public static final VString VSOLUBILIZATIONBUFFER = new VString("solubilizationBuffer", 0, 255, false);
+  public static final VFloat VORIGINALQUANTITY = new VFloat("originalQuantity", true);
+  public static final VFloat VREMAININGQUANTITY = new VFloat("remainingQuantity", false);
   public static final VFloat VQUANTITY = new VFloat("quantity", true);
-  public static final VFloat VUSEDQUANTITYINMICROLITERS = new VFloat(
-    "UsedQuantityInMicroLiters", true);
+  public static final VFloat VUSEDQUANTITYINMICROLITERS = new VFloat("UsedQuantityInMicroLiters", true);
   public static final VFloat VFDR = FDRField.VPARAM;
-  public static final VBoolean VPEPTIDECOMPARE = new VBoolean(
-    "isPeptideCompare", false);
-  public static final VBoolean VISMICROTITREPLATE = new VBoolean(
-    "isMicrotitrePlate", false);
-  public static final VString VRANDOMSTRING = new VString("randomString", 1,
-    15, true);
-  public static final VString VSTORAGELOCATION = new VString(
-    "storageLocation", 0, 255, false);
+  public static final VBoolean VPEPTIDECOMPARE = new VBoolean("isPeptideCompare", false);
+  public static final VBoolean VISMICROTITREPLATE = new VBoolean("isMicrotitrePlate", false);
+  public static final VString VRANDOMSTRING = new VString("randomString", 1,15, true);
+  public static final VString VSTORAGELOCATION = new VString("storageLocation", 0, 255, false);
   public static final VInteger VCOUNT = new VInteger("count", 0, true);
   public static final VInteger VDIRCOUNT = new VInteger("dirCount", 0, true);
   public static final VInteger VJOBCOUNT = new VInteger("jobCount", 0, true);
-  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 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);
-  public static final VString VCANCELACTION = new VString("cancelActionId",
-    1, 255, false);
-  public static final VString VFILTERNAME = new VString("filterName", 0, 255,
-    false);
-  public static final VString VFILTERCLASS = new VString("filterClass", 0,
-    255, false);
-  public static final VString VFILTERCONDITION = new VString(
-    "filterCondition", 0, 255, false);
-  public static final VString VFILTERVALUE = new VString("filterValue", 0,
-    255, false);
+  public static final VString VCONFIRMMESSAGE = new VString("confirmMessage",0, 255, false);
+  public static final VString VCANCELACTION = new VString("cancelActionId",1, 255, false);
+  public static final VString VFILTERNAME = new VString("filterName", 0, 255,false);
+  public static final VString VFILTERCLASS = new VString("filterClass", 0,255, false);
+  public static final VString VFILTERCONDITION = new VString("filterCondition", 0, 255, false);
+  public static final VString VFILTERVALUE = new VString("filterValue", 0,255, false);
   public static final VInteger VLISTSIZE = new VInteger("listSize", 0, false);
-  public static final VString VFILTERKEYLIST = new VString("filterKeyList",
-    0, 255, false);
-  public static final VString VFILTERCLASSLIST = new VString(
-    "filterClassList", 0, 255, false);
-  public static final VString VFILTERCONDITIONLIST = new VString(
-    "filterConditionList", 0, 255, false);
-  public static final VString VFILTERVALUELIST = new VString(
-    "filterValueList", 0, 255, false);
-  public static final VString VSORTCOLUMNKEY = new VString("sortColumnKey",
-    0, 255, false);
+  public static final VString VFILTERKEYLIST = new VString("filterKeyList",0, 255, false);
+  public static final VString VFILTERCLASSLIST = new VString("filterClassList", 0, 255, false);
+  public static final VString VFILTERCONDITIONLIST = new VString("filterConditionList", 0, 255, false);
+  public static final VString VFILTERVALUELIST = new VString("filterValueList", 0, 255, false);
+  public static final VString VSORTCOLUMNKEY = new VString("sortColumnKey",0, 255, false);
   public static final VString VDUMMY = new VString("dummy", 0, 255, false);
   public static final VString VCOMMENT = new VString("comment", 0, 255, false);
-  public static final VDate VENTRYDATE = new VDate("entryDate", false,
-    Format.DATETIME);
-  public static final VDate VEVENTDATE = new VDate("eventDate", false,
-    Format.DATETIME, Format.DATE);
-  public static final VDate VNEWSDATE = new VDate("newsDate", true,
-    Format.DATETIME, Format.DATE);
-  public static final VDate VSTARTDATE = new VDate("startDate", true,
-    Format.DATETIME, Format.DATE);
-  public static final VDate VENDDATE = new VDate("endDate", true,
-    Format.DATETIME, Format.DATE);
-  public static final VInteger VLENGTH = new VInteger("lengthInCentiMeters",
-    0, false);
-  public static final VInteger VBIOMATERIALID = new VInteger("bioMaterialId",
-    1, false);
+  public static final VDate VENTRYDATE = new VDate("entryDate", false,Format.DATETIME);
+  public static final VDate VEVENTDATE = new VDate("eventDate", false,Format.DATETIME, Format.DATE);
+  public static final VDate VNEWSDATE = new VDate("newsDate", true,Format.DATETIME, Format.DATE);
+  public static final VDate VSTARTDATE = new VDate("startDate", true,Format.DATETIME, Format.DATE);
+  public static final VDate VENDDATE = new VDate("endDate", true,Format.DATETIME, Format.DATE);
+  public static final VInteger VLENGTH = new VInteger("lengthInCentiMeters",0, false);
+  public static final VInteger VBIOMATERIALID = new VInteger("bioMaterialId",1, false);
   // TODO what are valid values for the pistart parameter
-  public static final VInteger VPISTART = new VInteger("piStart",
-    Integer.MIN_VALUE, Integer.MAX_VALUE, false);
-  public static final VInteger VPIEND = new VInteger("piEnd",
-    Integer.MIN_VALUE, Integer.MAX_VALUE, false);
+  public static final VInteger VPISTART = new VInteger("piStart",Integer.MIN_VALUE, Integer.MAX_VALUE, false);
+  public static final VInteger VPIEND = new VInteger("piEnd",Integer.MIN_VALUE, Integer.MAX_VALUE, false);
   public static final VString VSTAIN = new VString("stain", 0, 255, false);
   public static final VInteger VLABELID = new VInteger("labelId", 0, true);
-  // public static final VInteger VCOLUMNROWID = new VInteger("columnRowId",
-  // 0, true);
-  public static final VInteger VCOLUMNROWID = new VInteger("columnRowId", 0,
-    false);
-  public static final VInteger VCOLUMNLISTSIZE = new VInteger(
-    "columnListSize", 0, false);
-  public static final VInteger VCOLUMNSELECTID = new VInteger(
-    "columnSelectId", 0, false);
-  public static final VInteger VCOLUMNSELECTLISTSIZE = new VInteger(
-    "columnSelectListSize", 0, false);
-  public static final VString VTABLECONFACTION = new VString(
-    "tableConfigurationActionId", 0, 255, false);
+  // public static final VInteger VCOLUMNROWID = new VInteger("columnRowId",// 0, true);
+  public static final VInteger VCOLUMNROWID = new VInteger("columnRowId", 0,false);
+  public static final VInteger VCOLUMNLISTSIZE = new VInteger("columnListSize", 0, false);
+  public static final VInteger VCOLUMNSELECTID = new VInteger("columnSelectId", 0, false);
+  public static final VInteger VCOLUMNSELECTLISTSIZE = new VInteger("columnSelectListSize", 0, false);
+  public static final VString VTABLECONFACTION = new VString("tableConfigurationActionId", 0, 255, false);
   private static final VString VOWNER = new VString("owner", 1, 32, false);
-  public static final VString VNONREQUIRED_NAME = new VString("name", 0, 255,
-    false);
-  public static final VString VNONREQUIRED_INSTITUTION = new VString(
-    "institution", 0, 255, false);
-  public static final VString VNONREQUIRED_ADDRESS = new VString("address",
-    0, 255, false);
-  public static final VString VNONREQUIRED_URL = new VString("url", 0, 255,
-    false);
-  public static final VString VNONREQUIRED_EMAIL = new VString("email", 0,
-    255, false);
-  public static final VString VNONREQUIRED_CONTACT_INFO = new VString(
-    "contactInfo", 0, 255, false);
-  public static final VString VNONREQUIRED_SAMPLE_NAME = new VString(
-    "sampleName", 0, 255, false);
-  public static final VString VNONREQUIRED_SAMPLE_NUMBER = new VString(
-    "sampleNumber", 0, 255, false);
-  public static final VString VNONREQUIRED_SAMPLE_STATE = new VString(
-    "sampelState", 0, 255, false);
-  public static final VString VNONREQUIRED_SAMPLE_MASS_IN_GRAMS = new VString(
-    "sampleMassInGrams", 0, 255, false);
-  public static final VString VNONREQUIRED_SAMPLE_VOLUME_IN_MILLILITERS = new VString(
-    "sampleVolumeInMilliliters", 0, 255, false);
-  public static final VString VNONREQUIRED_SAMPLE_CONCENTRATION_IN_GRAMS_PER_LITER = new VString(
-    "sampleConcentrationInGramsPerLiter", 0, 255, false);
-  public static final VString VNONREQUIRED_SAMPLE_BATCH = new VString(
-    "sampleBatch", 0, 255, false);
-  public static final VString VNONREQUIRED_SAMPLE_COMMENT = new VString(
-    "sampleComment", 0, 255, false);
+  public static final VString VNONREQUIRED_NAME = new VString("name", 0, 255,false);
+  public static final VString VNONREQUIRED_INSTITUTION = new VString("institution", 0, 255, false);
+  public static final VString VNONREQUIRED_ADDRESS = new VString("address",0, 255, false);
+  public static final VString VNONREQUIRED_URL = new VString("url", 0, 255,false);
+  public static final VString VNONREQUIRED_EMAIL = new VString("email", 0,255, false);
+  public static final VString VNONREQUIRED_CONTACT_INFO = new VString("contactInfo", 0, 255, false);
+  public static final VString VNONREQUIRED_SAMPLE_NAME = new VString("sampleName", 0, 255, false);
+  public static final VString VNONREQUIRED_SAMPLE_NUMBER = new VString("sampleNumber", 0, 255, false);
+  public static final VString VNONREQUIRED_SAMPLE_STATE = new VString("sampelState", 0, 255, false);
+  public static final VString VNONREQUIRED_SAMPLE_MASS_IN_GRAMS = new VString("sampleMassInGrams", 0, 255, false);
+  public static final VString VNONREQUIRED_SAMPLE_VOLUME_IN_MILLILITERS = new VString("sampleVolumeInMilliliters", 0, 255, false);
+  public static final VString VNONREQUIRED_SAMPLE_CONCENTRATION_IN_GRAMS_PER_LITER = new VString("sampleConcentrationInGramsPerLiter", 0, 255, false);
+  public static final VString VNONREQUIRED_SAMPLE_BATCH = new VString("sampleBatch", 0, 255, false);
+  public static final VString VNONREQUIRED_SAMPLE_COMMENT = new VString("sampleComment", 0, 255, false);
   /**
    * logger to use
@@ -2379 +2304 @@
       properties.add(new ExternalGelIdSelect(dc, project));
       properties.add(selectLocalSampleId(dc, project));
-      TextField<String> nameF = new TextField<String>(VFILENAME);
+      TextField<String> nameF = new FileNameField();
       nameF.setValue("ProteinReport.tsv");
       nameF.setLabel("OutputFileName");
@@ -2933 +2858 @@
       form.addFieldset(properties);
       // Filename field
-      TextField<String> nameF = new TextField<String>(VFILENAME);
+      TextField<String> nameF = new FileNameField();
       nameF.setValue("HitsReport.tsv");
       nameF.setLabel("OutputFileName");
@@ -3725 +3650 @@
     }
     // Mascot Parameters Template File
-    TextField<String> parameterFileF = createField(VFILENAME);
+    TextField<String> parameterFileF = new FileNameField();
     fs.add(parameterFileF);
     parameterFileF.setLabel("MascotParameterTemplateFile");
@@ -3839 +3764 @@
     }
     // Mascot Parameters Template File
-    TextField<String> parameterFileF = createField(VFILENAME);
+    TextField<String> parameterFileF = new FileNameField();
     fs.add(parameterFileF);
     parameterFileF.setLabel("MascotParameterTemplateFile");
@@ -4861 +4786 @@
     }
     // OMSSA Parameters Template File
-    TextField<String> parameterFileF = createField(VFILENAME);
+    TextField<String> parameterFileF = new FileNameField();
     fs.add(parameterFileF);
     parameterFileF.setLabel("OMSSAParameterTemplateFile");
@@ -4956 +4881 @@
     }
     // OMSSA Parameters Template File
-    TextField<String> parameterFileF = createField(VFILENAME);
+    TextField<String> parameterFileF = new FileNameField();
     fs.add(parameterFileF);
     parameterFileF.setLabel("OMSSAParameterTemplateFile");
@@ -5882 +5807 @@
     }
     // XTandem Parameters Template File
-    TextField<String> parameterFileF = createField(VFILENAME);
+    TextField<String> parameterFileF = new FileNameField();
     fs.add(parameterFileF);
     parameterFileF.setLabel("XTandemParameterTemplateFile");
@@ -5958 +5883 @@
     }
     // XTandem Parameters Template File
-    TextField<String> parameterFileF = createField(VFILENAME);
+    TextField<String> parameterFileF = new FileNameField();
     fs.add(parameterFileF);
     parameterFileF.setLabel("XTandemParameterTemplateFile");
@@ -8239 +8164 @@
     quantityFS.add(quantityF);
     //
-    TextField<Float> concF = newConcentrationField();
+    TextField<Float> concF = new ConcentrationField();
     quantityFS.add(concF);
     if (extract != null)
@@ -8287 +8212 @@
     quantityFS.add(quantityF);
     //
-    TextField<Float> concF = newConcentrationField();
+    TextField<Float> concF = new ConcentrationField();
     quantityFS.add(concF);
     //
@@ -8353 +8278 @@
     quantityFS.add(quantityF);
     //
-    TextField<Float> concF = newConcentrationField();
+    TextField<Float> concF = new ConcentrationField();
     quantityFS.add(concF);
     //
@@ -8557 +8482 @@
     field.setLabel("StorageLocation");
   field.setHelp("E.g. Fridge X on floor Y");
-    return field;
-  }
-
-
-  public TextField<Float> newConcentrationField()
-  {
-    TextField<Float> field = new TextField<Float>(VCONCENTRATION);
-    field.setLabel("Concentration");
-  field.setHelp("Grams protein/liter");
     return field;
   }
@@ -9544 +9460 @@
     fs.add(typeS);
     // Protocol File
-    TextField<String> fileF = createField(VFILENAME);
+    TextField<String> fileF = new FileNameField();
     fs.add(fileF);
     fileF.setLabel("ProtocolFile");
@@ -9839 +9755 @@
     if (GelScanEvent.class.equals(cls))
     {
-      TextField<String> fileF = createField(VFILENAME);
+      TextField<String> fileF = new FileNameField();
       fs.add(fileF);
       fileF.setValue("not specified");
@@ -9972 +9888 @@
       fs.add(typeS);
       // Protocol File
-      TextField<String> fileF = createField(VFILENAME);
+      TextField<String> fileF = new FileNameField();
       fs.add(fileF);
       fileF.setLabel("ProtocolFile");