Changeset 3822

Timestamp:

Sep 7, 2010, 11:36:24 AM (13 years ago)

Author:

Fredrik Levander

Message:

Refs #698. Now creating new String for each scoretype.

File:

• trunk/client/servlet/src/org/proteios/gui/form/CombineHitsForm.java (modified) (6 diffs)

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

@@ -39 +39 @@
 /**
 */
-public final class CombineHitsForm extends Form
+public final class CombineHitsForm
+    extends Form
 {
- public final Fieldset properties, scoreTypeFS, outputFS;
- public final TextField<String> forwardF, randomString, nameF;
- public final TextField<Float> fdrF;
- public final Checkbox<VBoolean> isProteinCB, keepRandomCB;
- public final ExternalGelIdSelect gelIdF;
- public final LocalSampleSelect samplesF;
- public final CombineHitScoreTypeField scoreTypeF;
- 
- // Define
- public CombineHitsForm(DbControl dc, Project project)
- {
+  public final Fieldset properties, scoreTypeFS, outputFS;
+  public final TextField<String> forwardF, randomString, nameF;
+  public final TextField<Float> fdrF;
+  public final Checkbox<VBoolean> isProteinCB, keepRandomCB;
+  public final ExternalGelIdSelect gelIdF;
+  public final LocalSampleSelect samplesF;
+
+
+  // Define
+  public CombineHitsForm(DbControl dc, Project project)
+  {
     super("combineHitsForm");
-  List<String> scoreTypeList;
-  List<String> scoreTypeUsedList;
-  properties = new Fieldset();
+    List<String> scoreTypeList;
+    List<String> scoreTypeUsedList;
+    properties = new Fieldset();
     forwardF = new ForwardField();
-  gelIdF = new ExternalGelIdSelect(dc, project);
+    gelIdF = new ExternalGelIdSelect(dc, project);
     isProteinCB = new PeptideCompareCheckbox();
     randomString = new RandomHitsPrefixField();
@@ -63 +64 @@
     fdrF = new FDRField();
     scoreTypeFS = new Fieldset();
-  samplesF = new LocalSampleSelect(Hit.getUniqueLocalSampleIds(project, dc));
-    scoreTypeF = new CombineHitScoreTypeField();
+    samplesF = new LocalSampleSelect(Hit.getUniqueLocalSampleIds(project,
+      dc));
     outputFS = new Fieldset();
     nameF = new FileNameField();
@@ -70 +71 @@
     if (dc != null && dc.isConnected())
     {
-    if (!samplesF.isDisabled())
-    {
-      Option allSampleIds = new Option("all");
-      allSampleIds.setContent("All in project");
-      samplesF.addOption(allSampleIds);
-    }
+      if (!samplesF.isDisabled())
+      {
+        Option allSampleIds = new Option("all");
+        allSampleIds.setContent("All in project");
+        samplesF.addOption(allSampleIds);
+      }
       properties.getLegendTitle().setTitle("SettingsForReport");
       addFieldset(properties);
@@ -129 +130 @@
           }
           // Hidden text field for storing score type
-     scoreTypeF.setHidden(true);
+          CombineHitScoreTypeField scoreTypeF = new CombineHitScoreTypeField();
+          scoreTypeF.setHidden(true);
           scoreTypeF.setValue(scoreType);
           scoreTypeFS.add(scoreTypeF);
@@ -135 +137 @@
           // Default is 'E-value', except for Mascot, where 'Score' is
           // used
-         CombineHitScoreTypeSettingField scoreTypeSelectBox = new CombineHitScoreTypeSettingField();
+          CombineHitScoreTypeSettingField scoreTypeSelectBox = new CombineHitScoreTypeSettingField();
           if (scoreType.equals("Mascot"))
           {
             scoreTypeSelectBox.score.setSelected(true);
-          } else {
+          }
+          else
+          {
             scoreTypeSelectBox.eValue.setSelected(true);
-     }
+          }
           scoreTypeSelectBox.setLabel(scoreType);
           scoreTypeFS.add(scoreTypeSelectBox);
@@ -155 +159 @@
       outputFS.add(nameF);
     }
- }
+  }
 }