Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQSelect.java @ 2422:44dc117aa2b7
Picked rev 4058,4063,4065,4068,4069 from trunk.
flys-artifacts/tags/2.6.1@4077 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Fri, 17 Feb 2012 11:29:41 +0000 |
| parents | 22bac691d414 |
| children | ac528b883b47 |
comparison
equal
deleted
inserted
replaced
| 2421:59047dfed8be | 2422:44dc117aa2b7 |
|---|---|
| 87 ) { | 87 ) { |
| 88 if (!name.equals(WQ_SINGLE)) { | 88 if (!name.equals(WQ_SINGLE)) { |
| 89 return super.createStaticData(flys, creator, cc, name, value, type); | 89 return super.createStaticData(flys, creator, cc, name, value, type); |
| 90 } | 90 } |
| 91 | 91 |
| 92 String mode = flys.getDataAsString(WQ_MODE); | 92 boolean isQ = flys.getDataAsBoolean(WQ_MODE); |
| 93 String free = flys.getDataAsString(WQ_FREE); | 93 boolean isFree = flys.getDataAsBoolean(WQ_FREE); |
| 94 | 94 |
| 95 WINFOArtifact winfo = (WINFOArtifact) flys; | 95 WINFOArtifact winfo = (WINFOArtifact) flys; |
| 96 | 96 |
| 97 Element dataElement = creator.create("data"); | 97 Element dataElement = creator.create("data"); |
| 98 creator.addAttr(dataElement, "name", name, true); | 98 creator.addAttr(dataElement, "name", name, true); |
| 101 Element itemElement = creator.create("item"); | 101 Element itemElement = creator.create("item"); |
| 102 creator.addAttr(itemElement, "value", value, true); | 102 creator.addAttr(itemElement, "value", value, true); |
| 103 | 103 |
| 104 String label; | 104 String label; |
| 105 | 105 |
| 106 if (mode == null || mode.equals("W") || Boolean.valueOf(free)) { | 106 if (!isQ || isFree) { |
| 107 label = getLabel(winfo, cc, value); | 107 label = getLabel(winfo, cc, value); |
| 108 } | 108 } |
| 109 else { | 109 else { |
| 110 label = getSpecialLabel(winfo, cc, value); | 110 label = getSpecialLabel(winfo, cc, value); |
| 111 } | 111 } |
| 452 logger.debug("WQSelect.validate"); | 452 logger.debug("WQSelect.validate"); |
| 453 | 453 |
| 454 WINFOArtifact flys = (WINFOArtifact) artifact; | 454 WINFOArtifact flys = (WINFOArtifact) artifact; |
| 455 | 455 |
| 456 StateData data = getData(flys, WQ_SELECTION); | 456 StateData data = getData(flys, WQ_SELECTION); |
| 457 String selectionMode = data != null ? (String) data.getValue() : null; | 457 boolean isRange = data != null |
| 458 | 458 ? Boolean.valueOf((String) data.getValue()) |
| 459 if (selectionMode == null || selectionMode.equals("single")) { | 459 : false; |
| 460 | |
| 461 if (!isRange) { | |
| 460 return validateSingle(artifact); | 462 return validateSingle(artifact); |
| 461 } | 463 } |
| 462 else { | 464 else { |
| 463 return validateRange(artifact); | 465 return validateRange(artifact); |
| 464 } | 466 } |