Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FunctionSelect.java @ 3785:a5f65e8983be
Merged revisions 5501-5502,5504-5508,5511-5513,5516-5519 via svnmerge from
file:///home/clients/bsh/bsh-generischer-viewer/Material/SVN/flys-artifacts/trunk
........
r5501 | felix | 2012-09-18 11:49:45 +0200 (Di, 18 Sep 2012) | 1 line
fix issue865 - missing showarea theme prop.
........
r5502 | clins | 2012-09-18 12:18:30 +0200 (Di, 18 Sep 2012) | 1 line
Add robustness checks to prevent NPEs
........
r5504 | felix | 2012-09-18 14:03:15 +0200 (Di, 18 Sep 2012) | 1 line
i18n for area label (fix issue487).
........
r5505 | clins | 2012-09-18 16:19:59 +0200 (Di, 18 Sep 2012) | 1 line
Update themes to show point descriptions
........
r5506 | rrenkert | 2012-09-18 17:00:30 +0200 (Di, 18 Sep 2012) | 3 lines
Removed incorrect characteristic diameter.
........
r5507 | rrenkert | 2012-09-18 17:03:20 +0200 (Di, 18 Sep 2012) | 3 lines
Fixed some stupid bugs in bed quality data factory and calculation.
........
r5508 | teichmann | 2012-09-18 17:45:49 +0200 (Di, 18 Sep 2012) | 1 line
The usual whitespace and import cleanups.
........
r5511 | teichmann | 2012-09-18 18:24:51 +0200 (Di, 18 Sep 2012) | 1 line
Use generics aware Collections.emptyList().
........
r5512 | teichmann | 2012-09-18 20:36:52 +0200 (Di, 18 Sep 2012) | 1 line
Some more little steps towards "Auslagerung extremer Wasserspiegellagen".
........
r5513 | clins | 2012-09-18 23:38:19 +0200 (Di, 18 Sep 2012) | 1 line
A and B facets of fix analyis are now deactivated by default
........
r5516 | bricks | 2012-09-19 10:45:51 +0200 (Mi, 19 Sep 2012) | 2 lines
Add the gauge station to the GaugeOverviewInfoService xml response
........
r5517 | rrenkert | 2012-09-19 10:50:23 +0200 (Mi, 19 Sep 2012) | 3 lines
Added CSV export to bed quality calculation.
........
r5518 | bricks | 2012-09-19 11:04:04 +0200 (Mi, 19 Sep 2012) | 2 lines
Fix date in changelog entry
........
r5519 | teichmann | 2012-09-19 11:17:14 +0200 (Mi, 19 Sep 2012) | 1 line
Removed trailing whitespace.
........
flys-artifacts/tags/2.9.1@5531 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Wed, 19 Sep 2012 14:58:31 +0000 |
parents | ff3ccd84f96a |
children | eb5564662e19 |
comparison
equal
deleted
inserted
replaced
3784:9f9d5ada96ca | 3785:a5f65e8983be |
---|---|
2 | 2 |
3 import java.util.Collection; | 3 import java.util.Collection; |
4 import java.util.Iterator; | 4 import java.util.Iterator; |
5 | 5 |
6 import org.apache.log4j.Logger; | 6 import org.apache.log4j.Logger; |
7 | |
8 import org.w3c.dom.Element; | 7 import org.w3c.dom.Element; |
9 | 8 |
10 import de.intevation.artifacts.Artifact; | 9 import de.intevation.artifacts.Artifact; |
11 import de.intevation.artifacts.CallContext; | 10 import de.intevation.artifacts.CallContext; |
12 | |
13 import de.intevation.artifacts.common.utils.XMLUtils; | 11 import de.intevation.artifacts.common.utils.XMLUtils; |
14 | |
15 import de.intevation.flys.artifacts.states.DefaultState; | |
16 import de.intevation.flys.artifacts.math.fitting.Function; | 12 import de.intevation.flys.artifacts.math.fitting.Function; |
17 import de.intevation.flys.artifacts.math.fitting.FunctionFactory; | 13 import de.intevation.flys.artifacts.math.fitting.FunctionFactory; |
14 import de.intevation.flys.artifacts.states.DefaultState; | |
18 | 15 |
19 /** | 16 /** |
20 * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a> | 17 * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a> |
21 */ | 18 */ |
22 public class FunctionSelect extends DefaultState { | 19 public class FunctionSelect extends DefaultState { |
29 * The default constructor that initializes an empty State object. | 26 * The default constructor that initializes an empty State object. |
30 */ | 27 */ |
31 public FunctionSelect() { | 28 public FunctionSelect() { |
32 } | 29 } |
33 | 30 |
31 @Override | |
34 public String getUIProvider() { | 32 public String getUIProvider() { |
35 return "fix.functionselect"; | 33 return "fix.functionselect"; |
36 } | 34 } |
37 | 35 |
38 @Override | 36 @Override |
41 Artifact artifact, | 39 Artifact artifact, |
42 String name, | 40 String name, |
43 CallContext context) | 41 CallContext context) |
44 { | 42 { |
45 FunctionFactory ff = FunctionFactory.getInstance(); | 43 FunctionFactory ff = FunctionFactory.getInstance(); |
46 Collection fc = ff.getFunctions(); | 44 Collection<Function> fc = ff.getFunctions(); |
47 Element[] functions = new Element[fc.size()]; | 45 Element[] functions = new Element[fc.size()]; |
48 Iterator i = fc.iterator(); | 46 Iterator<Function> i = fc.iterator(); |
49 | 47 |
50 int j = 0; | 48 int j = 0; |
51 while(i.hasNext()) { | 49 while(i.hasNext()) { |
52 Function f = (Function)i.next(); | 50 Function f = i.next(); |
53 String n = f.getName(); | 51 String n = f.getName(); |
54 String d = f.getDescription(); | 52 String d = f.getDescription(); |
55 functions[j] = createItem(ec, new String[] {d, n}); | 53 functions[j] = createItem(ec, new String[] {d, n}); |
56 j++; | 54 j++; |
57 } | 55 } |