Changeset 3842

Timestamp:

Sep 10, 2010, 2:09:23 PM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Replaced Fieldset.getLegendTitle with getTitle.

Location:

trunk

Files:

• client/servlet/src/org/proteios/action/events/SelectSeparationMethod.java (modified) (1 diff)
• client/servlet/src/org/proteios/action/feature/FeatureHitMatchForm.java (modified) (1 diff)
• client/servlet/src/org/proteios/action/file/AnnotateBioMaterial.java (modified) (1 diff)
• client/servlet/src/org/proteios/action/file/InspectActiveSpectrumFile.java (modified) (1 diff)
• client/servlet/src/org/proteios/action/hit/ExclusionList.java (modified) (1 diff)
• client/servlet/src/org/proteios/action/hit/PrideExport.java (modified) (2 diffs)
• client/servlet/src/org/proteios/action/hit/ProteinAssembly1.java (modified) (3 diffs)
• client/servlet/src/org/proteios/action/project/CreateLargeProject.java (modified) (1 diff)
• client/servlet/src/org/proteios/action/project/ViewActiveProject.java (modified) (1 diff)
• client/servlet/src/org/proteios/action/spectrumSearch/ViewActivePeptideSearchResult.java (modified) (1 diff)
• client/servlet/src/org/proteios/gui/form/CombineHitsForm.java (modified) (3 diffs)
• client/servlet/src/org/proteios/gui/form/Fieldset.java (modified) (3 diffs)
• client/servlet/src/org/proteios/gui/form/FileTypeForm.java (modified) (1 diff)
• client/servlet/src/org/proteios/gui/form/FormFactory.java (modified) (69 diffs)
• client/servlet/src/org/proteios/gui/form/FormUtil.java (modified) (1 diff)
• client/servlet/src/org/proteios/gui/form/GroupsForm.java (modified) (1 diff)
• client/servlet/src/org/proteios/gui/form/ImportFileForm.java (modified) (1 diff)
• client/servlet/src/org/proteios/gui/form/ImportHitsWizardStep1Form.java (modified) (1 diff)
• client/servlet/src/org/proteios/gui/form/ImportHitsWizardStep2Form.java (modified) (1 diff)
• client/servlet/src/org/proteios/gui/form/ImportHitsWizardStep3Form.java (modified) (1 diff)
• client/servlet/src/org/proteios/gui/form/JobForm.java (modified) (1 diff)
• client/servlet/src/org/proteios/gui/form/LabeledExtractForm.java (modified) (1 diff)
• client/servlet/src/org/proteios/gui/form/LoginForm.java (modified) (1 diff)
• client/servlet/src/org/proteios/gui/form/MimeTypeForm.java (modified) (1 diff)
• client/servlet/src/org/proteios/gui/form/NameableProperties.java (modified) (1 diff)
• client/servlet/src/org/proteios/gui/form/NewFileForm.java (modified) (1 diff)
• client/servlet/src/org/proteios/gui/form/NewUserForm.java (modified) (2 diffs)
• client/servlet/src/org/proteios/gui/form/NullForm.java (modified) (1 diff)
• client/servlet/src/org/proteios/gui/form/PluginDefinitionForm.java (modified) (1 diff)
• client/servlet/src/org/proteios/gui/form/ProfilePasswordForm.java (modified) (1 diff)
• client/servlet/src/org/proteios/gui/form/SampleForm.java (modified) (1 diff)
• client/servlet/src/org/proteios/gui/form/SelectPluginForm.java (modified) (2 diffs)
• client/servlet/src/org/proteios/gui/form/UserRolesForm.java (modified) (1 diff)
• client/servlet/src/org/proteios/gui/table/TableFactory.java (modified) (1 diff)
• client/servlet/src/org/proteios/gui/web/GUIConverter.java (modified) (1 diff)
• client/servlet/test/src/org/proteios/gui/GUIFactoryUtil.java (modified) (1 diff)
• contrib/SpectrumLibraryExport/src/satoshi/LibraryExportForm.java (modified) (1 diff)

trunk/client/servlet/src/org/proteios/action/events/SelectSeparationMethod.java

@@ -62 +62 @@
     Form form = new Form("selectMethod");
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("SelectMethod");
+    fs.setTitle("SelectMethod");
     form.addFieldset(fs);
     //

trunk/client/servlet/src/org/proteios/action/feature/FeatureHitMatchForm.java

@@ -38 +38 @@
     Form form = new Form("FeatureHitsMatchForm");
     Fieldset properties = new Fieldset();
