Changeset 3849

Timestamp:

Sep 14, 2010, 2:40:25 PM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698. Removed method getHitsComparisonReportProjectSelectionForm from FormFactory

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/hit/HitsComparisonReport.java (modified) (1 diff)
• action/hit/HitsComparisonReportStep1.java (modified) (2 diffs)
• gui/form/FormFactory.java (modified) (4 diffs)
• gui/form/Project1Select.java (added)
• gui/form/Project2Select.java (added)
• gui/form/ProjectComparisonForm.java (added)

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

@@ -69 +69 @@
   public static final VInteger VHITSELECTION2PROJECTID = new VInteger("hitSelection2ProjectId", 1, true);
   //
-  public static final VString VHITSELECTION1GELEXTERNALID = new VString(
-    "hitSelection1GelExternalId", 0, 32, false);
-  public static final VString VHITSELECTION1LOCALSAMPLEID = new VString(
-    "hitSelection1LocalSampleId", 0, 32, false);
-  public static final VString VHITSELECTION1FRACTIONID = new VString(
-    "hitSelection1FractionId", 0, 32, false);
+  public static final VString VHITSELECTION1GELEXTERNALID = new VString("hitSelection1GelExternalId", 0, 32, false);
+  public static final VString VHITSELECTION1LOCALSAMPLEID = new VString("hitSelection1LocalSampleId", 0, 32, false);
+  public static final VString VHITSELECTION1FRACTIONID = new VString("hitSelection1FractionId", 0, 32, false);
   public static final VFloat VHITSELECTION1CUTOFF = new VFloat("hitSelection1CutOff", false);
   //
-  public static final VString VHITSELECTION2GELEXTERNALID = new VString(
-    "hitSelection2GelExternalId", 0, 32, false);
-  public static final VString VHITSELECTION2LOCALSAMPLEID = new VString(
-    "hitSelection2LocalSampleId", 0, 32, false);
-  public static final VString VHITSELECTION2FRACTIONID = new VString(
-    "hitSelection2FractionId", 0, 32, false);
+  public static final VString VHITSELECTION2GELEXTERNALID = new VString("hitSelection2GelExternalId", 0, 32, false);
+  public static final VString VHITSELECTION2LOCALSAMPLEID = new VString("hitSelection2LocalSampleId", 0, 32, false);
+  public static final VString VHITSELECTION2FRACTIONID = new VString("hitSelection2FractionId", 0, 32, false);
   public static final VFloat VHITSELECTION2CUTOFF = new VFloat("hitSelection2CutOff", false);
   //
-  public static final VString VHITSCOMPARISONTYPE = new VString(
-    "hitsComparisionType", 0, 32, false);
+  public static final VString VHITSCOMPARISONTYPE = new VString("hitsComparisionType", 0, 32, false);
   public static final VBoolean VIGNORECOMBINEDFDRUPPERCUTOFF = new VBoolean("CombinedFDRUpperCutoff", false);
-  public static final VString VHITSCOMPARISONSCORETYPE = new VString(
-    "hitsComparisionScoreType", 0, 255, false);
+  public static final VString VHITSCOMPARISONSCORETYPE = new VString("hitsComparisionScoreType", 0, 255, false);
   public static final VBoolean VONLYUSELEADINGPROTEINS = new VBoolean("OnlyUseLeadingProteins", false);
   

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

@@ -46 +46 @@
 import org.proteios.gui.Toolbar;
 import org.proteios.gui.ColumnContainer;
-import org.proteios.gui.form.Form;
+import org.proteios.gui.form.*;
 import org.proteios.gui.layout.RowLayout;
 import org.proteios.plugins.HitsComparisonReportPlugin;
@@ -126 +126 @@
     }
     // Get form
-    Form form = getFormFactory().getHitsComparisonReportProjectSelectionForm(
-      project, hitProjList);
+    Form form = new ProjectComparisonForm(project, hitProjList);
     String pageTitle = new String("HitsComparisonReportProjectSelection");
     Title title = new Title(pageTitle);

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

@@ -2150 +2150 @@
   }
 
- // Cleaning up from here
+
 
     private Select<VString> selectMultiSelectionExternalGelId(DbControl dc,
@@ -2340 +2340 @@
   public Form getSaveHitsTableInFileForm(Project project)
   {
-    log
-      .debug("FormFactory::getSaveHitsTableInFileForm(): Start - project = \"" + project
-        .getName() + "\"");
     DbControl dc = project.getDbControl();
     Form form = new Form("saveHitsTableInFileForm");
@@ -2358 +2355 @@
       // Add sort column key
       String sortClmKey = getSortColumnKey();
-      log
-        .debug("FormFactory::getSaveHitsTableInFileForm(): sortColumnKey = \"" + sortClmKey + "\"");
       TextField<String> sortClmF = newHiddenStringField(VSORTCOLUMNKEY);
       sortClmF.setValue(sortClmKey);
@@ -2369 +2364 @@
   }
 
-
-  public Form getHitsComparisonReportProjectSelectionForm(Project project,
-      List<Project> projectList)
-  {
-    Form form = new Form("comparisonOfHitsReportProjectSelectionForm");
-    //
-    Fieldset comparisonOfHitsProjectSelectionFS = new Fieldset();
-    comparisonOfHitsProjectSelectionFS.setTitle(
-      "HitsComparisonReportProjectSelection");
-    form.addFieldset(comparisonOfHitsProjectSelectionFS);
-    //
-    // Project 1 selection
-    Select<VInteger> project1SelectBox = new Select<VInteger>(
-      HitsComparisonReport.VHITSELECTION1PROJECTID);
-    project1SelectBox.setLabel("HitsComparisonReportProject1");
-    for (Project tmpProject : projectList)
-    {
-      Option o = new Option("" + tmpProject.getId(), tmpProject.getName());
-      // Set active project as selected project
-      if (project != null && project.getId() == tmpProject.getId())
-      {
-        o.setSelected(true);
-      }
-      project1SelectBox.addOption(o);
-    }
-    comparisonOfHitsProjectSelectionFS.add(project1SelectBox);
-    //
-    // Project 2 selection
-    Select<VInteger> project2SelectBox = new Select<VInteger>(
-      HitsComparisonReport.VHITSELECTION2PROJECTID);
-    project2SelectBox.setLabel("HitsComparisonReportProject2");
-    for (Project tmpProject : projectList)
-    {
-      Option o = new Option("" + tmpProject.getId(), tmpProject.getName());
-      // Set active project as selected project
-      if (project != null && project.getId() == tmpProject.getId())
-      {
-        o.setSelected(true);
-      }
-      project2SelectBox.addOption(o);
-    }
-    comparisonOfHitsProjectSelectionFS.add(project2SelectBox);
-    //
-    return form;
-  }
-
+ // Cleaning up from here
 
   public Form getHitsComparisonReportForm(Project project, Project project1,