Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/MultiStringArrayState.java @ 3649:33bfc01410fb
Merged revisions 5375,5379,5382 via svnmerge from
file:///home/clients/bsh/bsh-generischer-viewer/Material/SVN/flys-artifacts/trunk
........
r5375 | ingo | 2012-09-07 11:26:45 +0200 (Fr, 07 Sep 2012) | 1 line
Tagged 'flys-artifacts' as 2.9
........
r5379 | rrenkert | 2012-09-07 13:58:41 +0200 (Fr, 07 Sep 2012) | 4 lines
Issue 791.
Add start km to data to compare reference and target km in next state.
........
r5382 | rrenkert | 2012-09-07 14:03:48 +0200 (Fr, 07 Sep 2012) | 3 lines
Set data for characteristic diameter for use in parameter matrix UI.
........
flys-artifacts/tags/2.9@5388 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Fri, 07 Sep 2012 13:12:08 +0000 |
| parents | 4bd3d8bbb60c |
| children |
comparison
equal
deleted
inserted
replaced
| 3648:db6bb4c1f41f | 3649:33bfc01410fb |
|---|---|
| 33 Element select | 33 Element select |
| 34 ) { | 34 ) { |
| 35 try { | 35 try { |
| 36 creator.addAttr(select, "type", "options", true); | 36 creator.addAttr(select, "type", "options", true); |
| 37 | 37 |
| 38 for (KVP kvp: getOptions(artifact, name)) { | 38 for (KVP kvp: getOptions(artifact, name, context)) { |
| 39 Element item = creator.create("item"); | 39 Element item = creator.create("item"); |
| 40 creator.addAttr(item, "label", kvp.getValue().toString(), true); | 40 creator.addAttr(item, "label", kvp.getValue().toString(), true); |
| 41 creator.addAttr(item, "value", kvp.getKey().toString(), true); | 41 creator.addAttr(item, "value", kvp.getKey().toString(), true); |
| 42 | 42 |
| 43 select.appendChild(item); | 43 select.appendChild(item); |
| 78 } | 78 } |
| 79 | 79 |
| 80 | 80 |
| 81 protected abstract KVP<String, String>[] getOptions( | 81 protected abstract KVP<String, String>[] getOptions( |
| 82 Artifact artifact, | 82 Artifact artifact, |
| 83 String parameterName | 83 String parameterName, |
| 84 CallContext context | |
| 84 ) | 85 ) |
| 85 throws IllegalArgumentException; | 86 throws IllegalArgumentException; |
| 86 | 87 |
| 87 | 88 |
| 88 protected abstract String getLabelFor( | 89 protected abstract String getLabelFor( |