# HG changeset patch # User Sascha L. Teichmann # Date 1254387857 0 # Node ID 4ae4dc99127dd730ddc7c3d28447953e0d7babc6 # Parent f2648672c9c468521018587dc48011a9b3f306a1 Removed trailing whitespace. artifacts/trunk@167 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r f2648672c9c4 -r 4ae4dc99127d Changelog --- a/Changelog Thu Oct 01 08:51:24 2009 +0000 +++ b/Changelog Thu Oct 01 09:04:17 2009 +0000 @@ -1,3 +1,18 @@ +2009-10-01 Sascha L. Teichmann + + * artifact-database/src/main/java/de/intevation/artifactdatabase/SQL.java, + artifact-database/src/main/java/de/intevation/artifactdatabase/DefaultArtifact.java, + artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java, + artifact-database/src/main/java/de/intevation/artifactdatabase/XMLUtils.java, + artifact-database/src/main/java/de/intevation/artifactdatabase/Backend.java, + artifact-database/src/main/java/de/intevation/artifactdatabase/rest/BaseResource.java, + artifact-database/src/main/java/de/intevation/artifactdatabase/rest/FactoriesResource.java, + artifact-database/src/main/java/de/intevation/artifactdatabase/rest/Standalone.java, + artifact-database/src/main/java/de/intevation/artifactdatabase/DatabaseCleaner.java, + artifacts/src/main/java/de/intevation/artifacts/ArtifactNamespaceContext.java, + artifacts/src/main/java/de/intevation/artifacts/Artifact.java: + Removed trailing whitespace. + 2009-10-01 Sascha L. Teichmann * artifact-database/src/main/java/de/intevation/artifactdatabase/Backend.java: diff -r f2648672c9c4 -r 4ae4dc99127d artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java Thu Oct 01 08:51:24 2009 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java Thu Oct 01 09:04:17 2009 +0000 @@ -107,7 +107,7 @@ } public DeferredOutputImpl( - PersistentArtifact artifact, + PersistentArtifact artifact, Document format ) { this.artifact = artifact; @@ -228,7 +228,7 @@ } public Document createArtifactWithFactory(String factoryName) - throws ArtifactDatabaseException + throws ArtifactDatabaseException { ArtifactFactory factory = getArtifactFactory(factoryName); diff -r f2648672c9c4 -r 4ae4dc99127d artifact-database/src/main/java/de/intevation/artifactdatabase/Backend.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/Backend.java Thu Oct 01 08:51:24 2009 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/Backend.java Thu Oct 01 09:04:17 2009 +0000 @@ -56,7 +56,7 @@ private ArtifactSerializer serializer; public PersistentArtifact( - Artifact artifact, + Artifact artifact, ArtifactSerializer serializer, int id ) { @@ -113,7 +113,7 @@ Artifact artifact, ArtifactFactory factory, Long ttl - ) + ) throws Exception { return new PersistentArtifact( @@ -121,7 +121,7 @@ factory.getSerializer(), insertDatabase(artifact, factory, ttl)); } - + public PersistentArtifact getArtifact(String identifer) { try { @@ -198,7 +198,7 @@ catch (SQLException sqle) {} } if (connection != null) { - try { connection.close(); } + try { connection.close(); } catch (SQLException sqle) {} } } @@ -231,7 +231,7 @@ } protected int insertDatabase( - Artifact artifact, + Artifact artifact, ArtifactFactory factory, Long ttl ) { diff -r f2648672c9c4 -r 4ae4dc99127d artifact-database/src/main/java/de/intevation/artifactdatabase/DatabaseCleaner.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/DatabaseCleaner.java Thu Oct 01 08:51:24 2009 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/DatabaseCleaner.java Thu Oct 01 09:04:17 2009 +0000 @@ -88,8 +88,8 @@ return SLEEP_DEFAULT; } - private static final class IdData - extends Id + private static final class IdData + extends Id { byte [] data; String factoryName; @@ -139,7 +139,7 @@ while (result.next()) { ids.add(new IdData( - result.getInt(1), + result.getInt(1), result.getString(2), result.getBytes(3))); } diff -r f2648672c9c4 -r 4ae4dc99127d artifact-database/src/main/java/de/intevation/artifactdatabase/DefaultArtifact.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/DefaultArtifact.java Thu Oct 01 08:51:24 2009 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/DefaultArtifact.java Thu Oct 01 09:04:17 2009 +0000 @@ -18,7 +18,7 @@ implements Artifact { private static Logger logger = Logger.getLogger(DefaultArtifact.class); - + protected String identifier; public DefaultArtifact() { @@ -34,7 +34,7 @@ public String hash() { String hash = String.valueOf(hashCode()); if (logger.isDebugEnabled()) { - logger.debug("DefaultArtifact.hashCode: " + logger.debug("DefaultArtifact.hashCode: " + identifier + " (" + hash + ")"); } return hash; diff -r f2648672c9c4 -r 4ae4dc99127d artifact-database/src/main/java/de/intevation/artifactdatabase/SQL.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/SQL.java Thu Oct 01 08:51:24 2009 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/SQL.java Thu Oct 01 09:04:17 2009 +0000 @@ -34,7 +34,7 @@ InputStream in = null; try { - String res = "/sql/" + driver.replace('.', '-').toLowerCase() + String res = "/sql/" + driver.replace('.', '-').toLowerCase() + ".properties"; in = SQL.class.getResourceAsStream(res); diff -r f2648672c9c4 -r 4ae4dc99127d artifact-database/src/main/java/de/intevation/artifactdatabase/XMLUtils.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/XMLUtils.java Thu Oct 01 08:51:24 2009 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/XMLUtils.java Thu Oct 01 09:04:17 2009 +0000 @@ -108,7 +108,7 @@ } catch (XPathExpressionException xpee) { logger.error(xpee.getLocalizedMessage(), xpee); - } + } return null; } diff -r f2648672c9c4 -r 4ae4dc99127d artifact-database/src/main/java/de/intevation/artifactdatabase/rest/BaseResource.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/BaseResource.java Thu Oct 01 08:51:24 2009 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/BaseResource.java Thu Oct 01 09:04:17 2009 +0000 @@ -39,7 +39,7 @@ return super.post(requestRepr); } - protected Representation get() + protected Representation get() throws ResourceException { try { diff -r f2648672c9c4 -r 4ae4dc99127d artifact-database/src/main/java/de/intevation/artifactdatabase/rest/FactoriesResource.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/FactoriesResource.java Thu Oct 01 08:51:24 2009 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/FactoriesResource.java Thu Oct 01 09:04:17 2009 +0000 @@ -26,7 +26,7 @@ extends BaseResource { private static Logger logger = Logger.getLogger(FactoriesResource.class); - + public static final String PATH = "/factories"; protected Representation innerGet() diff -r f2648672c9c4 -r 4ae4dc99127d artifact-database/src/main/java/de/intevation/artifactdatabase/rest/Standalone.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/Standalone.java Thu Oct 01 08:51:24 2009 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/Standalone.java Thu Oct 01 09:04:17 2009 +0000 @@ -59,7 +59,7 @@ component.getDefaultHost().attach(app); - logger.info("Starting rest HTTP server on " + logger.info("Starting rest HTTP server on " + (listenString != null ? listenString : "*") + ":" + port); diff -r f2648672c9c4 -r 4ae4dc99127d artifacts/src/main/java/de/intevation/artifacts/Artifact.java --- a/artifacts/src/main/java/de/intevation/artifacts/Artifact.java Thu Oct 01 08:51:24 2009 +0000 +++ b/artifacts/src/main/java/de/intevation/artifacts/Artifact.java Thu Oct 01 09:04:17 2009 +0000 @@ -26,7 +26,7 @@ * * There are two more methods involved with the life cycle of the are: *
    - *
  1. {@link #setup(String, ArtifactFactory, Object) setup()}: Called after created by the + *
  2. {@link #setup(String, ArtifactFactory, Object) setup()}: Called after created by the * factory.
    3. *
  3. {@link #endOfLife(Object) endOfLife()}: Called when the artifact * is going to be removed from @@ -81,7 +81,7 @@ */ void out( Document format, - OutputStream out, + OutputStream out, CallContext context) throws IOException; @@ -93,7 +93,7 @@ * @param context The global context of the runtime system. */ public void setup( - String identifier, + String identifier, ArtifactFactory factory, Object context); diff -r f2648672c9c4 -r 4ae4dc99127d artifacts/src/main/java/de/intevation/artifacts/ArtifactNamespaceContext.java --- a/artifacts/src/main/java/de/intevation/artifacts/ArtifactNamespaceContext.java Thu Oct 01 08:51:24 2009 +0000 +++ b/artifacts/src/main/java/de/intevation/artifacts/ArtifactNamespaceContext.java Thu Oct 01 09:04:17 2009 +0000 @@ -16,7 +16,7 @@ * The URI of the namespace of the artifacts. */ public final static String NAMESPACE_URI = "http://www.intevation.de/2009/artifacts"; - + /** * The XML prefix for the artifacts namespace. */