Changeset 4097

Timestamp:

Jan 21, 2011, 2:28:38 PM (12 years ago)

Author:

olle

Message:

Refs #730. Refs #535. Refs #287. Hits Comparison Report updated in GUI, to hopefully be simpler and increase consistency:

1. Class/file action/hit/HitsComparisonReportStep1.java in client/servlet/ updated in page title.

2. Class/file action/hit/HitsComparisonReport.java in client/servlet/ updated in page title.

3. Class/file gui/form/ProjectComparisonForm.java in client/servlet/ updated to use one fieldset for each hit selection, when selecting projects, as separate fieldsets are used when selecting filter settings.

4. English dictionary file locale/en/dictionary in client/servlet/ updated with new string keys.

Location:

trunk/client/servlet/src

Files:

• locale/en/dictionary (modified) (1 diff)
• org/proteios/action/hit/HitsComparisonReport.java (modified) (3 diffs)
• org/proteios/action/hit/HitsComparisonReportStep1.java (modified) (3 diffs)
• org/proteios/gui/form/ProjectComparisonForm.java (modified) (2 diffs)

trunk/client/servlet/src/locale/en/dictionary

@@ -245 +245 @@
 HitsComparisonOnlyUseLeadingProteins=Only use leading proteins
 HitsComparisonReportBtn=Hits Comparison Report
-HitsComparisonReportComparisonType=Hits Comparison Report - Comparison type
+HitsComparisonReportComparisonType=Comparison type
 HitsComparisonReportComparisonTypeSelect=Comparison type
-HitsComparisonReportFilterSettings1=Hits Comparison Report - Filter Settings Hit Selection 1
-HitsComparisonReportFilterSettings2=Hits Comparison Report - Filter Settings Hit Selection 2
+HitsComparisonReportFilterSettings1=Hit Selection 1 - Filter Settings
+HitsComparisonReportFilterSettings2=Hit Selection 2 - Filter Settings
 HitsComparisonReportFilterSettings=Hits Comparison Report - Filter Settings
 HitsComparisonReport=Hits Comparison Report
-HitsComparisonReportOutput=Hits Comparison Report - Output
+HitsComparisonReportOutput=Output
 HitsComparisonReportProject1CombinedFDRUpperCutoff=Combined Search FDR
-HitsComparisonReportProject1=Hit Selection 1 Project
+HitsComparisonReportProject1=Project
 HitsComparisonReportProject1Id=Project ID
 HitsComparisonReportProject1Name=Project Name
 HitsComparisonReportProject2CombinedFDRUpperCutoff=Combined Search FDR
-HitsComparisonReportProject2=Hit Selection 2 Project
+HitsComparisonReportProject2=Project
 HitsComparisonReportProject2Id=Project ID
 HitsComparisonReportProject2Name=Project Name
 HitsComparisonReportProjectSelection=Hits Comparison Report - Project Selection
-HitsComparisonReportProteinSettings=Hits Comparison Report - Protein Comparison Settings Only
+HitsComparisonReportProjectSelection1=Hit Selection 1 - Project Selection
+HitsComparisonReportProjectSelection2=Hit Selection 2 - Project Selection
+HitsComparisonReportProteinSettings=Protein Comparison Settings Only
 HitsComparisonReportScoreTypeSelect=Score Type
+HitsComparisonReportStep1=Hits Comparison Report - Step 1 of 2
+HitsComparisonReportStep2=Hits Comparison Report - Step 2 of 2
 HitSelectionNumber=Hit Selection #
 Hits=Hits

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

@@ -95 +95 @@
       throws ActionException, InvalidParameterValue
   {
-  ColumnContainer cc;
+    ColumnContainer cc;
 
-  cc = new ColumnContainer();
+    cc = new ColumnContainer();
     DbControl dc = newDbControl();
     Project project = isProjectActive(dc);
@@ -128 +128 @@
     // Get form
     Form form = new HitComparisonForm(project, project1, project2, filenamePrefixDefault);
-    String pageTitle = new String("HitsComparisonReport");
+    String pageTitle = new String("HitsComparisonReportStep2");
     Title title = new Title(pageTitle);
     // Instruction area
@@ -155 +155 @@
     RowLayout layout = getLayoutFactory().getRowLayout();
     layout.add(title);
-  cc.add(form);
-  cc.add(instructionArea);
+    cc.add(form);
+    cc.add(instructionArea);
     layout.add(cc);
     setLayout(layout);

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

@@ -71 +71 @@
       throws ActionException, InvalidParameterValue
   {
-  ColumnContainer cc;
+    ColumnContainer cc;
 
-  cc = new ColumnContainer();
+    cc = new ColumnContainer();
 
     // Default filename prefix
@@ -124 +124 @@
     // Get form
     Form form = new ProjectComparisonForm(project, hitProjList);
-    String pageTitle = new String("HitsComparisonReportProjectSelection");
+    String pageTitle = new String("HitsComparisonReportStep1");
     Title title = new Title(pageTitle);
     // Instruction area
@@ -145 +145 @@
      */
     RowLayout layout = getLayoutFactory().getRowLayout();
-  cc.add(form);
-  cc.add(instructionArea);
+    cc.add(form);
+    cc.add(instructionArea);
 
     layout.add(title);

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

@@ -37 +37 @@
 public class ProjectComparisonForm extends Form
 {
-  public final Fieldset fs;
+  public final Fieldset fs1, fs2;
   public final Select<VInteger> project1SelectBox;
   public final Select<VInteger> project2SelectBox;
@@ -44 +44 @@
   {
     super("comparisonOfHitsReportProjectSelectionForm");
-    fs = new Fieldset("HitsComparisonReportProjectSelection");
-    addFieldset(fs);
     
     // Project 1 selection
+    fs1 = new Fieldset("HitsComparisonReportProjectSelection1");
+    addFieldset(fs1);
     project1SelectBox = new Project1Select(project, projectList);
     project1SelectBox.setLabel("HitsComparisonReportProject1");
-    fs.add(project1SelectBox);
+    fs1.add(project1SelectBox);
     // Project 2 selection
+    fs2 = new Fieldset("HitsComparisonReportProjectSelection2");
+    addFieldset(fs2);
     project2SelectBox = new Project2Select(project, projectList);
     project2SelectBox.setLabel("HitsComparisonReportProject2");
-    fs.add(project2SelectBox);
+    fs2.add(project2SelectBox);
   }
 }