Changeset 3828

Timestamp:

Sep 8, 2010, 9:43:10 AM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Replaced references to FormFactory.VDESCR with DescriptionField.VPARAM

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/directory/AddDirectory.java (modified) (1 diff)
• action/directory/SaveDirectory.java (modified) (1 diff)
• action/extract/AddExtract.java (modified) (1 diff)
• action/extract/AddLabeledExtract.java (modified) (1 diff)
• action/extract/AddSecondaryExtract.java (modified) (1 diff)
• action/extract/AddSecondaryLabeledExtract.java (modified) (1 diff)
• action/extract/SaveExtract.java (modified) (1 diff)
• action/extract/SaveLabeledExtract.java (modified) (1 diff)
• action/file/CreateProtocolFromFile.java (modified) (1 diff)
• action/file/SaveFileProperties.java (modified) (1 diff)
• action/mascot/AddMascotParameterSetStorage.java (modified) (1 diff)
• action/mascot/NewMascotParameterSetStorage.java (modified) (1 diff)
• action/mascot/SaveMascotParameterSetStorage.java (modified) (1 diff)
• action/mascot/SelectMascotParameterFileStep1a.java (modified) (2 diffs)
• action/mascot/SelectMascotParameterFileStep1b.java (modified) (1 diff)
• action/news/AddNews.java (modified) (1 diff)
• action/news/SaveNews.java (modified) (1 diff)
• action/omssa/AddOMSSAParameterSetStorage.java (modified) (1 diff)
• action/omssa/NewOMSSAParameterSetStorage.java (modified) (1 diff)
• action/omssa/SaveOMSSAParameterSetStorage.java (modified) (1 diff)
• action/omssa/SelectOMSSAParameterFileStep1a.java (modified) (2 diffs)
• action/omssa/SelectOMSSAParameterFileStep1b.java (modified) (1 diff)
• action/peakListSet/SavePeakListSet.java (modified) (1 diff)
• action/project/AddProject.java (modified) (1 diff)
• action/project/SaveProject.java (modified) (1 diff)
• action/protocol/AddProtocol.java (modified) (1 diff)
• action/protocol/NewProtocol.java (modified) (1 diff)
• action/protocol/ResetProtocolFile.java (modified) (2 diffs)
• action/protocol/SelectProtocolFileStep1a.java (modified) (2 diffs)
• action/protocol/SelectProtocolFileStep1b.java (modified) (1 diff)
• action/user/AddUser.java (modified) (3 diffs)
• action/user/SaveMyProfileProperties.java (modified) (1 diff)
• action/user/SaveUserProperties.java (modified) (1 diff)
• action/xTandemInput/AddXTandemParameterSetStorage.java (modified) (1 diff)
• action/xTandemInput/NewXTandemParameterSetStorage.java (modified) (1 diff)
• action/xTandemInput/SaveXTandemParameterSetStorage.java (modified) (1 diff)
• action/xTandemInput/SelectXTandemParameterFileStep1a.java (modified) (2 diffs)
• action/xTandemInput/SelectXTandemParameterFileStep1b.java (modified) (1 diff)
• gui/form/FormFactory.java (modified) (16 diffs)

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

@@ -65 +65 @@
     newDir.setParent(parentDir);
     newDir.setName(getValidString(NameField.VPARAM));
-    newDir.setDescription(getValidString(FormFactory.VDESCR));    
+    newDir.setDescription(getValidString(DescriptionField.VPARAM));   
     dc.saveItem(newDir);
     dc.commit();

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

@@ -61 +61 @@
     Directory dir = factory.getById(Directory.class, projectId);
     dir.setName(getValidString(NameField.VPARAM));
-    dir.setDescription(getValidString(FormFactory.VDESCR));
+    dir.setDescription(getValidString(DescriptionField.VPARAM));
     dc.commit();
     setMessage("Directory properties saved");

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

@@ -94 +94 @@
     extract.setExternalId(externalId);
     //
-    extract.setDescription(getString(FormFactory.VDESCR));
+    extract.setDescription(getString(DescriptionField.VPARAM));
     //
     String storageLocation = getString(FormFactory.VSTORAGELOCATION);

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

@@ -91 +91 @@
     labeledExtract.setExternalId(externalId);
     //
