Mercurial > dive4elements > river
comparison gwt-client/src/main/java/org/dive4elements/river/client/client/ui/AbstractSingleItemPanel.java @ 9260:b570b6fcc052
VegetationZone color added and disabled
| author | gernotbelger |
|---|---|
| date | Tue, 17 Jul 2018 10:59:27 +0200 |
| parents | 6c24c857ccf9 |
| children | c7e5285d434f |
comparison
equal
deleted
inserted
replaced
| 9259:66b003701546 | 9260:b570b6fcc052 |
|---|---|
| 116 @Override | 116 @Override |
| 117 protected final Data[] getData() { | 117 protected final Data[] getData() { |
| 118 final List<String> errors = this.validate(); | 118 final List<String> errors = this.validate(); |
| 119 if (errors.size() > 0) { | 119 if (errors.size() > 0) { |
| 120 showErrors(errors); // TODO: do not allow advance state | 120 showErrors(errors); // TODO: do not allow advance state |
| 121 // return null; | |
| 122 } | 121 } |
| 123 if (this.inputItem != null && !this.inputItem.getValueAsString().isEmpty()) { | 122 if (this.inputItem != null && !this.inputItem.getValueAsString().isEmpty()) { |
| 124 final List<Data> data = new ArrayList<Data>(); | 123 final List<Data> data = new ArrayList<Data>(); |
| 125 | 124 |
| 126 final DataItem yearsdata = new DefaultDataItem(getDatakey(), getDatakey(), this.inputItem.getValueAsString().trim()); | 125 final DataItem yearsdata = new DefaultDataItem(getDatakey(), getDatakey(), this.inputItem.getValueAsString().trim()); |
| 134 protected final TextItem createInputItem(final String title) { | 133 protected final TextItem createInputItem(final String title) { |
| 135 this.inputItem = PanelHelper.createItem(title);// new TextItem(title); | 134 this.inputItem = PanelHelper.createItem(title);// new TextItem(title); |
| 136 return this.inputItem; | 135 return this.inputItem; |
| 137 } | 136 } |
| 138 | 137 |
| 139 private final List<String> checkForEmpty() { | |
| 140 final List<String> errors = new ArrayList<String>(); | |
| 141 | |
| 142 if (this.inputItem.getValueAsString() == null || this.inputItem.getValueAsString().trim().isEmpty()) { | |
| 143 errors.add(this.MSG.empty_filter()); | |
| 144 return errors; | |
| 145 } | |
| 146 return errors; | |
| 147 } | |
| 148 | |
| 149 protected abstract String errorForItemMsg(); | 138 protected abstract String errorForItemMsg(); |
| 150 | 139 |
| 151 protected final void appendValue(final String value) { | 140 protected final void appendValue(final String value) { |
| 152 this.behaviour.appendValue(this.inputItem, value); | 141 this.behaviour.appendValue(this.inputItem, value); |
| 153 } | 142 } |
| 154 | 143 |
| 155 @Override | 144 @Override |
| 156 public final List<String> validate() { | 145 public final List<String> validate() { |
| 157 final List<String> errors = new ArrayList<String>(); | 146 final List<String> errors = new ArrayList<String>(); |
| 158 errors.addAll(this.checkForEmpty()); | 147 errors.addAll(ValidationHelper.checkForEmpty(this.inputItem, this.MSG)); |
| 159 final String sValue = this.inputItem.getValueAsString(); | 148 final String sValue = this.inputItem.getValueAsString(); |
| 160 return this.behaviour.validate(errors, sValue); | 149 return this.behaviour.validate(errors, sValue); |
| 161 } | 150 } |
| 162 } | 151 } |