Mercurial > dive4elements > river
changeset 464:d37ccb04ab5d
Removed trailing whitespace.
flys-backend/trunk@1637 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Sun, 03 Apr 2011 10:41:27 +0000 |
| parents | 24e356cf9f6c |
| children | c2c3ad4fda58 |
| files | flys-backend/ChangeLog flys-backend/src/main/java/de/intevation/flys/App.java flys-backend/src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java flys-backend/src/main/java/de/intevation/flys/importer/AnnotationsParser.java flys-backend/src/main/java/de/intevation/flys/importer/ImportGauge.java flys-backend/src/main/java/de/intevation/flys/importer/PegelGltParser.java flys-backend/src/main/java/de/intevation/flys/importer/WstParser.java flys-backend/src/main/java/de/intevation/flys/utils/DBCPConnectionProvider.java flys-backend/src/test/java/de/intevation/flys/AppTest.java |
| diffstat | 9 files changed, 19 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-backend/ChangeLog Wed Mar 30 13:43:59 2011 +0000 +++ b/flys-backend/ChangeLog Sun Apr 03 10:41:27 2011 +0000 @@ -1,3 +1,7 @@ +2011-04-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/**/*.java: Removed trailing whitespace. + 2011-03-30 Ingo Weinzierl <ingo@intevation.de> Tagged RELEASE 0.1
--- a/flys-backend/src/main/java/de/intevation/flys/App.java Wed Mar 30 13:43:59 2011 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/App.java Sun Apr 03 10:41:27 2011 +0000 @@ -26,7 +26,7 @@ import org.hibernate.cfg.Environment; -public class App +public class App { private static final String USER = System.getProperty("flys.user", "flys");
--- a/flys-backend/src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java Wed Mar 30 13:43:59 2011 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java Sun Apr 03 10:41:27 2011 +0000 @@ -82,7 +82,7 @@ Config.getStringXPath(XPATH_PASSWORD, DEFAULT_PASSWORD); String dialect = Config.getStringXPath(XPATH_DIALECT, DEFAULT_DIALECT); - String driver = + String driver = Config.getStringXPath(XPATH_DRIVER, DEFAULT_DRIVER); String url = Config.getStringXPath(XPATH_URL, DEFAULT_URL);
--- a/flys-backend/src/main/java/de/intevation/flys/importer/AnnotationsParser.java Wed Mar 30 13:43:59 2011 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/importer/AnnotationsParser.java Sun Apr 03 10:41:27 2011 +0000 @@ -82,7 +82,7 @@ from = new BigDecimal(r[0]); to = r.length < 2 ? null : new BigDecimal(r[1]); if (to != null && from.compareTo(to) > 0) { - BigDecimal t = from; from = to; to = t; + BigDecimal t = from; from = to; to = t; } } catch (NumberFormatException nfe) {
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportGauge.java Wed Mar 30 13:43:59 2011 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportGauge.java Sun Apr 03 10:41:27 2011 +0000 @@ -172,7 +172,7 @@ if (gauges.isEmpty()) { peer = new Gauge( name, river, - station, aeo, datum, + station, aeo, datum, range.getPeer(river)); session.save(peer); }
--- a/flys-backend/src/main/java/de/intevation/flys/importer/PegelGltParser.java Wed Mar 30 13:43:59 2011 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/importer/PegelGltParser.java Sun Apr 03 10:41:27 2011 +0000 @@ -65,15 +65,15 @@ String [] parts = line.split("\\s+"); if (parts.length < 4) { - log.warn("line " + in.getLineNumber() + log.warn("line " + in.getLineNumber() + " has not enough columns"); continue; } BigDecimal from = new BigDecimal(parts[0].replace(",", ".")); BigDecimal to = new BigDecimal(parts[1].replace(",", ".")); - if (from.compareTo(from) > 0) { - BigDecimal t = from; from = to; to = t; + if (from.compareTo(from) > 0) { + BigDecimal t = from; from = to; to = t; } ImportRange range = new ImportRange(from, to); File staFile = FileTools.repair(new File(parent, parts[2]));
--- a/flys-backend/src/main/java/de/intevation/flys/importer/WstParser.java Wed Mar 30 13:43:59 2011 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/importer/WstParser.java Sun Apr 03 10:41:27 2011 +0000 @@ -197,7 +197,7 @@ Matcher m = UNIT_COMMENT.matcher(line); if (m.matches()) { log.debug("unit comment found"); - // XXX: This hack is needed because desktop + // XXX: This hack is needed because desktop // FLYS is broken figuring out the unit String [] units = m.group(1).split("\\s{2,}"); m = UNIT.matcher(units[0]); @@ -309,7 +309,7 @@ protected void addInterval( double from, - double to, + double to, Map<String, Double> values ) { log.debug("addInterval: " + from + " " + to); @@ -335,8 +335,8 @@ } private static final Double [] parseLineAsDouble( - String line, - int count, + String line, + int count, boolean bStation, boolean bParseEmptyAsZero ) { @@ -358,7 +358,7 @@ } private static String [] parseLine( - String line, + String line, int tokenCount, boolean bParseStation ) {
--- a/flys-backend/src/main/java/de/intevation/flys/utils/DBCPConnectionProvider.java Wed Mar 30 13:43:59 2011 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/utils/DBCPConnectionProvider.java Sun Apr 03 10:41:27 2011 +0000 @@ -82,7 +82,7 @@ private BasicDataSource ds; - // Old Environment property for backward-compatibility + // Old Environment property for backward-compatibility // (property removed in Hibernate3) private static final String DBCP_PS_MAXACTIVE = "hibernate.dbcp.ps.maxActive"; @@ -140,7 +140,7 @@ if (driverProps.size() > 0) { StringBuilder connectionProperties = new StringBuilder(); - for (Iterator iter = driverProps.entrySet().iterator(); + for (Iterator iter = driverProps.entrySet().iterator(); iter.hasNext(); ) { Map.Entry entry = (Map.Entry)iter.next();
--- a/flys-backend/src/test/java/de/intevation/flys/AppTest.java Wed Mar 30 13:43:59 2011 +0000 +++ b/flys-backend/src/test/java/de/intevation/flys/AppTest.java Sun Apr 03 10:41:27 2011 +0000 @@ -7,7 +7,7 @@ /** * Unit test for simple App. */ -public class AppTest +public class AppTest extends TestCase { /**