-    labeledExtract.setDescription(getString(FormFactory.VDESCR));
+    labeledExtract.setDescription(getString(DescriptionField.VPARAM));
     //
     String storageLocation = getString(FormFactory.VSTORAGELOCATION);

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

@@ -82 +82 @@
     extract.setExternalId(externalId);
     //
-    extract.setDescription(getString(FormFactory.VDESCR));
+    extract.setDescription(getString(DescriptionField.VPARAM));
     //
     String storageLocation = getString(FormFactory.VSTORAGELOCATION);

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

@@ -94 +94 @@
     labeledExtract.setExternalId(externalId);
     //
-    labeledExtract.setDescription(getString(FormFactory.VDESCR));
+    labeledExtract.setDescription(getString(DescriptionField.VPARAM));
     //
     String storageLocation = getString(FormFactory.VSTORAGELOCATION);

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

@@ -69 +69 @@
     extract.setExternalId(externalId);
     //
-    extract.setDescription(getString(FormFactory.VDESCR));
+    extract.setDescription(getString(DescriptionField.VPARAM));
     //
     String storageLocation = getString(FormFactory.VSTORAGELOCATION);

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

@@ -72 +72 @@
     extract.setExternalId(externalId);
     //
-    extract.setDescription(getString(FormFactory.VDESCR));
+    extract.setDescription(getString(DescriptionField.VPARAM));
     //
     String storageLocation = getString(FormFactory.VSTORAGELOCATION);

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

@@ -49 +49 @@
     }
     String name = getValidString(NameField.VPARAM);
-    String descr = getValidString(FormFactory.VDESCR);
+    String descr = getValidString(DescriptionField.VPARAM);
     String type = getValidString(FormFactory.VTYPE);
     log.debug("name = \"" + name + "\"");

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

@@ -64 +64 @@
     file.setName(name);
     //
-    String descr = getString(FormFactory.VDESCR);
+    String descr = getString(DescriptionField.VPARAM);
     file.setDescription(descr);
     //

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

@@ -66 +66 @@
     // Get values
     String name = getString(NameField.VPARAM);
-    String description = getString(FormFactory.VDESCR);
+    String description = getString(DescriptionField.VPARAM);
     Integer parameterTemplateFileId = getInteger(VMASCOTPARAMETERTEMPLATEFILEID);
     String searchType = getString(SaveMascotParameterSetStorage.VMASCOT_SEARCH_TYPE);

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

@@ -64 +64 @@
     setSessionAttribute(NameField.VPARAM, null);
     // Get and reset MascotParameterSetStorage description session attribute
-    String description = getSessionAttribute(FormFactory.VDESCR);
-    setSessionAttribute(FormFactory.VDESCR, null);
+    String description = getSessionAttribute(DescriptionField.VPARAM);
+    setSessionAttribute(DescriptionField.VPARAM, null);
     // Get and reset spectrum file id session attribute
     Integer spectrumFileId = getSessionAttribute(SearchMascot.VSPECTRUMFILEID);

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

@@ -230 +230 @@
         String name = getValidString(NameField.VPARAM);
         log.debug("name = \"" + name + "\"");
-        String description = getValidString(FormFactory.VDESCR);
+        String description = getValidString(DescriptionField.VPARAM);
         log.debug("description = \"" + description + "\"");
         // Check that MascotParameterSetStorage name is not already used

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

@@ -57 +57 @@
     verifyParameters(form);
     String name = getString(NameField.VPARAM);
-    String description = getString(FormFactory.VDESCR);
+    String description = getString(DescriptionField.VPARAM);
     Integer parameterTemplateFileId = getInteger(AddMascotParameterSetStorage.VMASCOTPARAMETERTEMPLATEFILEID);
     // Get original forward action
@@ -93 +93 @@
     setSessionAttribute(ViewActiveDirectory.VDIRID, dirId);
     setSessionAttribute(NameField.VPARAM, name);
-    setSessionAttribute(FormFactory.VDESCR, description);
+    setSessionAttribute(DescriptionField.VPARAM, description);
     setSessionAttribute(AddMascotParameterSetStorage.VMASCOTPARAMETERTEMPLATEFILEID, parameterTemplateFileId);
     setSessionAttribute(ViewActiveDirectory.VSELECT, true);

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

