Mercurial > dive4elements > river
changeset 3923:9fac337192c9
Removed trailing whitespace.
flys-artifacts/trunk@5607 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Thu, 27 Sep 2012 08:53:59 +0000 |
| parents | e1d3f6bccf2b |
| children | 5fced192b95c |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSFloodplainArtifact.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/map/WMSLayerFacet.java |
| diffstat | 5 files changed, 22 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Thu Sep 27 08:51:51 2012 +0000 +++ b/flys-artifacts/ChangeLog Thu Sep 27 08:53:59 2012 +0000 @@ -1,3 +1,11 @@ +2012-09-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/flys/artifacts/model/map/WMSLayerFacet.java, + src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java, + src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java, + src/main/java/de/intevation/flys/artifacts/WMSFloodplainArtifact.java: + Removed trailing whitespace. + 2012-09-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> * src/main/java/de/intevation/flys/artifacts/model/sq/Measurements.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java Thu Sep 27 08:51:51 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java Thu Sep 27 08:53:59 2012 +0000 @@ -121,7 +121,7 @@ @Override protected Envelope getExtent(boolean reproject) { River river = RiverFactory.getRiver(getRiverId()); - + if (reproject) { logger.debug("Query extent for RiverAxis with Srid: " + getSrid()); return GeometryUtils.transform(
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java Thu Sep 27 08:51:51 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java Thu Sep 27 08:53:59 2012 +0000 @@ -42,7 +42,7 @@ public static final Pattern DB_URL_PATTERN = Pattern.compile("(.*)\\/\\/(.*):([0-9]+)\\/([a-zA-Z]+)"); - + public static final Pattern DB_PSQL_URL_PATTERN = Pattern.compile("(.*)\\/\\/(.*):([0-9]+)\\/([a-zA-Z0-9]+)"); @@ -233,15 +233,15 @@ return connection; } - + protected String getPostgreSQLConnection() { SessionFactoryImpl sf = (SessionFactoryImpl) SessionFactoryProvider.getSessionFactory(); - + String user = SessionFactoryProvider.getUser(sf); String pass = SessionFactoryProvider.getPass(sf); String url = SessionFactoryProvider.getURL(sf); - + Matcher m = DB_PSQL_URL_PATTERN.matcher(url); if (!m.matches()) { logger.warn("Could not parse PostgreSQL Connection string."); @@ -364,11 +364,11 @@ MapfileGenerator.getInstance().update(); } } - + /** * This method returns the extent of a DB layer in the projection of the * database. - * + * * @return the extent of the DB layer in the projection of the database. */ protected Envelope getExtent() { @@ -388,10 +388,10 @@ * the extent is reprojected into the original projection which is * specified in the configuration. Otherwise, the projection of the * database is used. - * + * * @param reproject True, to reproject the extent into the projection * specified in the configuration. - * + * * @return the extent of the database layer. */ protected abstract Envelope getExtent(boolean reproject);
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSFloodplainArtifact.java Thu Sep 27 08:51:51 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSFloodplainArtifact.java Thu Sep 27 08:53:59 2012 +0000 @@ -125,7 +125,7 @@ Floodplain plain = Floodplain.getFloodplain(river.getName()); Envelope e = plain.getGeom().getEnvelopeInternal(); - + return e != null && reproject ? GeometryUtils.transform(e, getSrid()) : e;
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/map/WMSLayerFacet.java Thu Sep 27 08:51:51 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/map/WMSLayerFacet.java Thu Sep 27 08:53:59 2012 +0000 @@ -107,13 +107,13 @@ public Envelope getExtent() { return extent; } - - + + public void setOriginalExtent(Envelope originalExtent) { this.originalExtent = originalExtent; } - - + + public Envelope getOriginalExtent() { return originalExtent; }