Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/HWSBarriersState.java @ 8860:28df64078f27
Merge with 0862ea5d66baf60e7eee496d130a35157cc9ec12
author | gernotbelger |
---|---|
date | Fri, 19 Jan 2018 11:23:42 +0100 |
parents | 5e38e2924c07 |
children | 0a5239a1e46e |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/HWSBarriersState.java Thu Jan 18 18:34:41 2018 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/HWSBarriersState.java Fri Jan 19 11:23:42 2018 +0100 @@ -109,7 +109,8 @@ shapeLines, lineType, collectionLines); } - FeatureCollection collectionPoints = FeatureCollections.newCollection(); + FeatureCollection collectionPoints = + FeatureCollections.newCollection(); SimpleFeatureType pointType = null; for (HWS h : selectedPoints) { pointType = h.getFeatureType(); @@ -181,7 +182,8 @@ FloodMapState.createMapfile( artifact, artifactDir, - MapfileGenerator.MS_LAYER_PREFIX + FloodMapState.WSPLGEN_USER_RGD, + MapfileGenerator.MS_LAYER_PREFIX + + FloodMapState.WSPLGEN_USER_RGD, FloodMapState.WSPLGEN_USER_RGD_SHAPE, type, epsg, @@ -208,7 +210,8 @@ } catch (IOException ioe) { log.warn("Zip archive " + dir + "/" - + FloodMapState.WSPLGEN_USER_RGD_ZIP + " could not be extracted."); + + FloodMapState.WSPLGEN_USER_RGD_ZIP + + " could not be extracted."); return false; } } @@ -238,10 +241,14 @@ return true; } try { - FileTools.copyFile(file, new File(target, FloodMapState.WSPLGEN_USER_RGD + "." + suffix)); + FileTools.copyFile( + file, + new File(target, + FloodMapState.WSPLGEN_USER_RGD + + "." + suffix)); } catch (IOException ioe) { - log.warn ("Error while copying file " + file.getName()); + log.warn("Error while copying file " + file.getName()); return true; } } @@ -264,7 +271,7 @@ /** - * Removes the directory and all its content where the required data and the + * Removes directory and all its content where the required data and the * results of WSPLGEN are stored. Should be called in endOfLife(). */ // FIXME: I've seen this code somewhere else...