@@ -55 +55 @@
      */
     String name = getSessionAttribute(NameField.VPARAM);
-    String description = getSessionAttribute(FormFactory.VDESCR);
+    String description = getSessionAttribute(DescriptionField.VPARAM);
     Integer parameterTemplateFileId = getSessionAttribute(AddMascotParameterSetStorage.VMASCOTPARAMETERTEMPLATEFILEID);
     String forward2Id = getSessionAttribute(FormFactory.VFWD2ACTION);

trunk/client/servlet/src/org/proteios/action/news/AddNews.java

@@ -61 +61 @@
     News news = factory.create(News.class);
     String name = getString(NameField.VPARAM);
-    String descr = getString(FormFactory.VDESCR);
+    String descr = getString(DescriptionField.VPARAM);
     Date startDate = getValidDate(FormFactory.VSTARTDATE);
     Date newsDate = getValidDate(FormFactory.VNEWSDATE);

trunk/client/servlet/src/org/proteios/action/news/SaveNews.java

@@ -65 +65 @@
      */
     String name = getString(NameField.VPARAM);
-    String descr = getString(FormFactory.VDESCR);
+    String descr = getString(DescriptionField.VPARAM);
     Date startDate = getValidDate(FormFactory.VSTARTDATE);
     Date newsDate = getValidDate(FormFactory.VNEWSDATE);

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

@@ -66 +66 @@
     // Get values
     String name = getString(NameField.VPARAM);
-    String description = getString(FormFactory.VDESCR);
+    String description = getString(DescriptionField.VPARAM);
     Integer parameterTemplateFileId = getInteger(VOMSSAPARAMETERTEMPLATEFILEID);
     String searchSpectrumType = getString(SaveOMSSAParameterSetStorage.VOMSSA_SEARCH_SPECTRUM_TYPE);

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

@@ -64 +64 @@
     setSessionAttribute(NameField.VPARAM, null);
     // Get and reset OMSSAParameterSetStorage description session attribute
-    String description = getSessionAttribute(FormFactory.VDESCR);
-    setSessionAttribute(FormFactory.VDESCR, null);
+    String description = getSessionAttribute(DescriptionField.VPARAM);
+    setSessionAttribute(DescriptionField.VPARAM, null);
     // Get and reset spectrum file id session attribute
     Integer spectrumFileId = getSessionAttribute(SearchOMSSA.VSPECTRUMFILEID);

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

@@ -280 +280 @@
         String name = getValidString(NameField.VPARAM);
         log.debug("name = \"" + name + "\"");
-        String description = getValidString(FormFactory.VDESCR);
+        String description = getValidString(DescriptionField.VPARAM);
         log.debug("description = \"" + description + "\"");
         // Check that OMSSAParameterSetStorage name is not already used

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

@@ -57 +57 @@
     verifyParameters(form);
     String name = getString(NameField.VPARAM);
-    String description = getString(FormFactory.VDESCR);
+    String description = getString(DescriptionField.VPARAM);
     Integer parameterTemplateFileId = getInteger(AddOMSSAParameterSetStorage.VOMSSAPARAMETERTEMPLATEFILEID);
     // Get original forward action
@@ -93 +93 @@
     setSessionAttribute(ViewActiveDirectory.VDIRID, dirId);
     setSessionAttribute(NameField.VPARAM, name);
-    setSessionAttribute(FormFactory.VDESCR, description);
+    setSessionAttribute(DescriptionField.VPARAM, description);
     setSessionAttribute(AddOMSSAParameterSetStorage.VOMSSAPARAMETERTEMPLATEFILEID, parameterTemplateFileId);
     setSessionAttribute(ViewActiveDirectory.VSELECT, true);

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

@@ -55 +55 @@
      */
     String name = getSessionAttribute(NameField.VPARAM);
-    String description = getSessionAttribute(FormFactory.VDESCR);
+    String description = getSessionAttribute(DescriptionField.VPARAM);
     Integer parameterTemplateFileId = getSessionAttribute(AddOMSSAParameterSetStorage.VOMSSAPARAMETERTEMPLATEFILEID);
     String forward2Id = getSessionAttribute(FormFactory.VFWD2ACTION);

trunk/client/servlet/src/org/proteios/action/peakListSet/SavePeakListSet.java

