From 914811a28672f7828c5c56d4c71aad28c3c957e9 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Wed, 5 Dec 2012 12:37:00 +0000
Subject: [PATCH] BIS-274 SP-409 : Made ordering of entry fields the same as
the display of the range
SVN: 27870
---
.../heatmaps/HeatMapRangeChooser.java | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/heatmaps/HeatMapRangeChooser.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/heatmaps/HeatMapRangeChooser.java
index 9a56dada434..12fb4603961 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/heatmaps/HeatMapRangeChooser.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/heatmaps/HeatMapRangeChooser.java
@@ -60,9 +60,9 @@ public class HeatMapRangeChooser extends Dialog
{
private final Map<CheckBoxField, RangeType> checkBoxToType =
new HashMap<CheckBoxField, RangeType>();
-
+
private final ScreeningViewContext viewContext;
-
+
private Component checkedComponent;
private FieldSet fieldSet;
@@ -132,8 +132,9 @@ public class HeatMapRangeChooser extends Dialog
untilField =
createNumberField(Dict.HEAT_MAP_RANGE_CHOOSER_FIXED_TYPE_HIGHEST_SCALE_LABEL,
validator);
- fieldSet.add(fromField);
+ // The scale is ordered top to bottom, use the same order for the input fields
fieldSet.add(untilField);
+ fieldSet.add(fromField);
formPanel.add(fieldSet);
}
@@ -209,7 +210,8 @@ public class HeatMapRangeChooser extends Dialog
}
}
}));
- addButton(new Button( viewContext
+ addButton(new Button(
+ viewContext
.getMessage(ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict.BUTTON_CANCEL),
new SelectionListener<ButtonEvent>()
{
@@ -220,7 +222,7 @@ public class HeatMapRangeChooser extends Dialog
}
}));
}
-
+
private void initComponents(IRangeType rangeType)
{
Set<Entry<CheckBoxField, RangeType>> entrySet = checkBoxToType.entrySet();
@@ -270,6 +272,9 @@ public class HeatMapRangeChooser extends Dialog
private void buttonPressed(Component component)
{
+ if (component == checkedComponent)
+ return;
+
if (checkedComponent != null)
{
if (checkedComponent instanceof CheckBox)
@@ -282,9 +287,10 @@ public class HeatMapRangeChooser extends Dialog
fSet.collapse();
}
}
+
checkedComponent = component;
}
-
+
private IRangeType getRangeType()
{
if (checkedComponent == null)
--
GitLab