Mercurial > dive4elements > river
diff gwt-client/src/main/java/org/dive4elements/river/client/client/ui/uinfo/AbstractVegZonesTablePanel.java @ 9403:e2da9c8a7c57
VegetationZone umbenennen
author | gernotbelger |
---|---|
date | Wed, 15 Aug 2018 13:22:00 +0200 |
parents | d89976700474 |
children | d421c2bf0195 |
line wrap: on
line diff
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/uinfo/AbstractVegZonesTablePanel.java Tue Aug 14 14:04:01 2018 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/uinfo/AbstractVegZonesTablePanel.java Wed Aug 15 13:22:00 2018 +0200 @@ -20,7 +20,7 @@ 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.VegetationZone; +import org.dive4elements.river.client.shared.model.VegetationZoneServerClientXChange; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.ui.Label; @@ -172,7 +172,7 @@ toField.setCanEdit(true);// neue Anforderung - doch nicht? final ListGridField colorField = new ListGridField("color", this.MSG.uinfo_vegetation_zone_color()); - colorField.setHidden(VegetationZone.HAS_COLORS_EDITABLE ? false : true); + colorField.setHidden(VegetationZoneServerClientXChange.HAS_COLORS_EDITABLE ? false : true); final ColorItem item = new ColorItem(); colorField.setEditorProperties(item); @@ -252,8 +252,8 @@ for (final ListGridRecord r : this.elements.getRecords()) { this.elements.removeData(r); } - final List<VegetationZone> rows = VegetationZone.parse(data); - for (final VegetationZone row : rows) { + final List<VegetationZoneServerClientXChange> rows = VegetationZoneServerClientXChange.parse(data); + for (final VegetationZoneServerClientXChange row : rows) { this.elements.addData(createEntry(row)); } } @@ -295,9 +295,9 @@ final Data str = getData(items, datakey); final DataItem[] strItems = str.getItems(); - final List<VegetationZone> entries = VegetationZone.parse(strItems[0].getLabel()); + final List<VegetationZoneServerClientXChange> entries = VegetationZoneServerClientXChange.parse(strItems[0].getLabel()); - for (final VegetationZone entry : entries) { + for (final VegetationZoneServerClientXChange entry : entries) { final Label dateLabel = new Label(entry.getZoneName() + " (" + entry.getMin_day_overflow() + "-" + entry.getMax_day_overflow() + ")"); dateLabel.setHeight("20px"); vLayout.addMember(dateLabel); @@ -319,23 +319,23 @@ return new Data[0]; // TODO: Klären, ob Vegetationszonen-Auswahl Pflicht ist, ob es ein Fallback geben soll usw. } - final DataItem item = new DefaultDataItem(datakey, null, VegetationZone.parseListToDataString(getZones(lgr))); // DATA-key + final DataItem item = new DefaultDataItem(datakey, null, VegetationZoneServerClientXChange.parseListToDataString(getZones(lgr))); // DATA-key data.add(new DefaultData(datakey, null, null, new DataItem[] { item })); return data.toArray(new Data[data.size()]); } - protected final List<VegetationZone> getZones(final ListGridRecord[] lgr) { - final List<VegetationZone> zoneList = new ArrayList<VegetationZone>(); + protected final List<VegetationZoneServerClientXChange> getZones(final ListGridRecord[] lgr) { + final List<VegetationZoneServerClientXChange> zoneList = new ArrayList<VegetationZoneServerClientXChange>(); for (final ListGridRecord element : lgr) { final Record r = element; - final VegetationZone zone = VegetationZone.createFromTableEntry(r.getAttribute("vegzone"), r.getAttribute("from"), r.getAttribute("to"), + final VegetationZoneServerClientXChange zone = VegetationZoneServerClientXChange.createFromTableEntry(r.getAttribute("vegzone"), r.getAttribute("from"), r.getAttribute("to"), r.getAttribute("color")); zoneList.add(zone); } return zoneList; } - public final ListGridRecord createEntry(final VegetationZone row) { + public final ListGridRecord createEntry(final VegetationZoneServerClientXChange row) { final String vegzone = row.getZoneName(); final Integer from = row.getMin_day_overflow(); @@ -386,9 +386,9 @@ public final List<String> validate() { final List<String> errors = new ArrayList<String>(); - if (VegetationZone.zonesAreOverlapping(this.getZones(this.elements.getRecords()))) + if (VegetationZoneServerClientXChange.zonesAreOverlapping(this.getZones(this.elements.getRecords()))) errors.add(this.MSG.uinfo_vegetation_zone_overlap()); - if (VegetationZone.hasGaps(this.getZones(this.elements.getRecords()), 0, 365)) + if (VegetationZoneServerClientXChange.hasGaps(this.getZones(this.elements.getRecords()), 0, 365)) errors.add(this.MSG.uinfo_vegetation_zone_has_gaps()); return errors; }