@@ -58 +58 @@
     Integer plsId = getValidInteger(FormFactory.VID);
     String name = getValidString(NameField.VPARAM);
-    String descr = getValidString(FormFactory.VDESCR);
+    String descr = getValidString(DescriptionField.VPARAM);
     DbControl dc = newDbControl();
     PeakListSet pls = PeakListSet.getById(dc, plsId);

trunk/client/servlet/src/org/proteios/action/project/AddProject.java

@@ -74 +74 @@
     verifyParameters(form);
   name = getString(NameField.VPARAM);
-  description = getString(FormFactory.VDESCR);
+  description = getString(DescriptionField.VPARAM);
   projectType = getInteger(FormFactory.VPROJECTTYPE);
 

trunk/client/servlet/src/org/proteios/action/project/SaveProject.java

@@ -50 +50 @@
     Integer projectId = getValidInteger(FormFactory.VID);
     String name = getValidString(NameField.VPARAM);
-    String description = getValidString(FormFactory.VDESCR);
+    String description = getValidString(DescriptionField.VPARAM);
   Integer projectType = getValidInteger(FormFactory.VPROJECTTYPE);
   Integer status = getValidInteger(FormFactory.VPROJECTSTATUS);

trunk/client/servlet/src/org/proteios/action/protocol/AddProtocol.java

@@ -57 +57 @@
     // Get values
     String name = getString(NameField.VPARAM);
-    String description = getString(FormFactory.VDESCR);
+    String description = getString(DescriptionField.VPARAM);
     String type = getString(FormFactory.VTYPE);
     Integer fileId = getInteger(FormFactory.VPROTOCOLFILEID);

trunk/client/servlet/src/org/proteios/action/protocol/NewProtocol.java

@@ -66 +66 @@
     setSessionAttribute(NameField.VPARAM, null);
     // Get and reset protocol description session attribute
-    String description = getSessionAttribute(FormFactory.VDESCR);
-    setSessionAttribute(FormFactory.VDESCR, null);
+    String description = getSessionAttribute(DescriptionField.VPARAM);
+    setSessionAttribute(DescriptionField.VPARAM, null);
     // Get and reset protocol type session attribute
     String type = getSessionAttribute(FormFactory.VTYPE);

trunk/client/servlet/src/org/proteios/action/protocol/ResetProtocolFile.java

@@ -59 +59 @@
     verifyParameters(form);
     String name = getString(NameField.VPARAM);
-    String description = getString(FormFactory.VDESCR);
+    String description = getString(DescriptionField.VPARAM);
     String type = getString(FormFactory.VTYPE);
     Integer fileId = getInteger(FormFactory.VPROTOCOLFILEID);
@@ -97 +97 @@
     setSessionAttribute(ViewActiveDirectory.VDIRID, dirId);
     setSessionAttribute(NameField.VPARAM, name);
-    setSessionAttribute(FormFactory.VDESCR, description);
+    setSessionAttribute(DescriptionField.VPARAM, description);
     setSessionAttribute(FormFactory.VTYPE, type);
     setSessionAttribute(ViewActiveDirectory.VSELECT, true);

trunk/client/servlet/src/org/proteios/action/protocol/SelectProtocolFileStep1a.java

@@ -57 +57 @@
     verifyParameters(form);
     String name = getString(NameField.VPARAM);
-    String description = getString(FormFactory.VDESCR);
+    String description = getString(DescriptionField.VPARAM);
     String type = getString(FormFactory.VTYPE);
     Integer fileId = getInteger(FormFactory.VPROTOCOLFILEID);
@@ -95 +95 @@
     setSessionAttribute(ViewActiveDirectory.VDIRID, dirId);
     setSessionAttribute(NameField.VPARAM, name);
-    setSessionAttribute(FormFactory.VDESCR, description);
+    setSessionAttribute(DescriptionField.VPARAM, description);
     setSessionAttribute(FormFactory.VTYPE, type);
     setSessionAttribute(ViewActiveDirectory.VSELECT, true);

trunk/client/servlet/src/org/proteios/action/protocol/SelectProtocolFileStep1b.java

@@ -56 +56 @@
      */
     String name = getSessionAttribute(NameField.VPARAM);
