Mercurial > dive4elements > river
diff gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixFunctionSelect.java @ 9256:6c24c857ccf9
fixation refactoring and inputItem behaviour to interfaces
author | gernotbelger |
---|---|
date | Fri, 13 Jul 2018 12:04:21 +0200 |
parents | 5e38e2924c07 |
children | e6958f0e72fa |
line wrap: on
line diff
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixFunctionSelect.java Fri Jul 13 11:56:22 2018 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixFunctionSelect.java Fri Jul 13 12:04:21 2018 +0200 @@ -8,6 +8,17 @@ package org.dive4elements.river.client.client.ui.fixation; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; + +import org.dive4elements.river.client.shared.model.Data; +import org.dive4elements.river.client.shared.model.DataItem; +import org.dive4elements.river.client.shared.model.DataList; +import org.dive4elements.river.client.shared.model.DefaultData; +import org.dive4elements.river.client.shared.model.DefaultDataItem; +import org.dive4elements.river.client.shared.model.FixingsOverviewInfo; + import com.smartgwt.client.types.VerticalAlignment; import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.Label; @@ -16,19 +27,8 @@ import com.smartgwt.client.widgets.layout.HLayout; import com.smartgwt.client.widgets.layout.VLayout; -import org.dive4elements.river.client.shared.model.Data; -import org.dive4elements.river.client.shared.model.DataItem; -import org.dive4elements.river.client.shared.model.DataList; -import org.dive4elements.river.client.shared.model.DefaultData; -import org.dive4elements.river.client.shared.model.DefaultDataItem; - -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; - public class FixFunctionSelect extends FixationPanel { - private static final Map<String, String> funcDesc = - new HashMap<String, String>(); + private static final Map<String, String> funcDesc = new HashMap<String, String>(); static { funcDesc.put("log", "W(Q) = m*ln(Q + b)"); @@ -40,40 +40,39 @@ funcDesc.put("sq-pow", "S(Q) = a * Q^b"); } - /** The combobox.*/ + /** The combobox. */ protected DynamicForm form; @Override - public Canvas createWidget(DataList data) { - VLayout layout = new VLayout(); + public Canvas createWidget(final DataList data) { + final VLayout layout = new VLayout(); layout.setAlign(VerticalAlignment.TOP); layout.setHeight(25); - LinkedHashMap initial = new LinkedHashMap(); + final LinkedHashMap initial = new LinkedHashMap(); - form = new DynamicForm(); + this.form = new DynamicForm(); - int size = data.size(); + final int size = data.size(); for (int i = 0; i < size; i++) { - Data d = data.get(i); + final Data d = data.get(i); - Label label = new Label(d.getDescription()); + final Label label = new Label(d.getDescription()); label.setValign(VerticalAlignment.TOP); label.setHeight(20); label.setWidth(400); - SelectItem combobox = new SelectItem(d.getLabel()); + final SelectItem combobox = new SelectItem(d.getLabel()); combobox.setWidth(250); - LinkedHashMap<String, String> funcTypes = - new LinkedHashMap<String, String>(); + final LinkedHashMap<String, String> funcTypes = new LinkedHashMap<String, String>(); - boolean defaultSet = false; - boolean first = true; + boolean defaultSet = false; + boolean first = true; - DataItem def = d.getDefault(); - String defValue = def != null ? def.getStringValue() : null; + final DataItem def = d.getDefault(); + final String defValue = def != null ? def.getStringValue() : null; if (defValue != null && defValue.length() > 0) { initial.put(d.getLabel(), def.getStringValue()); @@ -81,7 +80,7 @@ } // I was here. Me 2. - for (DataItem item: d.getItems()) { + for (final DataItem item : d.getItems()) { if (!defaultSet && first) { initial.put(d.getLabel(), item.getStringValue()); first = false; @@ -93,39 +92,37 @@ label.setWidth(50); combobox.setValueMap(funcTypes); combobox.setShowTitle(false); - form.setItems(combobox); + this.form.setItems(combobox); layout.addMember(label); - layout.addMember(form); + layout.addMember(this.form); } - form.setValues(initial); + this.form.setValues(initial); layout.setAlign(VerticalAlignment.TOP); return layout; } - @Override - public Canvas createOld(DataList dataList) { - HLayout layout = new HLayout(); - VLayout vLayout = new VLayout(); + public Canvas createOld(final DataList dataList) { + final HLayout layout = new HLayout(); + final VLayout vLayout = new VLayout(); layout.setWidth("400px"); - Label label = new Label(dataList.getLabel()); + final Label label = new Label(dataList.getLabel()); label.setWidth("200px"); - int size = dataList.size(); + final int size = dataList.size(); for (int i = 0; i < size; i++) { - Data data = dataList.get(i); - DataItem[] items = data.getItems(); + final Data data = dataList.get(i); + final DataItem[] items = data.getItems(); - for (DataItem item: items) { - HLayout hLayout = new HLayout(); + for (final DataItem item : items) { + final HLayout hLayout = new HLayout(); - String desc = funcDesc.containsKey(item.getLabel()) ? - funcDesc.get(item.getLabel()) : item.getLabel(); + final String desc = funcDesc.containsKey(item.getLabel()) ? funcDesc.get(item.getLabel()) : item.getLabel(); hLayout.addMember(label); hLayout.addMember(new Label(desc)); @@ -134,7 +131,7 @@ } } - Canvas back = getBackButton(dataList.getState()); + final Canvas back = getBackButton(dataList.getState()); layout.addMember(label); layout.addMember(vLayout); @@ -143,30 +140,27 @@ return layout; } - @Override public Data[] getData() { - Map<?, ?> values = form.getValues(); - - Data[] list = new Data[values.size()]; - int i = 0; + final Map<?, ?> values = this.form.getValues(); - for (Map.Entry<?, ?>entry: values.entrySet()) { - String fieldname = (String)entry.getKey(); - String selection = (String)entry.getValue(); + final Data[] list = new Data[values.size()]; + int i = 0; - DataItem item = new DefaultDataItem(fieldname, null, selection); + for (final Map.Entry<?, ?> entry : values.entrySet()) { + final String fieldname = (String) entry.getKey(); + final String selection = (String) entry.getValue(); - list[i++] = new DefaultData( - fieldname, null, null, new DataItem[] { item }); + final DataItem item = new DefaultDataItem(fieldname, null, selection); + + list[i++] = new DefaultData(fieldname, null, null, new DataItem[] { item }); } return list; } - @Override - public void setValues(String cid, boolean checked) { + public void setValues(final String cid, final boolean checked) { } @Override @@ -175,7 +169,6 @@ } @Override - public void success() { + public void success(final FixingsOverviewInfo fixInfo) { } - -} +} \ No newline at end of file