Mercurial > dive4elements > river
diff gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixGaugeSelectPanel.java @ 9256:6c24c857ccf9
fixation refactoring and inputItem behaviour to interfaces
author | gernotbelger |
---|---|
date | Fri, 13 Jul 2018 12:04:21 +0200 |
parents | 716709cd5ba3 |
children | c7e5285d434f |
line wrap: on
line diff
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixGaugeSelectPanel.java Fri Jul 13 11:56:22 2018 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixGaugeSelectPanel.java Fri Jul 13 12:04:21 2018 +0200 @@ -8,8 +8,19 @@ package org.dive4elements.river.client.client.ui.fixation; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; + +import org.dive4elements.river.client.client.FLYSConstants; +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.google.gwt.core.client.GWT; - import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.Label; import com.smartgwt.client.widgets.form.DynamicForm; @@ -18,26 +29,13 @@ import com.smartgwt.client.widgets.layout.HLayout; import com.smartgwt.client.widgets.layout.VLayout; -import org.dive4elements.river.client.client.FLYSConstants; -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.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; - /** * This UIProvider creates a panel to select discharge classes / sectors * (german Abflussklassen). * * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a> */ -public class FixGaugeSelectPanel -extends FixationPanel -{ +public class FixGaugeSelectPanel extends FixationPanel { /** The message class that provides i18n strings. */ protected FLYSConstants MESSAGES = GWT.create(FLYSConstants.class); @@ -50,42 +48,40 @@ protected LinkedHashMap<String, String> mapValues; public FixGaugeSelectPanel() { - htmlOverview = ""; - - mapValues = new LinkedHashMap<String, String>(); - mapValues.put("0", MESSAGES.gauge_mnq()); - mapValues.put("1", MESSAGES.gauge_mq()); - mapValues.put("2", MESSAGES.gauge_mhq()); - mapValues.put("3", MESSAGES.gauge_hq5()); + this.mapValues = new LinkedHashMap<String, String>(); + this.mapValues.put("0", this.MESSAGES.gauge_mnq()); + this.mapValues.put("1", this.MESSAGES.gauge_mq()); + this.mapValues.put("2", this.MESSAGES.gauge_mhq()); + this.mapValues.put("3", this.MESSAGES.gauge_hq5()); } @Override - public Canvas createWidget(DataList data) { + public Canvas createWidget(final DataList data) { instances.put(this.artifact.getUuid(), this); - VLayout layout = new VLayout(); + final VLayout layout = new VLayout(); - Label title = new Label(MESSAGES.gauge_class()); + final Label title = new Label(this.MESSAGES.gauge_class()); title.setHeight(25); - from = new SelectItem(MESSAGES.from()); - to = new SelectItem(MESSAGES.to()); + this.from = new SelectItem(this.MESSAGES.from()); + this.to = new SelectItem(this.MESSAGES.to()); - from.setShowTitle(false); - to.setShowTitle(false); - from.setValueMap(mapValues); - from.setDefaultValues("0"); - from.setWidth(160); - to.setValueMap(mapValues); - to.setDefaultValues("3"); - to.setWidth(160); + this.from.setShowTitle(false); + this.to.setShowTitle(false); + this.from.setValueMap(this.mapValues); + this.from.setDefaultValues("0"); + this.from.setWidth(160); + this.to.setValueMap(this.mapValues); + this.to.setDefaultValues("3"); + this.to.setWidth(160); - DynamicForm form = new DynamicForm(); - StaticTextItem separator = new StaticTextItem("separator"); + final DynamicForm form = new DynamicForm(); + final StaticTextItem separator = new StaticTextItem("separator"); separator.setShowTitle(false); - separator.setValue(MESSAGES.to()); + separator.setValue(this.MESSAGES.to()); form.setNumCols(5); - form.setFields(from, separator, to); + form.setFields(this.from, separator, this.to); layout.addMember(title); layout.addMember(form); @@ -94,28 +90,28 @@ } @Override - public Canvas createOld(DataList dataList) { - List<Data> items = dataList.getAll(); + public Canvas createOld(final DataList dataList) { + final List<Data> items = dataList.getAll(); - Data f = getData(items, "q1"); - Data t = getData(items, "q2"); - DataItem[] fItems = f.getItems(); - DataItem[] tItems = t.getItems(); + final Data f = getData(items, "q1"); + final Data t = getData(items, "q2"); + final DataItem[] fItems = f.getItems(); + final DataItem[] tItems = t.getItems(); - StringBuilder sb = new StringBuilder(); - sb.append(mapValues.get(fItems[0].getLabel())); - sb.append(" " + MESSAGES.to() + " "); - sb.append(mapValues.get(tItems[0].getLabel())); + final StringBuilder sb = new StringBuilder(); + sb.append(this.mapValues.get(fItems[0].getLabel())); + sb.append(" " + this.MESSAGES.to() + " "); + sb.append(this.mapValues.get(tItems[0].getLabel())); - Label old = new Label(sb.toString()); + final Label old = new Label(sb.toString()); old.setWidth(130); - HLayout layout = new HLayout(); + final HLayout layout = new HLayout(); layout.setWidth("400px"); - Label label = new Label(dataList.getLabel()); + final Label label = new Label(dataList.getLabel()); label.setWidth("200px"); - Canvas back = getBackButton(dataList.getState()); + final Canvas back = getBackButton(dataList.getState()); layout.addMember(label); layout.addMember(old); @@ -123,7 +119,6 @@ return layout; } - /** * This method returns the selected data. * @@ -131,56 +126,46 @@ */ @Override public Data[] getData() { - List<Data> data = new ArrayList<Data>(); + final List<Data> data = new ArrayList<Data>(); - boolean valid = saveClassValues(); + final boolean valid = saveClassValues(); if (valid) { - DataItem firstItem = new DefaultDataItem("q1", "q1", this.first); - DataItem secItem = new DefaultDataItem("q2", "q2", this.second); - data.add(new DefaultData( - "q1", - null, - null, - new DataItem[] { firstItem })); - data.add(new DefaultData( - "q2", - null, - null, - new DataItem[] { secItem })); + final DataItem firstItem = new DefaultDataItem("q1", "q1", this.first); + final DataItem secItem = new DefaultDataItem("q2", "q2", this.second); + data.add(new DefaultData("q1", null, null, new DataItem[] { firstItem })); + data.add(new DefaultData("q2", null, null, new DataItem[] { secItem })); } return data.toArray(new Data[data.size()]); } - @Override - public void setValues(String cid, boolean checked) { + public void setValues(final String cid, final boolean checked) { // No user interaction, do nothing. } - @Override public boolean renderCheckboxes() { // No selection, return false. return false; } - @Override - public void success() {} + public void success(final FixingsOverviewInfo fixInfo) { + } protected boolean saveClassValues() { - String v1 = from.getValueAsString(); - String v2 = to.getValueAsString(); + final String v1 = this.from.getValueAsString(); + final String v2 = this.to.getValueAsString(); try { - int v1i = Integer.parseInt(v1); - int v2i = Integer.parseInt(v2); + final int v1i = Integer.parseInt(v1); + final int v2i = Integer.parseInt(v2); if (v1i <= v2i) { this.first = v1; this.second = v2; return true; } } - catch(NumberFormatException nfe) { + catch (final NumberFormatException nfe) { return false; } return false;