-    String description = getSessionAttribute(FormFactory.VDESCR);
+    String description = getSessionAttribute(DescriptionField.VPARAM);
     String type = getSessionAttribute(FormFactory.VTYPE);
     String forward2Id = getSessionAttribute(FormFactory.VFWD2ACTION);

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

@@ -28 +28 @@
 package org.proteios.action.user;
 
+import java.util.ArrayList;
 import org.proteios.action.ProteiosAction;
 import org.proteios.core.DbControl;
@@ -37 +38 @@
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
-import java.util.ArrayList;
 
 /**
@@ -67 +67 @@
     String name = getString(NameField.VPARAM);
     String email = getString(EmailField.VPARAM);
-    String descr = getString(FormFactory.VDESCR);
+    String descr = getString(DescriptionField.VPARAM);
     // Save a new user
     User user = factory.createUser(login, pwd1);

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

@@ -55 +55 @@
     name = getString(NameField.VPARAM);
     email = getString(FormFactory.VEMAIL);
-    descr = getString(FormFactory.VDESCR);
+    descr = getString(DescriptionField.VPARAM);
     phone = getString(FormFactory.VPHONE);
     address = getString(FormFactory.VADDRESS);

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

@@ -57 +57 @@
     name = getString(NameField.VPARAM);
     email = getString(FormFactory.VEMAIL);
-    descr = getString(FormFactory.VDESCR);
+    descr = getString(DescriptionField.VPARAM);
     phone = getString(FormFactory.VPHONE);
     address = getString(FormFactory.VADDRESS);

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

@@ -66 +66 @@
     // Get values
     String name = getString(NameField.VPARAM);
-    String description = getString(FormFactory.VDESCR);
+    String description = getString(DescriptionField.VPARAM);
     Integer parameterTemplateFileId = getInteger(VXTANDEMPARAMETERTEMPLATEFILEID);
     String forwardTo = getValidString(ForwardField.VPARAM);

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

@@ -64 +64 @@
     setSessionAttribute(NameField.VPARAM, null);
     // Get and reset XTandemParameterSetStorage description session attribute
-    String description = getSessionAttribute(FormFactory.VDESCR);
-    setSessionAttribute(FormFactory.VDESCR, null);
+    String description = getSessionAttribute(DescriptionField.VPARAM);
+    setSessionAttribute(DescriptionField.VPARAM, null);
     // Get and reset spectrum file id session attribute
     Integer spectrumFileId = getSessionAttribute(SearchXTandem.VSPECTRUMFILEID);

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

@@ -334 +334 @@
         String name = getValidString(NameField.VPARAM);
         log.debug("name = \"" + name + "\"");
-        String description = getValidString(FormFactory.VDESCR);
+        String description = getValidString(DescriptionField.VPARAM);
         log.debug("description = \"" + description + "\"");
         // Check that XTandemParameterSetStorage name is not already used

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

@@ -57 +57 @@
     verifyParameters(form);
     String name = getString(NameField.VPARAM);
-    String description = getString(FormFactory.VDESCR);
+    String description = getString(DescriptionField.VPARAM);
     Integer parameterTemplateFileId = getInteger(AddXTandemParameterSetStorage.VXTANDEMPARAMETERTEMPLATEFILEID);
     // Get original forward action
@@ -93 +93 @@
     setSessionAttribute(ViewActiveDirectory.VDIRID, dirId);
     setSessionAttribute(NameField.VPARAM, name);
-    setSessionAttribute(FormFactory.VDESCR, description);
+    setSessionAttribute(DescriptionField.VPARAM, description);
     setSessionAttribute(AddXTandemParameterSetStorage.VXTANDEMPARAMETERTEMPLATEFILEID, parameterTemplateFileId);
     setSessionAttribute(ViewActiveDirectory.VSELECT, true);

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

@@ -55 +55 @@
      */
     String name = getSessionAttribute(NameField.VPARAM);
-    String description = getSessionAttribute(FormFactory.VDESCR);
+    String description = getSessionAttribute(DescriptionField.VPARAM);
     Integer parameterTemplateFileId = getSessionAttribute(AddXTandemParameterSetStorage.VXTANDEMPARAMETERTEMPLATEFILEID);
     String forward2Id = getSessionAttribute(FormFactory.VFWD2ACTION);

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