-    properties.getLegendTitle().setTitle("SettingsForReport");
+    properties.setTitle("SettingsForReport");
     form.addFieldset(properties);
     TextField<Float> tolF = new TextField<Float>(

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

@@ -80 +80 @@
     DbControl dc = newDbControl();
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("Select sample");
+    fs.setTitle("Select sample");
     if (dc != null)
     {

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

@@ -447 +447 @@
     spectrumIterationForm.setTitle("spectrumIterationForm");
     Fieldset spectrumIterationFS = new Fieldset();
-    spectrumIterationFS.getLegendTitle().setTitle("SpectrumIteration");
+    spectrumIterationFS.setTitle("SpectrumIteration");
     spectrumIterationForm.addFieldset(spectrumIterationFS);
     Toolbar spectrumIterationToolbar = new Toolbar();

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

@@ -93 +93 @@
       nameF.setLabel("OutputFileName");
       properties.add(nameF);
-      properties.getLegendTitle().setTitle("SettingsForReport");
+      properties.setTitle("SettingsForReport");
       form.addFieldset(properties);
       /*

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

@@ -91 +91 @@
     form.addFieldset(getContactFieldset());
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("SampleInfo");
+    fs.setTitle("SampleInfo");
     Checkbox<VBoolean> isFDR = new Checkbox<VBoolean>(
       CreatePrideExportJob.VADDSAMPLENAME);
@@ -165 +165 @@
   {
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("SpectrumFileContactInput");
+    fs.setTitle("SpectrumFileContactInput");
     Checkbox<VBoolean> isFDR = new Checkbox<VBoolean>(
       CreatePrideExportJob.VADDCONTACT);

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

@@ -84 +84 @@
     Fieldset properties = getFormFactory().getProteinAssemblyFieldset(
       project);
-    properties.getLegendTitle().setTitle("SettingsForReport");
+    properties.setTitle("SettingsForReport");
     form.addFieldset(properties);
     /*
@@ -105 +105 @@
     properties.add(isOccamCB);
     Fieldset validation = new Fieldset();
-    validation.getLegendTitle().setTitle("ValidationSettings");
+    validation.setTitle("ValidationSettings");
     form.addFieldset(validation);
     Checkbox<VBoolean> isFDR = new Checkbox<VBoolean>(
@@ -161 +161 @@
     properties.add(isRetrieve);
     Fieldset quantFS = new Fieldset();
-    quantFS.getLegendTitle().setTitle("QuantitationSettings");
+    quantFS.setTitle("QuantitationSettings");
     Select<VString> selectLabel = selectLabel();
     quantFS.add(selectLabel);

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

@@ -199 +199 @@
     Form form = new Form("rootPathForm");
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("largeProject");
+    fs.setTitle("largeProject");
     form.addFieldset(fs);
     // Fields

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

@@ -157 +157 @@
       }
     }
-    membersFS.getLegendTitle().setTitle("Members");
+    membersFS.setTitle("Members");
     // membersT.add(table);
     tabs.add(propertiesT);

trunk/client/servlet/src/org/proteios/action/spectrumSearch/ViewActivePeptideSearchResult.java

@@ -110 +110 @@
     Form mainForm = new Form("Search Result");
     Fieldset fs=new Fieldset();
-    fs.getLegendTitle().setTitle("Search Result");
+    fs.setTitle("Search Result");
     mainForm.addFieldset(fs);
     FormTemplateImpl formTemplate = new FormTemplateImpl();

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

@@ -77 +77 @@
         samplesF.addOption(allSampleIds);
       }
-      properties.getLegendTitle().setTitle("SettingsForReport");
+      properties.setTitle("SettingsForReport");
       addFieldset(properties);
       //
@@ -90 +90 @@
 
       // Score Type field set
-      scoreTypeFS.getLegendTitle().setTitle("ScoreTypeSettings");
+      scoreTypeFS.setTitle("ScoreTypeSettings");
       addFieldset(scoreTypeFS);
       //
@@ -152 +152 @@
       //
       // Output field set
-      outputFS.getLegendTitle().setTitle("Output");
+      outputFS.setTitle("Output");
       addFieldset(outputFS);
       //

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

@@ -48 +48 @@
  public Fieldset()
  {
+  this.title = new Title("");
  }
 
@@ -55 +56 @@
  }  
 
-  /**
-   * Get the fieldset legend Title object.
-   * 
-   * If legendTitle == null, a new tegendTitle object
-   * will be created with legendTitle.title equal to
-   * an empty string, and legendTitle.subtitle equal to null.
-   * To set part of legend that should be localized,
-   * use getLegendTitle().setTitle(String localizedString).
-   * To set part of legend that should not be localized,
-   * use getLegendTitle().setSubtitle(String unlocalizedString).
-   * 
-   * @return Title The fieldset legend Title object.
-   */
-  public Title getLegendTitle()
+  public Title getTitle()
   {
-    if (this.title == null)
-    {
-      this.title = new Title("");
-    }
     return this.title;
   }
@@ -83 +67 @@
    * @param legendTitle Title The legend Title to set.
    */
-  public void setLegendTitle(Title title)
+  public void setTitle(Title title)
   {
     this.title = title;
+  }
+
+public void setTitle(String title)
+  {
+    this.title.setTitle(title);
   }
 

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

@@ -54 +54 @@
 
   fs = new Fieldset();
-  fs.getLegendTitle().setTitle("FileType");
+  fs.setTitle("FileType");
     fs.add(fileTypeS);
   addFieldset(fs);

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

@@ -585 +585 @@
     Fieldset fs = new Fieldset();
     form.addFieldset(fs);
-    fs.getLegendTitle().setTitle("Annotation");
+    fs.setTitle("Annotation");
     // id field
     TextField<Integer> idF = newIdField();
@@ -686 +686 @@
     // properties
     Fieldset properties = new Fieldset();
-    properties.getLegendTitle().setTitle("NotificationConfiguration");
+    properties.setTitle("NotificationConfiguration");
     // SMTP host field
     TextField<String> smtpHostF = new TextField<String>(
@@ -775 +775 @@
     // properties
     Fieldset properties = new Fieldset();
-    properties.getLegendTitle().setTitle("TablePreferencesConfiguration");
+    properties.setTitle("TablePreferencesConfiguration");
     // Table preferences reset check-box
     Checkbox<VBoolean> tablePreferencesResetCB = new Checkbox<VBoolean>(
@@ -840 +840 @@
      */
     Fieldset propertiesFS = new Fieldset();
-    propertiesFS.getLegendTitle().setTitle("Properties");
+    propertiesFS.setTitle("Properties");
     TextField<Integer> spectrumIdF = new TextField<Integer>(new VInteger(
       "spectrumId", 1, true));
@@ -849 +849 @@
      */
     Fieldset precursorFS = new Fieldset();
-    precursorFS.getLegendTitle().setTitle("Precursor");
+    precursorFS.setTitle("Precursor");
     /***********************************************************************
      * Peaklistset fieldset
      */
     Fieldset peaklistsetFS = new Fieldset();
-    peaklistsetFS.getLegendTitle().setTitle("ParentPeakListSet");
+    peaklistsetFS.setTitle("ParentPeakListSet");
     PeakListSet pls = peaklist.getPeakListSet();
     TextField<String> plsNameF = new NameField();
@@ -941 +941 @@
      */
     Fieldset propertiesFS = new Fieldset();
-    propertiesFS.getLegendTitle().setTitle("Properties");
+    propertiesFS.setTitle("Properties");
     /*
      * Hit id field.
@@ -1047 +1047 @@
        */
       precursorFS = new Fieldset();
-      precursorFS.getLegendTitle().setTitle("Precursor");
+      precursorFS.setTitle("Precursor");
       /*******************************************************************
        * Peaklistset fieldset
        */
       peaklistsetFS = new Fieldset();
-      peaklistsetFS.getLegendTitle().setTitle("ParentPeakListSet");
+      peaklistsetFS.setTitle("ParentPeakListSet");
       PeakListSet pls = peaklist.getPeakListSet();
       TextField<String> plsNameF = new NameField();
@@ -1171 +1171 @@
      */
     Fieldset massRangeFS = new Fieldset();
-    massRangeFS.getLegendTitle().setTitle("SpectrumMassRangeSelection");
+    massRangeFS.setTitle("SpectrumMassRangeSelection");
     //
     TextField<String> cutoffLowF = new TextField<String>(
@@ -1643 +1643 @@
       ActionLink cellAction = getActionFactory().getActionLink(
         actionClass, actionClass.getName());
-      cellAction.addParameter(FormFactory.VID, itemId);
+      cellAction.addParameter(ItemIdField.VPARAM, itemId);
       valueCell.setActionLink(cellAction);
     }
@@ -1798 +1798 @@
     //
     Fieldset contactInputFS = new Fieldset();
-    contactInputFS.getLegendTitle().setTitle("SpectrumFileContactInput");
+    contactInputFS.setTitle("SpectrumFileContactInput");
     form.addFieldset(contactInputFS);
     //
@@ -1834 +1834 @@
     //
     Fieldset contactOutputFS = new Fieldset();
-    contactOutputFS.getLegendTitle().setTitle("SpectrumFileContactOutput");
+    contactOutputFS.setTitle("SpectrumFileContactOutput");
     form.addFieldset(contactOutputFS);
     //
@@ -1894 +1894 @@
     //
     Fieldset sampleInputFS = new Fieldset();
-    sampleInputFS.getLegendTitle().setTitle("SpectrumFileSampleInput");
+    sampleInputFS.setTitle("SpectrumFileSampleInput");
     form.addFieldset(sampleInputFS);
     //
@@ -1960 +1960 @@
     //
     Fieldset sampleOutputFS = new Fieldset();
-    sampleOutputFS.getLegendTitle().setTitle("SpectrumFileSampleOutput");
+    sampleOutputFS.setTitle("SpectrumFileSampleOutput");
     form.addFieldset(sampleOutputFS);
     //
@@ -2001 +2001 @@
      */
     Fieldset properties = new Fieldset();
-    properties.getLegendTitle().setTitle("Properties");
+    properties.setTitle("Properties");
     // id
     TextField<Integer> itemIdF = newHiddenItemIdField();
@@ -2015 +2015 @@
      */
     Fieldset instrumentFS = new Fieldset();
-    instrumentFS.getLegendTitle().setTitle("Instrument");
+    instrumentFS.setTitle("Instrument");
     /***********************************************************************
      * Analyzers
      */
     Fieldset analyzersFS = new Fieldset();
-    analyzersFS.getLegendTitle().setTitle("Analyzers");
+    analyzersFS.setTitle("Analyzers");
     /***********************************************************************
      * Set field values
@@ -2070 +2070 @@
      */
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("ExportProperties");
+    fs.setTitle("ExportProperties");
     // Peaklist name field
     if (pls != null)
@@ -2161 +2161 @@
       // Properties fieldset
       Fieldset properties = new Fieldset();
-      properties.getLegendTitle().setTitle(
+      properties.setTitle(
         "ImportHitsNonGelWizardStep1FormLegend");
       form.addFieldset(properties);
@@ -2227 +2227 @@
       // Properties fieldset
       Fieldset properties = new Fieldset();
-      properties.getLegendTitle().setTitle(
+      properties.setTitle(
         "ImportHitsNonGelWizardStep2FormLegend");
       form.addFieldset(properties);
@@ -2539 +2539 @@
       //
       Fieldset properties = new Fieldset();
-      properties.getLegendTitle().setTitle("SettingsForHitReportFile");
+      properties.setTitle("SettingsForHitReportFile");
       form.addFieldset(properties);
       // Filename field
@@ -2566 +2566 @@
     //
     Fieldset comparisonOfHitsProjectSelectionFS = new Fieldset();
-    comparisonOfHitsProjectSelectionFS.getLegendTitle().setTitle(
+    comparisonOfHitsProjectSelectionFS.setTitle(
       "HitsComparisonReportProjectSelection");
     form.addFieldset(comparisonOfHitsProjectSelectionFS);
@@ -2615 +2615 @@
     //
     Fieldset project1FilterSettingsFS = new Fieldset();
-    project1FilterSettingsFS.getLegendTitle().setTitle(
+    project1FilterSettingsFS.setTitle(
       "HitsComparisonReportFilterSettings1");
     form.addFieldset(project1FilterSettingsFS);
@@ -2702 +2702 @@
     //
     Fieldset project2FilterSettingsFS = new Fieldset();
-    project2FilterSettingsFS.getLegendTitle().setTitle(
+    project2FilterSettingsFS.setTitle(
       "HitsComparisonReportFilterSettings2");
     form.addFieldset(project2FilterSettingsFS);
@@ -2789 +2789 @@
     //
     Fieldset hitComparisonTypeFS = new Fieldset();
-    hitComparisonTypeFS.getLegendTitle().setTitle(
+    hitComparisonTypeFS.setTitle(
       "HitsComparisonReportComparisonType");
     form.addFieldset(hitComparisonTypeFS);
@@ -2807 +2807 @@
     //
     Fieldset hitComparisonProteinSettingsFS = new Fieldset();
-    hitComparisonProteinSettingsFS.getLegendTitle().setTitle(
+    hitComparisonProteinSettingsFS.setTitle(
       "HitsComparisonReportProteinSettings");
     form.addFieldset(hitComparisonProteinSettingsFS);
@@ -2894 +2894 @@
     //
     Fieldset comparisonOfHitsOutputFS = new Fieldset();
-    comparisonOfHitsOutputFS.getLegendTitle().setTitle(
+    comparisonOfHitsOutputFS.setTitle(
       "HitsComparisonReportOutput");
     form.addFieldset(comparisonOfHitsOutputFS);
@@ -2920 +2920 @@
     //
     Fieldset prideFilterSettingsFS = new Fieldset();
-    prideFilterSettingsFS.getLegendTitle().setTitle(
+    prideFilterSettingsFS.setTitle(
       "PrideExportFilterSettings");
     form.addFieldset(prideFilterSettingsFS);
@@ -2945 +2945 @@
     //
     Fieldset prideOutputFS = new Fieldset();
-    prideOutputFS.getLegendTitle().setTitle("PrideExportOutput");
+    prideOutputFS.setTitle("PrideExportOutput");
     form.addFieldset(prideOutputFS);
     //
@@ -3037 +3037 @@
     form.setTitle("NewIPG");
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("Properties");
+    fs.setTitle("Properties");
     form.addFieldset(fs);
     //
@@ -3314 +3314 @@
     form.setTitle("NewMascotParameterSetStorage");
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("NewMascotParameterSetStorage");
+    fs.setTitle("NewMascotParameterSetStorage");
     // MascotParameterSetStorage Name
     TextField<String> nameF = new NameField();
@@ -3426 +3426 @@
     form.setTitle("SaveAsMascotParameterSetStorage");
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("SaveAsMascotParameterSetStorage");
+    fs.setTitle("SaveAsMascotParameterSetStorage");
     // MascotParameterSetStorage Name
     TextField<String> nameF = new NameField();
@@ -3684 +3684 @@
     //
     Fieldset mascotSearchUserDataInputFS = new Fieldset();
-    mascotSearchUserDataInputFS.getLegendTitle().setTitle(
+    mascotSearchUserDataInputFS.setTitle(
       "MascotSearchUserDataInput");
     form.addFieldset(mascotSearchUserDataInputFS);
@@ -3830 +3830 @@
     }
     log.debug("generalFSTitle = " + generalFSTitle);
-    generalFS.getLegendTitle().setTitle(generalFSTitle);
+    generalFS.setTitle(generalFSTitle);
     form.addFieldset(generalFS);
     //
@@ -4415 +4415 @@
     /*
      * Fieldset extraFS = new Fieldset();
-     * extraFS.getLegendTitle().setTitle("MascotParameterSetExtra");
+     * extraFS.setTitle("MascotParameterSetExtra");
      * form.addFieldset(extraFS);
      */
@@ -4446 +4446 @@
     form.setTitle("NewOMSSAParameterSetStorage");
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("NewOMSSAParameterSetStorage");
+    fs.setTitle("NewOMSSAParameterSetStorage");
     // OMSSAParameterSetStorage Name
     TextField<String> nameF = new NameField();
@@ -4539 +4539 @@
     form.setTitle("SaveAsOMSSAParameterSetStorage");
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("SaveAsOMSSAParameterSetStorage");
+    fs.setTitle("SaveAsOMSSAParameterSetStorage");
     // OMSSAParameterSetStorage Name
     TextField<String> nameF = new NameField();
@@ -4905 +4905 @@
      */
     Fieldset generalFS = new Fieldset();
-    generalFS.getLegendTitle().setTitle("OMSSAParameterSetGeneral");
+    generalFS.setTitle("OMSSAParameterSetGeneral");
     form.addFieldset(generalFS);
     // General, enzyme
@@ -5288 +5288 @@
      */
     Fieldset extraFS = new Fieldset();
-    extraFS.getLegendTitle().setTitle("OMSSAParameterSetExtra");
+    extraFS.setTitle("OMSSAParameterSetExtra");
     form.addFieldset(extraFS);
     // Extra, z dependence
@@ -5463 +5463 @@
     form.setTitle("NewXTandemParameterSetStorage");
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("NewXTandemParameterSetStorage");
+    fs.setTitle("NewXTandemParameterSetStorage");
     // XTandemParameterSetStorage Name
     TextField<String> nameF = new NameField();
@@ -5537 +5537 @@
     form.setTitle("SaveAsXTandemParameterSetStorage");
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("SaveAsXTandemParameterSetStorage");
+    fs.setTitle("SaveAsXTandemParameterSetStorage");
     // XTandemParameterSetStorage Name
     TextField<String> nameF = new NameField();
@@ -6302 +6302 @@
      */
     Fieldset listPathFS = new Fieldset();
-    listPathFS.getLegendTitle().setTitle("XTandemParameterSetListPath");
+    listPathFS.setTitle("XTandemParameterSetListPath");
     form.addFieldset(listPathFS);
     // List path, default parameters
@@ -6357 +6357 @@
      */
     Fieldset spectrumFS = new Fieldset();
-    spectrumFS.getLegendTitle().setTitle("XTandemParameterSetSpectrum");
+    spectrumFS.setTitle("XTandemParameterSetSpectrum");
     form.addFieldset(spectrumFS);
     // Spectrum, path
@@ -6501 +6501 @@
      */
     Fieldset residueFS = new Fieldset();
-    residueFS.getLegendTitle().setTitle("XTandemParameterSetResidue");
+    residueFS.setTitle("XTandemParameterSetResidue");
     form.addFieldset(residueFS);
     // Residue, modification mass select
@@ -6647 +6647 @@
      */
     Fieldset proteinFS = new Fieldset();
-    proteinFS.getLegendTitle().setTitle("XTandemParameterSetProtein");
+    proteinFS.setTitle("XTandemParameterSetProtein");
     form.addFieldset(proteinFS);
     // Protein, taxon
@@ -6864 +6864 @@
      */
     Fieldset refineFS = new Fieldset();
-    refineFS.getLegendTitle().setTitle("XTandemParameterSetRefine");
+    refineFS.setTitle("XTandemParameterSetRefine");
     form.addFieldset(refineFS);
     // Refine
@@ -7062 +7062 @@
      */
     Fieldset scoringFS = new Fieldset();
-    scoringFS.getLegendTitle().setTitle("XTandemParameterSetScoring");
+    scoringFS.setTitle("XTandemParameterSetScoring");
     form.addFieldset(scoringFS);
     // Scoring, minimum ion count
@@ -7212 +7212 @@
      */
     Fieldset outputFS = new Fieldset();
-    outputFS.getLegendTitle().setTitle("XTandemParameterSetOutput");
+    outputFS.setTitle("XTandemParameterSetOutput");
     form.addFieldset(outputFS);
     // Output, path
@@ -7424 +7424 @@
      */
     Fieldset inputFS = new Fieldset();
-    inputFS.getLegendTitle().setTitle("PIKEParameterSetInput");
+    inputFS.setTitle("PIKEParameterSetInput");
     form.addFieldset(inputFS);
     //
@@ -7553 +7553 @@
      */
     Fieldset outputFS = new Fieldset();
-    outputFS.getLegendTitle().setTitle("PIKEParameterSetOutput");
+    outputFS.setTitle("PIKEParameterSetOutput");
     form.addFieldset(outputFS);
     //
@@ -7597 +7597 @@
     form.setTitle("MascotResultRetrieval");
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("MascotResultRetrievalParameters");
+    fs.setTitle("MascotResultRetrievalParameters");
     // Get Mascot server URL string from Mascot properties file
     MascotPropertiesFile pf = new MascotPropertiesFile();
@@ -7753 +7753 @@
   {
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("UsedSample");
+    fs.setTitle("UsedSample");
     TextField<String> sampleIdF = new DummyField();
     sampleIdF.setDisabled(true);
@@ -7772 +7772 @@
   {
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("UsedExtract");
+    fs.setTitle("UsedExtract");
     TextField<String> extractIdF = new DummyField();
     extractIdF.setDisabled(true);
@@ -7791 +7791 @@
   {
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("UsedLabeledExtract");
+    fs.setTitle("UsedLabeledExtract");
     TextField<String> extractIdF = new DummyField();
     extractIdF.setDisabled(true);
@@ -7813 +7813 @@
     Fieldset fs = new Fieldset();
     modifyForPopup(fs);
-    fs.getLegendTitle().setTitle("Properties");
+    fs.setTitle("Properties");
     form.addFieldset(fs);
     //
@@ -7829 +7829 @@
     //
     Fieldset quantityFS = new Fieldset();
-    quantityFS.getLegendTitle().setTitle("Quantity");
+    quantityFS.setTitle("Quantity");
     form.addFieldset(quantityFS);
     //
@@ -7861 +7861 @@
     form.setTitle("NewSecondaryExtract");
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("Properties");
+    fs.setTitle("Properties");
     form.addFieldset(fs);
     //
@@ -7877 +7877 @@
     //
     Fieldset quantityFS = new Fieldset();
-    quantityFS.getLegendTitle().setTitle("QuantityInMicroLiters");
+    quantityFS.setTitle("QuantityInMicroLiters");
     form.addFieldset(quantityFS);
     //
@@ -7922 +7922 @@
     Fieldset fs = new Fieldset();
     modifyForPopup(fs);
-    fs.getLegendTitle().setTitle("Properties");
+    fs.setTitle("Properties");
     form.addFieldset(fs);
     //
@@ -7943 +7943 @@
     //
     Fieldset quantityFS = new Fieldset();
-    quantityFS.getLegendTitle().setTitle("QuantityInMicroLiters");
+    quantityFS.setTitle("QuantityInMicroLiters");
     form.addFieldset(quantityFS);
     //
@@ -7988 +7988 @@
     // Properties field set
     Fieldset properties = new Fieldset();
-    properties.getLegendTitle().setTitle("ColumnFilterSettings");
+    properties.setTitle("ColumnFilterSettings");
     form.addFieldset(properties);
     // Filter name field (hidden - for transfer of value to other classes)
@@ -8296 +8296 @@
     // mainFsName = clsName;
     // }
-    mainFS.getLegendTitle().setTitle(mainFsName);
+    mainFS.setTitle(mainFsName);
     /*
      * Add forward actionId field as first field, for external use.
@@ -8611 +8611 @@
          */
         annotationFS = new Fieldset();
-        annotationFS.getLegendTitle().setTitle("Annotations");
+        annotationFS.setTitle("Annotations");
         /*
          * Get DbControl
@@ -8859 +8859 @@
     Form form = new Form("trashCanForm");
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("Trash");
+    fs.setTitle("Trash");
     form.addFieldset(fs);
     // Get total number of items to delete
@@ -8953 +8953 @@
     Fieldset fs = new Fieldset();
     modifyForPopup(fs);
-    fs.getLegendTitle().setTitle("SelectMethod");
+    fs.setTitle("SelectMethod");
     form.addFieldset(fs);
     // Selectbox for separation events
@@ -8985 +8985 @@
     form.setTitle("ProtocolType");
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("ProtocolType");
+    fs.setTitle("ProtocolType");
     // Protocol Type Select Box
     Select<VString> typeS = new Select<VString>(VTYPE);
@@ -9019 +9019 @@
     form.setTitle("Protocol");
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("Protocol");
+    fs.setTitle("Protocol");
     // Protocol Name
     TextField<String> nameF = new NameField();
@@ -9079 +9079 @@
     form.setTitle("NewProtocol");
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("NewProtocol");
+    fs.setTitle("NewProtocol");
     // Protocol Name
     TextField<String> nameF = new NameField();
@@ -9192 +9192 @@
     //
     Fieldset fs = new Fieldset();
-    org.proteios.gui.Title title = fs.getLegendTitle();
+    org.proteios.gui.Title title = fs.getTitle();
     title.setTitle(clsName);
     modifyForPopup(fs);
@@ -9742 +9742 @@
     form.setTitle("SeparationEvent");
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle(sm.getClass().getSimpleName());
+    fs.setTitle(sm.getClass().getSimpleName());
     form.addFieldset(fs);
     //
@@ -9790 +9790 @@
     form.setTitle("SeparationEvent");
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("Properties");
+    fs.setTitle("Properties");
     form.addFieldset(fs);
     //

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

@@ -62 +62 @@
     for (Fieldset fs : form.getFieldsets())
     {
-      log
-        .debug(this.getClass().getSimpleName() + "::setFormTextFieldValue(): fs.getLegendTitle() = \"" + fs
-          .getLegendTitle() + "\"");
       for (Iterator iter = fs.getFields().iterator(); iter.hasNext();)
       {

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

@@ -68 +68 @@
     fs.add(userIdF);
     if (user != null) { userIdF.setValue(user.getId()); }
-    fs.getLegendTitle().setTitle("Groups");
+    fs.setTitle("Groups");
     while (iterator.hasNext())
     {

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

@@ -50 +50 @@
 
     fs = new Fieldset();
-    fs.getLegendTitle().setTitle("ImportPlugins");
+    fs.setTitle("ImportPlugins");
     fs.add(itemIdF);
     itemIdF.setValue(file.getId());

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

@@ -76 +76 @@
     
     properties = new Fieldset();
-    properties.getLegendTitle().setTitle("ImportHitsWizardStep1FormLegend");
+    properties.setTitle("ImportHitsWizardStep1FormLegend");
     addFieldset(properties);
     properties.add(pluginIdF);

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

@@ -51 +51 @@
       // Properties fieldset
       properties = new Fieldset();
-      properties.getLegendTitle().setTitle(
+      properties.setTitle(
       "ImportHitsWizardStep2FormLegend");
       addFieldset(properties);

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

@@ -49 +49 @@
       // Properties fieldset
       properties = new Fieldset();
-      properties.getLegendTitle().setTitle("ImportHitsWizardStep3FormLegend");
+      properties.setTitle("ImportHitsWizardStep3FormLegend");
       addFieldset(properties);
       /*

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

@@ -52 +52 @@
 
     properties = new Fieldset();
-    properties.getLegendTitle().setTitle("Properties");
+    properties.setTitle("Properties");
     properties.add(nameF);
     properties.add(descrF);

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

@@ -73 +73 @@
   concF = new ConcentrationField();
 
-  quantityFS.getLegendTitle().setTitle("QuantityInMicroLiters");
+  quantityFS.setTitle("QuantityInMicroLiters");
 
   this.addFieldset(this.propertiesFS);

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

@@ -54 +54 @@
 
   setId("loginForm");
-  fs.setLegendTitle(title);
+  fs.setTitle(title);
   fs.add(usernameF);
   fs.add(passwordF);

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

@@ -58 +58 @@
 
   fs = new Fieldset();
-  fs.getLegendTitle().setTitle("MimeType");
+  fs.setTitle("MimeType");
     fs.add(itemIdF);
     fs.add(mimeTypeS);

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

@@ -44 +44 @@
   this.descriptionF = new DescriptionField();
 
-  this.getLegendTitle().setTitle("Properties");
+  this.setTitle("Properties");
   this.add(nameF);
   this.add(descriptionF);

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

@@ -64 +64 @@
 
   fs = new Fieldset();
-  fs.getLegendTitle().setTitle("Properties");
+  fs.setTitle("Properties");
     fs.add(itemIdF);
     fs.add(fileF);

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

@@ -67 +67 @@
   if(dc != null)
   {
-    roleFS.getLegendTitle().setTitle("Roles");
+    roleFS.setTitle("Roles");
     query = Role.getQuery();
     for (Role r : query.list(dc))
@@ -82 +82 @@
   pwd1.setLabel("Password");
   pwd2.setLabel("VerifyPassword");
-  pwdFS.getLegendTitle().setTitle("Password");
+  pwdFS.setTitle("Password");
   pwdFS.add(pwd1);
   pwdFS.add(pwd2);

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

@@ -47 +47 @@
   this.title = new Title("NULL FORM");
   this.setId("nullForm");
-  this.fs.setLegendTitle(this.title);
+  this.fs.setTitle(this.title);
   this.addFieldset(this.fs);
  }   

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

@@ -56 +56 @@
 
   setId("pluginDefinitionForm");
-  propertiesFS.getLegendTitle().setTitle("Properties");
+  propertiesFS.setTitle("Properties");
   propertiesFS.add(classNameF);
   propertiesFS.add(descriptionF);

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

@@ -59 +59 @@
   pwd1.setLabel("Password");
   pwd2.setLabel("VerifyPassword");
-  propertiesFS.getLegendTitle().setTitle("Password");
+  propertiesFS.setTitle("Password");
   propertiesFS.add(userIdF);
   propertiesFS.add(pwd1);

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

@@ -62 +62 @@
   externalIdF = new ExternalIdField();
 
-  quantityFS.getLegendTitle().setTitle("Quantity");
+  quantityFS.setTitle("Quantity");
   quantityFS.add(concentrationF);
   quantityFS.add(originalF);

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

@@ -43 +43 @@
   super("pluginsForm");
     fs = new Fieldset();
-    fs.getLegendTitle().setTitle("SelectPlugin");
+    fs.setTitle("SelectPlugin");
     typeS = new PluginSelect(dc,    types);
     fs.add(typeS);
@@ -52 +52 @@
   super("pluginsForm");
     fs = new Fieldset();
-    fs.getLegendTitle().setTitle("SelectPlugin");
+    fs.setTitle("SelectPlugin");
     typeS = new PluginSelect();
     fs.add(typeS);

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

@@ -69 +69 @@
   fs = new Fieldset();
     fs.add(userIdF);
-    fs.getLegendTitle().setTitle("Roles");
+    fs.setTitle("Roles");
     
     query = Role.getQuery();

trunk/client/servlet/src/org/proteios/gui/table/TableFactory.java

@@ -1002 +1002 @@
     form.setTitle("ConfigureTable");
     Fieldset fields = new Fieldset();
-    // fields.getLegendTitle().setTitle("SelectVisibleColumns");
-    fields.getLegendTitle().setTitle("ConfigureTable");
+    // fields.setTitle("SelectVisibleColumns");
+    fields.setTitle("ConfigureTable");
     form.addFieldset(fields);
     // VString showColumnParameter = new VString("showColumn", 1, 32, true);

trunk/client/servlet/src/org/proteios/gui/web/GUIConverter.java

@@ -1291 +1291 @@
     legend = fieldset.newDiv().setClass("legend");
     title = new Div().addClass("title");
-    if (fs.getLegendTitle() != null)
+    if (fs.getTitle()!= null)
     {
       title.add(new CData(
-        locale.get(fs.getLegendTitle().getTitle()) + " "));
-      subtitle = fs.getLegendTitle().getSubtitle();
+        locale.get(fs.getTitle().getTitle()) + " "));
+      subtitle = fs.getTitle().getSubtitle();
       if (subtitle != null)
       {

trunk/client/servlet/test/src/org/proteios/gui/GUIFactoryUtil.java

@@ -115 +115 @@
   {
     Fieldset fs = new Fieldset();
-    fs.getLegendTitle().setTitle("Properties");
+    fs.setTitle("Properties");
     TextField<String> nameF = new TextField<String>(VNAME);
     fs.add(nameF);

trunk/contrib/SpectrumLibraryExport/src/satoshi/LibraryExportForm.java

@@ -52 +52 @@
       Fieldset fieldSet = new Fieldset();
       form.addFieldset(fieldSet);
-      fieldSet.setLegendTitle(new Title("Export settings"));
+      fieldSet.setTitle(new Title("Export settings"));
       /*
        * Then add an optional parameter. We'll add a string field. This