Mercurial > dive4elements > river
changeset 3792:2e993a847e31
Backend: Java 1.5 -> 1.6
flys-backend/trunk@5421 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Mon, 10 Sep 2012 13:00:59 +0000 |
| parents | e72c7fe202dd |
| children | 8f232119011e |
| files | flys-backend/ChangeLog flys-backend/pom.xml flys-backend/src/main/java/de/intevation/flys/utils/StringUtil.java |
| diffstat | 3 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-backend/ChangeLog Mon Sep 10 12:16:28 2012 +0000 +++ b/flys-backend/ChangeLog Mon Sep 10 13:00:59 2012 +0000 @@ -1,3 +1,10 @@ +2012-09-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * pom.xml: Java 1.6 -> 1.6 + + * src/main/java/de/intevation/flys/utils/StringUtil.java: + Replaced german comment (with an ill encoded Umlaut). + 2012-09-10 Christian Lins <christian.lins@intevation.de> * src/main/java/de/intevation/flys/model/Gauge.java:
--- a/flys-backend/pom.xml Mon Sep 10 12:16:28 2012 +0000 +++ b/flys-backend/pom.xml Mon Sep 10 13:00:59 2012 +0000 @@ -33,8 +33,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>2.0.2</version> <configuration> - <source>1.5</source> - <target>1.5</target> + <source>1.6</source> + <target>1.6</target> </configuration> </plugin> </plugins>
--- a/flys-backend/src/main/java/de/intevation/flys/utils/StringUtil.java Mon Sep 10 12:16:28 2012 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/utils/StringUtil.java Mon Sep 10 13:00:59 2012 +0000 @@ -517,7 +517,7 @@ } /** - * Gibt den Dateinamen in S ohne Dateiendung zurück. + * Returns the file name without extension. */ public static final String cutExtension(String s) { if (s == null) {