@@ -209 +209 @@
   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 VDESCR = new VString("description", 0, 255);
   public static final VString VEMAIL = new VString("email", 1, 255, true);
   public static final VString VPHONE = new VString("phone", 0, 255);
@@ -515 +514 @@
   }
 
-
-  private TextArea newDescriptionField()
-  {
-    TextArea descrF = new TextArea(VDESCR);
-    descrF.setLabel("Description");
-    return descrF;
-  }
-
-
   public TextField<Integer> newIdField()
   {
@@ -2165 +2155 @@
     properties.add(nameF);
     // Description field
-    TextArea descrF = newDescriptionField();
+    TextArea descrF = new DescriptionField();
     properties.add(descrF);
     /***********************************************************************
@@ -3633 +3623 @@
     }
     // MascotParameterSetStorage Description
-    TextArea descF = new TextArea(VDESCR);
-    descF.setLabel("Description");
+    TextArea descF = new DescriptionField();
     fs.add(descF);
     descF.setValue("Mascot parameter set storage");
@@ -3746 +3735 @@
     }
     // MascotParameterSetStorage Description
-    TextArea descF = new TextArea(VDESCR);
-    descF.setLabel("Description");
+    TextArea descF = new DescriptionField();
     fs.add(descF);
     descF.setValue("Mascot parameter set storage");
@@ -4767 +4755 @@
     }
     // OMSSAParameterSetStorage Description
-    TextArea descF = new TextArea(VDESCR);
-    descF.setLabel("Description");
+    TextArea descF = new DescriptionField();
     fs.add(descF);
     descF.setValue("OMSSA parameter set storage");
@@ -4861 +4848 @@
     }
     // OMSSAParameterSetStorage Description
-    TextArea descF = new TextArea(VDESCR);
-    descF.setLabel("Description");
+    TextArea descF = new DescriptionField();
     fs.add(descF);
     descF.setValue("OMSSA parameter set storage");
@@ -5786 +5772 @@
     }
     // XTandemParameterSetStorage Description
-    TextArea descF = new TextArea(VDESCR);
-    descF.setLabel("Description");
+    TextArea descF = new DescriptionField();
     fs.add(descF);
     descF.setValue("X!Tandem parameter set storage");
@@ -5861 +5846 @@
     }
     // XTandemParameterSetStorage Description
-    TextArea descF = new TextArea(VDESCR);
-    descF.setLabel("Description");
+    TextArea descF = new DescriptionField();
     fs.add(descF);
     descF.setValue("X!Tandem parameter set storage");
@@ -8137 +8121 @@
     fs.add(externalIdF);
     //
-    TextArea descriptionF = newDescriptionField();
+    TextArea descriptionF = new DescriptionField();
     fs.add(descriptionF);
     //
@@ -8185 +8169 @@
     fs.add(externalIdF);
     //
-    TextArea descriptionF = newDescriptionField();
+    TextArea descriptionF = new DescriptionField();
     fs.add(descriptionF);
     // 
@@ -8251 +8235 @@
     fs.add(labelF);
     //
-    TextArea descriptionF = newDescriptionField();
+    TextArea descriptionF = new DescriptionField();
     fs.add(descriptionF);
     // 
@@ -8963 +8947 @@
                  * bar
                  */
-                TextArea descrF = newDescriptionField();
+                TextArea descrF = new DescriptionField();
                 descrF.setDisabled(true);
                 descrF
@@ -9349 +9333 @@
     fs.add(nameF);
     // Protocol Description
-    TextArea descF = new TextArea(VDESCR);
-    descF.setLabel("Description");
+    TextArea descF = new DescriptionField();
     fs.add(descF);
     if (file != null)
@@ -9414 +9397 @@
     }
     // Protocol Description
-    TextArea descF = new TextArea(VDESCR);
-    descF.setLabel("Description");
+    TextArea descF = new DescriptionField();
     fs.add(descF);
     if (protocol != null)
@@ -9550 +9532 @@
       TextField<String> nameF = new NameField();
       fs.add(nameF);
-      TextArea descF = new TextArea(VDESCR);
-      descF.setLabel("Description");
+      TextArea descF = new DescriptionField();
       fs.add(descF);
       if (obj != null)