# HG changeset patch # User Sascha L. Teichmann # Date 1340439602 0 # Node ID c40729bfe06d724f7f87e9177d7d0a40f9bfe590 # Parent b7831cefbb62f23a8a9fc2db92e1a70324c52a68 Removed trailing whitespace. artifacts/trunk@4764 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r b7831cefbb62 -r c40729bfe06d ChangeLog --- a/ChangeLog Tue Jun 05 13:32:14 2012 +0000 +++ b/ChangeLog Sat Jun 23 08:20:02 2012 +0000 @@ -1,3 +1,8 @@ +2012-06-23 Sascha L. Teichmann + + * artifact-database/src/main/java/de/intevation/**/*.java: + Removed trailing whitespace. + 2012-06-05 Ingo Weinzierl * artifact-database/src/main/java/de/intevation/artifactdatabase/Backend.java, diff -r b7831cefbb62 -r c40729bfe06d artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java Tue Jun 05 13:32:14 2012 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java Sat Jun 23 08:20:02 2012 +0000 @@ -1867,7 +1867,7 @@ } @Override - public void loadAllArtifacts(ArtifactLoadedCallback callback) + public void loadAllArtifacts(ArtifactLoadedCallback callback) throws ArtifactDatabaseException { logger.debug("loadAllArtifacts"); diff -r b7831cefbb62 -r c40729bfe06d artifact-database/src/main/java/de/intevation/artifactdatabase/DBConfig.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/DBConfig.java Tue Jun 05 13:32:14 2012 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/DBConfig.java Sat Jun 23 08:20:02 2012 +0000 @@ -57,7 +57,7 @@ } private static DBConfig createInstance() { - + String driver = Config.getStringXPath( DB_DRIVER, DBConnection.DEFAULT_DRIVER); diff -r b7831cefbb62 -r c40729bfe06d artifact-database/src/main/java/de/intevation/artifactdatabase/DatabaseCleaner.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/DatabaseCleaner.java Tue Jun 05 13:32:14 2012 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/DatabaseCleaner.java Sat Jun 23 08:20:02 2012 +0000 @@ -219,7 +219,7 @@ } } // class IdIdentifier - private static final class IdData + private static final class IdData extends IdIdentifier { byte [] data; @@ -227,7 +227,7 @@ public IdData( int id, - String factoryName, + String factoryName, byte [] data, String identifier ) { diff -r b7831cefbb62 -r c40729bfe06d artifact-database/src/main/java/de/intevation/artifactdatabase/db/SQL.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/db/SQL.java Tue Jun 05 13:32:14 2012 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/db/SQL.java Sat Jun 23 08:20:02 2012 +0000 @@ -50,7 +50,7 @@ Class clazz, String resourcePath, String driver - ) { + ) { logger.debug("loadStatements"); Properties properties = new Properties(); @@ -105,7 +105,7 @@ } if (debug) { - logger.debug("-> '" + sql + "'"); + logger.debug("-> '" + sql + "'"); } return sql; diff -r b7831cefbb62 -r c40729bfe06d artifacts-common/src/main/java/de/intevation/artifacts/common/utils/FileTools.java --- a/artifacts-common/src/main/java/de/intevation/artifacts/common/utils/FileTools.java Tue Jun 05 13:32:14 2012 +0000 +++ b/artifacts-common/src/main/java/de/intevation/artifacts/common/utils/FileTools.java Sat Jun 23 08:20:02 2012 +0000 @@ -125,7 +125,7 @@ return curr; } - public static class HashedFile + public static class HashedFile implements Comparable { protected File file; @@ -202,7 +202,7 @@ @Override public boolean equals(Object other) { - return other instanceof HashedFile + return other instanceof HashedFile && ((HashedFile)other).compareTo(this) == 0; } diff -r b7831cefbb62 -r c40729bfe06d artifacts-common/src/main/java/de/intevation/artifacts/common/utils/JSON.java --- a/artifacts-common/src/main/java/de/intevation/artifacts/common/utils/JSON.java Tue Jun 05 13:32:14 2012 +0000 +++ b/artifacts-common/src/main/java/de/intevation/artifacts/common/utils/JSON.java Sat Jun 23 08:20:02 2012 +0000 @@ -26,7 +26,7 @@ } public static final boolean isWhitespace(int c) { - return c == ' ' || c == '\n' || c == '\r' + return c == ' ' || c == '\n' || c == '\r' || c == '\t' || c == '\f'; } @@ -160,8 +160,8 @@ out.print(']'); } - public static Map parse(String in) - throws IOException + public static Map parse(String in) + throws IOException { return parse(asInputStream(in)); } @@ -178,14 +178,14 @@ return new ByteArrayInputStream(bytes); } - public static Map parse(InputStream in) - throws IOException + public static Map parse(InputStream in) + throws IOException { return parseObject(new PushbackInputStream(in, 1)); } - public static Map parse(PushbackInputStream in) - throws IOException + public static Map parse(PushbackInputStream in) + throws IOException { return parseObject(in); } @@ -266,7 +266,7 @@ private static final Boolean parseTrue(InputStream in) throws IOException - { + { match('t', eof(in)); match('r', eof(in)); match('u', eof(in)); @@ -276,7 +276,7 @@ private static final Boolean parseFalse(InputStream in) throws IOException - { + { match('f', eof(in)); match('a', eof(in)); match('l', eof(in)); @@ -287,7 +287,7 @@ private static final Object parseNull(InputStream in) throws IOException - { + { match('n', eof(in)); match('u', eof(in)); match('l', eof(in)); @@ -415,7 +415,7 @@ pairs.put(string, value); } - private static Map parseObject(PushbackInputStream in) + private static Map parseObject(PushbackInputStream in) throws IOException { Map pairs = new LinkedHashMap(); diff -r b7831cefbb62 -r c40729bfe06d artifacts-common/src/main/java/de/intevation/artifacts/common/utils/LRUCache.java --- a/artifacts-common/src/main/java/de/intevation/artifacts/common/utils/LRUCache.java Tue Jun 05 13:32:14 2012 +0000 +++ b/artifacts-common/src/main/java/de/intevation/artifacts/common/utils/LRUCache.java Sat Jun 23 08:20:02 2012 +0000 @@ -4,7 +4,7 @@ import java.util.LinkedHashMap; public class LRUCache -extends LinkedHashMap +extends LinkedHashMap { public static final int DEFAULT_MAX_CAPACITY = 25; diff -r b7831cefbb62 -r c40729bfe06d artifacts-common/src/main/java/de/intevation/artifacts/common/utils/StringUtils.java --- a/artifacts-common/src/main/java/de/intevation/artifacts/common/utils/StringUtils.java Tue Jun 05 13:32:14 2012 +0000 +++ b/artifacts-common/src/main/java/de/intevation/artifacts/common/utils/StringUtils.java Sat Jun 23 08:20:02 2012 +0000 @@ -115,7 +115,7 @@ } } return d; - } + } public static String join(String sep, String [] strings) { StringBuilder sb = new StringBuilder(); diff -r b7831cefbb62 -r c40729bfe06d artifacts-common/src/main/java/de/intevation/artifacts/common/utils/XSLTransformer.java --- a/artifacts-common/src/main/java/de/intevation/artifacts/common/utils/XSLTransformer.java Tue Jun 05 13:32:14 2012 +0000 +++ b/artifacts-common/src/main/java/de/intevation/artifacts/common/utils/XSLTransformer.java Sat Jun 23 08:20:02 2012 +0000 @@ -21,7 +21,7 @@ import org.w3c.dom.Node; -public class XSLTransformer { +public class XSLTransformer { private static Logger log = Logger.getLogger(XSLTransformer.class); diff -r b7831cefbb62 -r c40729bfe06d artifacts/src/main/java/de/intevation/artifacts/ArtifactNamespaceContext.java --- a/artifacts/src/main/java/de/intevation/artifacts/ArtifactNamespaceContext.java Tue Jun 05 13:32:14 2012 +0000 +++ b/artifacts/src/main/java/de/intevation/artifacts/ArtifactNamespaceContext.java Sat Jun 23 08:20:02 2012 +0000 @@ -86,7 +86,7 @@ */ @Override public String getPrefix(String uri) { - + if (uri == null) { throw new IllegalArgumentException("Null uri"); }