# HG changeset patch # User Felix Wolfsteller # Date 1364885904 -7200 # Node ID 33d735f5433e087e1909bf26230e4bc0d487a2c3 # Parent 6dbc111e9aec00be855f9216d672d2a9f7af2af9# Parent fcf28185ca30c699c195b03d3fd374033f67feb8 Merged. diff -r fcf28185ca30 -r 33d735f5433e flys-client/src/main/java/de/intevation/flys/client/client/ui/WQAdaptedInputPanel.java --- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/WQAdaptedInputPanel.java Mon Apr 01 13:50:56 2013 +0200 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/WQAdaptedInputPanel.java Tue Apr 02 08:58:24 2013 +0200 @@ -94,6 +94,9 @@ /** Stores the input panels related to their keys.*/ protected Map wqranges; + /** List of doubleArrayPanels shown. */ + protected ArrayList doubleArrayPanels; + /** Stores the min/max values for each q range.*/ protected Map qranges; @@ -118,6 +121,7 @@ public WQAdaptedInputPanel() { wqranges = new HashMap(); + doubleArrayPanels = new ArrayList(); qranges = new HashMap(); wranges = new HashMap(); qdTable = new QDTable(); @@ -189,6 +193,14 @@ if (itemWithFocus != null) { itemWithFocus.setValues(new double[]{val}); + // TODO 1133, show different data for each doublearraypanel + int i = doubleArrayPanels.indexOf(itemWithFocus); + if (i == doubleArrayPanels.size()-1) { + doubleArrayPanels.get(0).focusInItem(1); + } + else { + doubleArrayPanels.get(i+1).focusInItem(1); + } } } }; @@ -196,6 +208,7 @@ qdTable.addCellClickHandler(handler); } + @Override public Canvas createOld(DataList dataList) { List all = dataList.getAll(); @@ -314,6 +327,7 @@ } } + protected List validateRange(Map ranges) { List errors = new ArrayList(); NumberFormat nf = NumberFormat.getDecimalFormat(); @@ -466,6 +480,7 @@ label, null, this, this, TitleOrientation.LEFT); wqranges.put(title, dap); + doubleArrayPanels.add(dap); if (item instanceof WQDataItem) { WQDataItem wq = (WQDataItem) item; @@ -648,6 +663,7 @@ } + /** Get the WQD data from servide and stuck them up that tables. */ protected void fetchWQData() { Config config = Config.getInstance(); String locale = config.getLocale (); @@ -676,7 +692,6 @@ } addWQInfo(wqi); - } } );