SE-137 add treatment type code to ListProteinByExperimentCriteria

SVN: 12511

rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinByExperimentBrowerToolBar.java

@@ -268,11 +268,11 @@ class ProteinByExperimentBrowerToolBar extends ToolBar
             AggregateFunction aggregateFunction =
                     getSelection(aggregateFunctionComboBox, DEFAULT_AGGREGATE_FUNCTION);
             TechId experimentID = TechId.create(experiment);
-            AsyncCallback<List<AbundanceColumnDefinition>> callback =
-                    new AbundanceColumnDefinitionsCallback(viewContext, browserGrid, experimentID,
-                            falseDiscoveryRate, aggregateFunction);
             VocabularyTermModel value = treatmentTypeComboBox.getValue();
             String treatmentTypeCode = value == null ? null : value.getTerm().getCode();
+            AsyncCallback<List<AbundanceColumnDefinition>> callback =
+                    new AbundanceColumnDefinitionsCallback(viewContext, browserGrid, experimentID,
+                            falseDiscoveryRate, aggregateFunction, treatmentTypeCode);
             viewContext.getService().getAbundanceColumnDefinitionsForProteinByExperiment(
                     experimentID, treatmentTypeCode, callback);
         }
@@ -295,21 +295,26 @@ class ProteinByExperimentBrowerToolBar extends ToolBar
 
         private final AggregateFunction aggregateFunction;
 
+        private final String treatmentTypeCode;
+
         public AbundanceColumnDefinitionsCallback(IViewContext<?> viewContext,
                 ProteinByExperimentBrowserGrid browserGrid, TechId experimentID,
-                double falseDiscoveryRate, AggregateFunction aggregateFunction)
+                double falseDiscoveryRate, AggregateFunction aggregateFunction,
+                String treatmentTypeCode)
         {
             super(viewContext);
             this.browserGrid = browserGrid;
             this.experimentID = experimentID;
             this.falseDiscoveryRate = falseDiscoveryRate;
             this.aggregateFunction = aggregateFunction;
+            this.treatmentTypeCode = treatmentTypeCode;
         }
 
         @Override
         protected void process(List<AbundanceColumnDefinition> result)
         {
-            browserGrid.update(experimentID, falseDiscoveryRate, aggregateFunction, result);
+            browserGrid.update(experimentID, falseDiscoveryRate, aggregateFunction,
+                    treatmentTypeCode, result);
         }
 
     }

rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinByExperimentBrowserGrid.java

@@ -97,12 +97,14 @@ class ProteinByExperimentBrowserGrid extends AbstractSimpleBrowserGrid<ProteinIn
     }
 
     void update(TechId experimentID, double falseDiscoveryRate,
-            AggregateFunction aggregateFunction, List<AbundanceColumnDefinition> definitions)
+            AggregateFunction aggregateFunction, String treatmentTypeCode,
+            List<AbundanceColumnDefinition> definitions)
     {
         criteria = new ListProteinByExperimentCriteria();
         criteria.setExperimentID(experimentID);
         criteria.setFalseDiscoveryRate(falseDiscoveryRate);
         criteria.setAggregateFunction(aggregateFunction);
+        criteria.setTreatmentTypeCode(treatmentTypeCode);
         abundanceColumnDefinitions = definitions;
         refresh(null, true);
     }

rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/dto/ListProteinByExperimentCriteria.java

@@ -31,6 +31,7 @@ public class ListProteinByExperimentCriteria extends DefaultResultSetConfig<Stri
     private TechId experimentID;
     private double falseDiscoveryRate;
     private AggregateFunction aggregateFunction;
+    private String treatmentTypeCode;
 
     public final TechId getExperimentID()
     {
@@ -61,5 +62,15 @@ public class ListProteinByExperimentCriteria extends DefaultResultSetConfig<Stri
     {
         this.aggregateFunction = aggregateFunction;
     }
+
+    public final String getTreatmentTypeCode()
+    {
+        return treatmentTypeCode;
+    }
+
+    public final void setTreatmentTypeCode(String treatmentTypeCode)
+    {
+        this.treatmentTypeCode = treatmentTypeCode;
+    }
     
 }