Mercurial > dive4elements > river
changeset 1070:b1ed0ec0236f
Smaller Cosmetics.
flys-artifacts/trunk@2554 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 24 Aug 2011 11:38:30 +0000 |
| parents | 28ea1e8a5f46 |
| children | 470087bd39e2 |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DataFacet.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java |
| diffstat | 5 files changed, 20 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Wed Aug 24 10:53:01 2011 +0000 +++ b/flys-artifacts/ChangeLog Wed Aug 24 11:38:30 2011 +0000 @@ -1,3 +1,17 @@ +2011-08-24 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + Smaller cosmetics. + + * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java, + src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: + Cosmetics in comments. + + * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: + Added @Override annotations. + + * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: + Use brackets to improve readability of ternary operator. + 2011-08-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> * doc/conf/meta-data.xml: Use "ids" in user specific part, too.
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java Wed Aug 24 10:53:01 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java Wed Aug 24 11:38:30 2011 +0000 @@ -99,6 +99,7 @@ * * @return the description of this artifact. */ + @Override public Document describe(Document data, CallContext context) { logger.debug("Describe: the current state is: " + getCurrentStateId()); @@ -157,6 +158,7 @@ * @param outs Element to add outputmode elements to. * @param context The given CallContext (mostly for internationalization). */ + //@Override protected void appendOutputModes( Document doc, Element outs,
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DataFacet.java Wed Aug 24 10:53:01 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DataFacet.java Wed Aug 24 11:38:30 2011 +0000 @@ -56,7 +56,7 @@ @Override public Object getData(Artifact artifact, CallContext context) { FLYSArtifact flys = (FLYSArtifact)artifact; - String theHash = hash != null ? hash : flys.hash(); + String theHash = (hash != null) ? hash : flys.hash(); return stateId != null && stateId.length() > 0 ? flys.compute(context, stateId, theHash, type, false)
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java Wed Aug 24 10:53:01 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java Wed Aug 24 11:38:30 2011 +0000 @@ -42,7 +42,7 @@ NONE, LOCATIONS, DISTANCES } - /** The logger used in this service.*/ + /** The logger used in this service. */ private static Logger logger = Logger.getLogger(DistanceInfoService.class); public static final String CACHE_NAME = "service-distanceinfo"; @@ -167,9 +167,8 @@ /** - * This method build an Element for a distance info. + * Builds an Element for a distance info. * - * @param ec The ElementCreator. * @param anno The Annotation that provides information about the distance. * * @return an Element that contains information about a distance.
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java Wed Aug 24 10:53:01 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java Wed Aug 24 11:38:30 2011 +0000 @@ -33,7 +33,7 @@ */ public class DischargeCurveGenerator extends XYChartGenerator { - /** The logger used in this generator.*/ + /** The logger used in this generator. */ private static Logger logger = Logger.getLogger(DischargeCurveGenerator.class);