Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/collections/CollectionDescriptionHelper.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 | 4a76da133144 |
children |
comparison
equal
deleted
inserted
replaced
3784:9f9d5ada96ca | 3785:a5f65e8983be |
---|---|
4 import java.util.Date; | 4 import java.util.Date; |
5 import java.util.List; | 5 import java.util.List; |
6 | 6 |
7 import javax.xml.xpath.XPathConstants; | 7 import javax.xml.xpath.XPathConstants; |
8 | 8 |
9 import org.apache.log4j.Logger; | |
9 import org.w3c.dom.Document; | 10 import org.w3c.dom.Document; |
10 import org.w3c.dom.Element; | 11 import org.w3c.dom.Element; |
11 import org.w3c.dom.Node; | 12 import org.w3c.dom.Node; |
12 import org.w3c.dom.NodeList; | 13 import org.w3c.dom.NodeList; |
13 | 14 |
14 import org.apache.log4j.Logger; | |
15 | |
16 import de.intevation.artifacts.ArtifactDatabase; | 15 import de.intevation.artifacts.ArtifactDatabase; |
17 import de.intevation.artifacts.ArtifactDatabaseException; | 16 import de.intevation.artifacts.ArtifactDatabaseException; |
18 import de.intevation.artifacts.ArtifactNamespaceContext; | 17 import de.intevation.artifacts.ArtifactNamespaceContext; |
19 import de.intevation.artifacts.CallContext; | 18 import de.intevation.artifacts.CallContext; |
20 | |
21 import de.intevation.artifacts.common.utils.XMLUtils; | 19 import de.intevation.artifacts.common.utils.XMLUtils; |
22 import de.intevation.artifacts.common.utils.XMLUtils.ElementCreator; | 20 import de.intevation.artifacts.common.utils.XMLUtils.ElementCreator; |
23 | 21 |
24 | 22 |
25 public class CollectionDescriptionHelper { | 23 public class CollectionDescriptionHelper { |
61 String uuid, | 59 String uuid, |
62 Date creation, | 60 Date creation, |
63 long ttl, | 61 long ttl, |
64 CallContext callContext | 62 CallContext callContext |
65 ) { | 63 ) { |
66 this.name = name; | 64 this.name = name; |
67 this.uuid = uuid; | 65 this.uuid = uuid; |
68 this.creation = creation; | 66 this.creation = creation; |
69 this.ttl = ttl; | 67 this.ttl = ttl; |
70 this.context = callContext; | 68 this.context = callContext; |
71 this.database = callContext.getDatabase(); | 69 this.database = callContext.getDatabase(); |
70 this.artifacts = new ArrayList<String>(); | |
72 } | 71 } |
73 | 72 |
74 | 73 |
75 public void addArtifact(String uuid) { | 74 public void addArtifact(String uuid) { |
76 if (artifacts == null) { | |
77 artifacts = new ArrayList<String>(); | |
78 } | |
79 | |
80 if (uuid != null && uuid.length() > 0) { | 75 if (uuid != null && uuid.length() > 0) { |
81 artifacts.add(uuid); | 76 artifacts.add(uuid); |
82 } | 77 } |
83 } | 78 } |
84 | 79 |
195 return ci; | 190 return ci; |
196 } | 191 } |
197 | 192 |
198 | 193 |
199 protected void appendAttribute(Element root) { | 194 protected void appendAttribute(Element root) { |
200 Document owner = root.getOwnerDocument(); | 195 if (attribute != null) { |
201 Document attr = attribute.toXML(); | 196 Document owner = root.getOwnerDocument(); |
202 | 197 Document attr = attribute.toXML(); |
203 root.appendChild(owner.importNode(attr.getFirstChild(), true)); | 198 |
199 root.appendChild(owner.importNode(attr.getFirstChild(), true)); | |
200 } | |
204 } | 201 } |
205 } | 202 } |
206 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : | 203 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : |