# HG changeset patch # User Felix Wolfsteller # Date 1315381042 0 # Node ID 073c36bb94ed66fa9b93e8d4c2d27650bb397f70 # Parent 8da5f5a9ed3cecd22d9ba8e656e1f11130ebbf5c Minor cosmetics flys-artifacts/trunk@2658 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 8da5f5a9ed3c -r 073c36bb94ed flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Wed Sep 07 07:28:52 2011 +0000 +++ b/flys-artifacts/ChangeLog Wed Sep 07 07:37:22 2011 +0000 @@ -1,3 +1,9 @@ +2011-09-07 Felix Wolfsteller + + * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, + src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: + Minor cosmetics. + 2011-09-07 Felix Wolfsteller * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java, diff -r 8da5f5a9ed3c -r 073c36bb94ed flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java Wed Sep 07 07:28:52 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java Wed Sep 07 07:37:22 2011 +0000 @@ -714,6 +714,7 @@ return new ArrayList(); } + protected List getOutputForState(DefaultState state) { List list = state.getOutputs(); if (list == null || list.size() == 0) { @@ -828,6 +829,13 @@ return compute(context, hash, current, type, generateFacets); } + + /** + * @param key key of state + * @param state state + * @param type Type of compute + * @param generateFacets Whether new facets shall be generated. + */ public Object compute( CallContext context, String key, @@ -837,7 +845,7 @@ ) { String stateID = state.getID(); - List fs = generateFacets ? new ArrayList() : null; + List fs = (generateFacets) ? new ArrayList() : null; try { Cache cache = CacheFactory.getCache(COMPUTING_CACHE); diff -r 8da5f5a9ed3c -r 073c36bb94ed flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java Wed Sep 07 07:28:52 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java Wed Sep 07 07:37:22 2011 +0000 @@ -214,7 +214,7 @@ List fs = facets.get(stateId); if (fs == null || fs.size() == 0) { - logger.debug("No facets found."); + logger.debug("No facets for previous state found."); continue; } @@ -231,7 +231,7 @@ List list = cur.getOutputs(); if (list != null && list.size() > 0) { logger.debug( - "Append output modes for state: " + cur.getID()); + "Append output modes for current state: " + cur.getID()); List fs = facets.get(cur.getID()); if (fs != null && fs.size() > 0) { @@ -591,6 +591,7 @@ return calc4.calculate(table, range[0], range[1], range[2]); } + public List getSegments() { StateData wqValues = getData("wq_values"); if (wqValues == null) { @@ -845,6 +846,7 @@ } } + public double [] getFromToStep() { if (!isRange()) { return null;