# HG changeset patch # User Sascha L. Teichmann # Date 1269597874 0 # Node ID b2e0cb83631c364f5be55fabea04f92245cc8615 # Parent 78263e9106756403acd5ea0f0074f6221ee3d440 Removed trailing whitespace artifacts/trunk@833 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 78263e910675 -r b2e0cb83631c ChangeLog --- a/ChangeLog Fri Mar 26 09:41:38 2010 +0000 +++ b/ChangeLog Fri Mar 26 10:04:34 2010 +0000 @@ -1,3 +1,17 @@ +2010-03-26 Sascha L. Teichmann + + * artifact-database/src/main/java/de/intevation/artifactdatabase/ProxyArtifact.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/Backend.java, + artifact-database/src/main/java/de/intevation/artifactdatabase/DefaultArtifactFactory.java, + artifact-database/src/main/java/de/intevation/artifactdatabase/rest/BaseResource.java, + artifact-database/src/main/java/de/intevation/artifactdatabase/rest/CreateResource.java, + artifacts/src/main/java/de/intevation/artifacts/CallContext.java, + artifacts/src/main/java/de/intevation/artifacts/Artifact.java: + Removed trailing whitespace: + find -name \*.java | xargs sed -i 's/[ \t]\+$//' + 2010-03-26 Sascha L. Teichmann * artifacts/src/main/java/de/intevation/artifacts/ArtifactDatabase.java, diff -r 78263e910675 -r b2e0cb83631c artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java Fri Mar 26 09:41:38 2010 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/ArtifactDatabaseImpl.java Fri Mar 26 10:04:34 2010 +0000 @@ -96,7 +96,7 @@ protected HashMap customValues; public CallContextImpl( - PersistentArtifact artifact, + PersistentArtifact artifact, int action, CallMeta callMeta ) { @@ -345,7 +345,7 @@ } public Document createArtifactWithFactory( - String factoryName, + String factoryName, CallMeta callMeta, Document data ) @@ -475,7 +475,7 @@ artifact, new Backend.ArtifactLoader() { public Object load( - ArtifactFactory factory, + ArtifactFactory factory, Long ttl, byte [] bytes, int id @@ -646,7 +646,7 @@ } public Document process( - String serviceName, + String serviceName, Document input, CallMeta callMeta ) diff -r 78263e910675 -r b2e0cb83631c artifact-database/src/main/java/de/intevation/artifactdatabase/Backend.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/Backend.java Fri Mar 26 09:41:38 2010 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/Backend.java Fri Mar 26 10:04:34 2010 +0000 @@ -156,7 +156,7 @@ public PersistentArtifact getArtifact(String identifer) { return (PersistentArtifact)loadArtifact( - identifer, + identifer, new ArtifactLoader() { public Object load( diff -r 78263e910675 -r b2e0cb83631c artifact-database/src/main/java/de/intevation/artifactdatabase/DefaultArtifact.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/DefaultArtifact.java Fri Mar 26 09:41:38 2010 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/DefaultArtifact.java Fri Mar 26 10:04:34 2010 +0000 @@ -81,7 +81,7 @@ } } - public void setup(String identifier, ArtifactFactory factory, + public void setup(String identifier, ArtifactFactory factory, Object context, Document data) { if (logger.isDebugEnabled()) { logger.debug("DefaultArtifact.setup: " + identifier); diff -r 78263e910675 -r b2e0cb83631c artifact-database/src/main/java/de/intevation/artifactdatabase/DefaultArtifactFactory.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/DefaultArtifactFactory.java Fri Mar 26 09:41:38 2010 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/DefaultArtifactFactory.java Fri Mar 26 10:04:34 2010 +0000 @@ -47,8 +47,8 @@ return description; } - public Artifact createArtifact(String identifier, - Object context, + public Artifact createArtifact(String identifier, + Object context, Document data) { try { diff -r 78263e910675 -r b2e0cb83631c artifact-database/src/main/java/de/intevation/artifactdatabase/ProxyArtifact.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/ProxyArtifact.java Fri Mar 26 09:41:38 2010 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/ProxyArtifact.java Fri Mar 26 10:04:34 2010 +0000 @@ -81,7 +81,7 @@ public Document feed(Document target, CallContext context) { try { - return proxied != null + return proxied != null ? proxied.feed(target, context) : super.feed(target, context); } diff -r 78263e910675 -r b2e0cb83631c artifact-database/src/main/java/de/intevation/artifactdatabase/rest/BaseResource.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/BaseResource.java Fri Mar 26 09:41:38 2010 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/BaseResource.java Fri Mar 26 10:04:34 2010 +0000 @@ -86,7 +86,7 @@ Preference p = iter.next(); String lang = p.getMetadata().getName(); float quality = p.getQuality(); - languages[index++] = new DefaultPreferredLocale(lang, quality); + languages[index++] = new DefaultPreferredLocale(lang, quality); } return new DefaultCallMeta(languages); diff -r 78263e910675 -r b2e0cb83631c artifact-database/src/main/java/de/intevation/artifactdatabase/rest/CreateResource.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/CreateResource.java Fri Mar 26 09:41:38 2010 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/CreateResource.java Fri Mar 26 10:04:34 2010 +0000 @@ -71,7 +71,7 @@ try { return new DomRepresentation( MediaType.APPLICATION_XML, - db.createArtifactWithFactory(factory, + db.createArtifactWithFactory(factory, getCallMeta(), inputDocument)); } diff -r 78263e910675 -r b2e0cb83631c artifacts/src/main/java/de/intevation/artifacts/Artifact.java --- a/artifacts/src/main/java/de/intevation/artifacts/Artifact.java Fri Mar 26 09:41:38 2010 +0000 +++ b/artifacts/src/main/java/de/intevation/artifacts/Artifact.java Fri Mar 26 10:04:34 2010 +0000 @@ -26,7 +26,7 @@ * * There are two more methods involved with the life cycle of the are: *
    - *
  1. {@link #setup(String, ArtifactFactory, Object, Document) setup()}: + *
  2. {@link #setup(String, ArtifactFactory, Object, Document) setup()}: * Called after created by the factory.
    3. *
  3. {@link #endOfLife(Object) endOfLife()}: Called when the artifact * is going to be removed from @@ -101,7 +101,7 @@ * @param identifier The identifier from artifact database * @param factory The factory which created this artifact. * @param context The global context of the runtime system. - * @param data The data which can be use to setup an artifact with + * @param data The data which can be use to setup an artifact with * more details. */ public void setup( diff -r 78263e910675 -r b2e0cb83631c artifacts/src/main/java/de/intevation/artifacts/CallContext.java --- a/artifacts/src/main/java/de/intevation/artifacts/CallContext.java Fri Mar 26 09:41:38 2010 +0000 +++ b/artifacts/src/main/java/de/intevation/artifacts/CallContext.java Fri Mar 26 10:04:34 2010 +0000 @@ -65,7 +65,7 @@ * @return The meta information of this call. */ CallMeta getMeta(); - + /** * Each call context has a clipboard. * getContextValue is used to fetch data from this board.