Mercurial > dive4elements > river
changeset 1982:8afd6a9bb244
Cosmetics.
flys-artifacts/trunk@3412 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 14 Dec 2011 10:46:39 +0000 |
| parents | bf62cc7052d4 |
| children | ddb7b7da6199 |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/ExternalWMSArtifact.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java flys-artifacts/src/main/java/de/intevation/flys/utils/DataUtil.java |
| diffstat | 5 files changed, 19 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Wed Dec 14 10:44:00 2011 +0000 +++ b/flys-artifacts/ChangeLog Wed Dec 14 10:46:39 2011 +0000 @@ -1,3 +1,19 @@ +2011-12-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + Cosmetics. + + * src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java, + ChangeLog: Whitespace cosmetic. + + * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: + Annotation cosmetic. + + * src/main/java/de/intevation/flys/artifacts/ExternalWMSArtifact.java: + Convenience cosmetic. + + * src/main/java/de/intevation/flys/utils/DataUtil.java: + vim-magicosmetic. + 2011-12-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> Implement new WaterLineArtifact where needed so far. @@ -9,7 +25,6 @@ (getWaterLines): Implement to fulfil new WaterLineArtifact- interface-impl. Also generate new Facet. - * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: Do not depend on WINFOArtifacts, but on WaterLineArtifacts instead.
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java Wed Dec 14 10:44:00 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java Wed Dec 14 10:46:39 2011 +0000 @@ -117,6 +117,7 @@ final List<Facet> fs = facets.get(getCurrentStateId()); StaticState state = new StaticState(STATIC_STATE_NAME) { + @Override public Object staticCompute(List<Facet> facets) { if (facets != null) { facets.addAll(fs);
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/ExternalWMSArtifact.java Wed Dec 14 10:44:00 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/ExternalWMSArtifact.java Wed Dec 14 10:46:39 2011 +0000 @@ -14,7 +14,6 @@ import de.intevation.artifacts.common.ArtifactNamespaceContext; import de.intevation.artifacts.common.utils.XMLUtils; -import de.intevation.artifactdatabase.data.DefaultStateData; import de.intevation.artifactdatabase.state.DefaultOutput; import de.intevation.artifactdatabase.state.Facet; import de.intevation.artifactdatabase.state.State; @@ -54,7 +53,7 @@ data, XPATH_IDS, ArtifactNamespaceContext.INSTANCE); if (ids != null && ids.length() > 0) { - addData("ids", new DefaultStateData("ids", null, null, ids)); + addStringData("ids", ids); } else { throw new IllegalArgumentException("No attribute 'ids' found!");
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java Wed Dec 14 10:44:00 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java Wed Dec 14 10:46:39 2011 +0000 @@ -68,4 +68,3 @@ } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : -
--- a/flys-artifacts/src/main/java/de/intevation/flys/utils/DataUtil.java Wed Dec 14 10:44:00 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/DataUtil.java Wed Dec 14 10:46:39 2011 +0000 @@ -31,3 +31,4 @@ return up > samples/2; } } +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :