Please! On 08.05.2013 11:17, [email protected] wrote: > Updated Branches: > refs/heads/master 89113d890 -> 9e8cc984e > > > folks, fix your IDEs! we want to be 1.5 compatible. that means no @Override > on interface implementations! > > > Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo > Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/9e8cc984 > Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/9e8cc984 > Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/9e8cc984 > > Branch: refs/heads/master > Commit: 9e8cc984e6b2a3fffd260aec96269556951c77df > Parents: 89113d8 > Author: Ulrich Staerk <[email protected]> > Authored: Wed May 8 11:16:48 2013 +0200 > Committer: Ulrich Staerk <[email protected]> > Committed: Wed May 8 11:16:48 2013 +0200 > > ---------------------------------------------------------------------- > .../internal/services/AbstractAssetFactory.java | 6 +-- > .../internal/services/AssetDispatcher.java | 23 +++++++++------ > .../internal/services/ClasspathAssetFactory.java | 1 - > .../services/ResponseCompressionAnalyzerImpl.java | 5 +-- > .../assets/AssetChecksumGeneratorImpl.java | 11 +++---- > .../assets/JavaScriptStackAssemblerImpl.java | 23 ++++++++------ > .../javascript/ModuleAssetRequestHandler.java | 9 ++--- > .../tapestry5/internal/test/PageTesterModule.java | 8 +++-- > .../internal/util/RecomputableSupport.java | 2 - > .../tapestry5/internal/mongodb/MongoDBImpl.java | 7 ++-- > .../internal/mongodb/MongoDBSourceImpl.java | 13 +++++--- > .../tapestry5/mongodb/modules/MongodbModule.java | 7 ++-- > 12 files changed, 59 insertions(+), 56 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9e8cc984/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractAssetFactory.java > ---------------------------------------------------------------------- > diff --git > a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractAssetFactory.java > > b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractAssetFactory.java > index a75e3b9..8d76ad5 100644 > --- > a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractAssetFactory.java > +++ > b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractAssetFactory.java > @@ -14,6 +14,8 @@ > > package org.apache.tapestry5.internal.services; > > +import java.io.IOException; > + > import org.apache.tapestry5.Asset; > import org.apache.tapestry5.internal.services.assets.ResourceChangeTracker; > import org.apache.tapestry5.ioc.Resource; > @@ -26,8 +28,6 @@ import > org.apache.tapestry5.services.assets.StreamableResource; > import org.apache.tapestry5.services.assets.StreamableResourceProcessing; > import org.apache.tapestry5.services.assets.StreamableResourceSource; > > -import java.io.IOException; > - > public abstract class AbstractAssetFactory implements AssetFactory > { > private final AssetPathConstructor assetPathConstructor; > @@ -74,7 +74,6 @@ public abstract class AbstractAssetFactory implements > AssetFactory > > return new AbstractAsset(false) > { > - @Override > public String toClientURL() > { > // TODO: Some caching to ensure this is fast! Fortunately, > the SRS pipeline includes caching already, > @@ -99,7 +98,6 @@ public abstract class AbstractAssetFactory implements > AssetFactory > } > } > > - @Override > public Resource getResource() > { > return resource; > > http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9e8cc984/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetDispatcher.java > ---------------------------------------------------------------------- > diff --git > a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetDispatcher.java > > b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetDispatcher.java > index 526c9d5..859680d 100644 > --- > a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetDispatcher.java > +++ > b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetDispatcher.java > @@ -14,22 +14,28 @@ > > package org.apache.tapestry5.internal.services; > > +import java.io.IOException; > +import java.util.Collections; > +import java.util.Comparator; > +import java.util.List; > +import java.util.Map; > + > +import javax.servlet.http.HttpServletResponse; > + > import org.apache.tapestry5.SymbolConstants; > import org.apache.tapestry5.TapestryConstants; > import org.apache.tapestry5.ioc.annotations.Marker; > import org.apache.tapestry5.ioc.annotations.Symbol; > import org.apache.tapestry5.ioc.annotations.UsesMappedConfiguration; > import org.apache.tapestry5.ioc.internal.util.CollectionFactory; > -import org.apache.tapestry5.services.*; > +import org.apache.tapestry5.services.AssetRequestDispatcher; > +import org.apache.tapestry5.services.ClasspathAssetAliasManager; > +import org.apache.tapestry5.services.Dispatcher; > +import org.apache.tapestry5.services.PathConstructor; > +import org.apache.tapestry5.services.Request; > +import org.apache.tapestry5.services.Response; > import org.apache.tapestry5.services.assets.AssetRequestHandler; > > -import javax.servlet.http.HttpServletResponse; > -import java.io.IOException; > -import java.util.Collections; > -import java.util.Comparator; > -import java.util.List; > -import java.util.Map; > - > /** > * Recognizes requests where the path begins with "/asset/" (actually, as > defined by the > * {@link SymbolConstants#ASSET_PATH_PREFIX} symbol), and delivers the > content therein as a bytestream. Also > @@ -60,7 +66,6 @@ public class AssetDispatcher implements Dispatcher > { > return new AssetRequestHandler() > { > - @Override > public boolean handleAssetRequest(Request request, Response > response, String extraPath) throws IOException > { > request.setAttribute(TapestryConstants.COMPRESS_CONTENT, > compress); > > http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9e8cc984/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetFactory.java > ---------------------------------------------------------------------- > diff --git > a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetFactory.java > > b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetFactory.java > index 1b34fd6..21cd9e4 100644 > --- > a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetFactory.java > +++ > b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetFactory.java > @@ -48,7 +48,6 @@ public class ClasspathAssetFactory extends > AbstractAssetFactory > this.aliasManager = aliasManager; > } > > - @Override > public Asset createAsset(Resource resource) > { > AssetAlias alias = aliasManager.extractAssetAlias(resource); > > http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9e8cc984/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseCompressionAnalyzerImpl.java > ---------------------------------------------------------------------- > diff --git > a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseCompressionAnalyzerImpl.java > > b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseCompressionAnalyzerImpl.java > index 7bea13c..c616318 100644 > --- > a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseCompressionAnalyzerImpl.java > +++ > b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseCompressionAnalyzerImpl.java > @@ -14,14 +14,14 @@ > > package org.apache.tapestry5.internal.services; > > +import javax.servlet.http.HttpServletRequest; > + > import org.apache.tapestry5.SymbolConstants; > import org.apache.tapestry5.internal.TapestryInternalUtils; > import org.apache.tapestry5.ioc.annotations.Symbol; > import org.apache.tapestry5.services.ResponseCompressionAnalyzer; > import org.apache.tapestry5.services.assets.CompressionAnalyzer; > > -import javax.servlet.http.HttpServletRequest; > - > public class ResponseCompressionAnalyzerImpl implements > ResponseCompressionAnalyzer > { > private final HttpServletRequest request; > @@ -70,7 +70,6 @@ public class ResponseCompressionAnalyzerImpl implements > ResponseCompressionAnaly > return false; > } > > - @Override > public boolean isGZipEnabled(String contentType) > { > return isGZipSupported() && > compressionAnalyzer.isCompressable(contentType); > > http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9e8cc984/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/AssetChecksumGeneratorImpl.java > ---------------------------------------------------------------------- > diff --git > a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/AssetChecksumGeneratorImpl.java > > b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/AssetChecksumGeneratorImpl.java > index 65da704..db8776e 100644 > --- > a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/AssetChecksumGeneratorImpl.java > +++ > b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/AssetChecksumGeneratorImpl.java > @@ -14,6 +14,11 @@ > > package org.apache.tapestry5.internal.services.assets; > > +import java.io.IOException; > +import java.io.InputStream; > +import java.util.Map; > +import java.util.zip.Adler32; > + > import org.apache.tapestry5.ioc.Resource; > import org.apache.tapestry5.ioc.internal.util.CollectionFactory; > import org.apache.tapestry5.services.assets.AssetChecksumGenerator; > @@ -21,11 +26,6 @@ import > org.apache.tapestry5.services.assets.StreamableResource; > import org.apache.tapestry5.services.assets.StreamableResourceProcessing; > import org.apache.tapestry5.services.assets.StreamableResourceSource; > > -import java.io.IOException; > -import java.io.InputStream; > -import java.util.Map; > -import java.util.zip.Adler32; > - > public class AssetChecksumGeneratorImpl implements AssetChecksumGenerator > { > > @@ -51,7 +51,6 @@ public class AssetChecksumGeneratorImpl implements > AssetChecksumGenerator > return generateChecksum(streamable); > } > > - @Override > public String generateChecksum(StreamableResource resource) throws > IOException > { > String result = cache.get(resource); > > http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9e8cc984/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/JavaScriptStackAssemblerImpl.java > ---------------------------------------------------------------------- > diff --git > a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/JavaScriptStackAssemblerImpl.java > > b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/JavaScriptStackAssemblerImpl.java > index ece7533..b52ab09 100644 > --- > a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/JavaScriptStackAssemblerImpl.java > +++ > b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/JavaScriptStackAssemblerImpl.java > @@ -14,15 +14,6 @@ > > package org.apache.tapestry5.internal.services.assets; > > -import org.apache.tapestry5.Asset; > -import org.apache.tapestry5.ioc.Resource; > -import org.apache.tapestry5.ioc.internal.util.CollectionFactory; > -import org.apache.tapestry5.ioc.services.ThreadLocale; > -import org.apache.tapestry5.json.JSONArray; > -import org.apache.tapestry5.services.assets.*; > -import org.apache.tapestry5.services.javascript.JavaScriptStack; > -import org.apache.tapestry5.services.javascript.JavaScriptStackSource; > - > import java.io.ByteArrayOutputStream; > import java.io.IOException; > import java.io.OutputStreamWriter; > @@ -31,6 +22,19 @@ import java.util.List; > import java.util.Locale; > import java.util.Map; > > +import org.apache.tapestry5.Asset; > +import org.apache.tapestry5.ioc.Resource; > +import org.apache.tapestry5.ioc.internal.util.CollectionFactory; > +import org.apache.tapestry5.ioc.services.ThreadLocale; > +import org.apache.tapestry5.json.JSONArray; > +import org.apache.tapestry5.services.assets.AssetChecksumGenerator; > +import org.apache.tapestry5.services.assets.CompressionStatus; > +import org.apache.tapestry5.services.assets.StreamableResource; > +import org.apache.tapestry5.services.assets.StreamableResourceProcessing; > +import org.apache.tapestry5.services.assets.StreamableResourceSource; > +import org.apache.tapestry5.services.javascript.JavaScriptStack; > +import org.apache.tapestry5.services.javascript.JavaScriptStackSource; > + > public class JavaScriptStackAssemblerImpl implements JavaScriptStackAssembler > { > private static final String JAVASCRIPT_CONTENT_TYPE = "text/javascript"; > @@ -61,7 +65,6 @@ public class JavaScriptStackAssemblerImpl implements > JavaScriptStackAssembler > resourceChangeTracker.clearOnInvalidation(cache); > } > > - @Override > public StreamableResource assembleJavaScriptResourceForStack(String > stackName, boolean compress) throws IOException > { > Locale locale = threadLocale.getLocale(); > > http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9e8cc984/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleAssetRequestHandler.java > ---------------------------------------------------------------------- > diff --git > a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleAssetRequestHandler.java > > b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleAssetRequestHandler.java > index d809556..49d366b 100644 > --- > a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleAssetRequestHandler.java > +++ > b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleAssetRequestHandler.java > @@ -14,6 +14,10 @@ > > package org.apache.tapestry5.internal.services.javascript; > > +import java.io.IOException; > +import java.util.EnumSet; > +import java.util.Set; > + > import org.apache.tapestry5.internal.services.AssetDispatcher; > import org.apache.tapestry5.internal.services.ResourceStreamer; > import org.apache.tapestry5.ioc.IOOperation; > @@ -24,10 +28,6 @@ import org.apache.tapestry5.services.Response; > import org.apache.tapestry5.services.assets.AssetRequestHandler; > import org.apache.tapestry5.services.javascript.ModuleManager; > > -import java.io.IOException; > -import java.util.EnumSet; > -import java.util.Set; > - > /** > * Handler contributed to {@link AssetDispatcher} with key "modules". It > interprets the extra path as a module name, > * and searches for the corresponding JavaScript module. Unlike normal > assets, modules do not include any kind of checksum > @@ -54,7 +54,6 @@ public class ModuleAssetRequestHandler implements > AssetRequestHandler > this.tracker = tracker; > } > > - @Override > public boolean handleAssetRequest(Request request, Response response, > String extraPath) throws IOException > { > // Ensure request ends with '.js'. That's the extension tacked on > by RequireJS because it expects there > > http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9e8cc984/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterModule.java > ---------------------------------------------------------------------- > diff --git > a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterModule.java > > b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterModule.java > index 656187e..a3c8e54 100644 > --- > a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterModule.java > +++ > b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterModule.java > @@ -23,7 +23,11 @@ import org.apache.tapestry5.ioc.ServiceBinder; > import org.apache.tapestry5.ioc.annotations.Contribute; > import org.apache.tapestry5.ioc.annotations.Local; > import org.apache.tapestry5.ioc.services.ServiceOverride; > -import org.apache.tapestry5.services.*; > +import org.apache.tapestry5.services.MarkupRendererFilter; > +import org.apache.tapestry5.services.Request; > +import org.apache.tapestry5.services.RequestFilter; > +import org.apache.tapestry5.services.Response; > +import org.apache.tapestry5.services.ResponseCompressionAnalyzer; > import org.apache.tapestry5.services.assets.CompressionAnalyzer; > import org.apache.tapestry5.test.PageTester; > > @@ -62,13 +66,11 @@ public class PageTesterModule > // on. > configuration.add(ResponseCompressionAnalyzer.class, new > ResponseCompressionAnalyzer() > { > - @Override > public boolean isGZipEnabled(String contentType) > { > return locator.getObject(CompressionAnalyzer.class, > null).isCompressable(contentType); > } > > - @Override > public boolean isGZipSupported() > { > return true; > > http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9e8cc984/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/RecomputableSupport.java > ---------------------------------------------------------------------- > diff --git > a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/RecomputableSupport.java > > b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/RecomputableSupport.java > index 4110a2b..e1f01d2 100644 > --- > a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/RecomputableSupport.java > +++ > b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/RecomputableSupport.java > @@ -42,7 +42,6 @@ public class RecomputableSupport > { > hub.addInvalidationCallback(new Runnable() > { > - @Override > public void run() > { > invalidate(); > @@ -68,7 +67,6 @@ public class RecomputableSupport > > private volatile T cachedResult; > > - @Override > public T invoke() > { > // Has the master version changed since the computation was > last executed? > > http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9e8cc984/tapestry-mongodb/src/main/java/org/apache/tapestry5/internal/mongodb/MongoDBImpl.java > ---------------------------------------------------------------------- > diff --git > a/tapestry-mongodb/src/main/java/org/apache/tapestry5/internal/mongodb/MongoDBImpl.java > > b/tapestry-mongodb/src/main/java/org/apache/tapestry5/internal/mongodb/MongoDBImpl.java > index f4e709a..b922df0 100644 > --- > a/tapestry-mongodb/src/main/java/org/apache/tapestry5/internal/mongodb/MongoDBImpl.java > +++ > b/tapestry-mongodb/src/main/java/org/apache/tapestry5/internal/mongodb/MongoDBImpl.java > @@ -1,12 +1,13 @@ > package org.apache.tapestry5.internal.mongodb; > > -import com.mongodb.DB; > -import com.mongodb.Mongo; > import org.apache.tapestry5.ioc.services.ThreadCleanupListener; > import org.apache.tapestry5.mongodb.MongoDB; > import org.apache.tapestry5.mongodb.MongoDBSource; > import org.slf4j.Logger; > > +import com.mongodb.DB; > +import com.mongodb.Mongo; > + > /** > * Default implementation for {@link org.apache.tapestry5.mongodb.MongoDB} > */ > @@ -42,13 +43,11 @@ public class MongoDBImpl implements MongoDB, > ThreadCleanupListener > this.dbPassword = dbPassword; > } > > - @Override > public DB getDefaultMongoDb() > { > return buildDbSession(defaultDbName); > } > > - @Override > public DB getMongoDb(String dbname) > { > return buildDbSession(dbname); > > http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9e8cc984/tapestry-mongodb/src/main/java/org/apache/tapestry5/internal/mongodb/MongoDBSourceImpl.java > ---------------------------------------------------------------------- > diff --git > a/tapestry-mongodb/src/main/java/org/apache/tapestry5/internal/mongodb/MongoDBSourceImpl.java > > b/tapestry-mongodb/src/main/java/org/apache/tapestry5/internal/mongodb/MongoDBSourceImpl.java > index 16f6c07..94dd3e9 100644 > --- > a/tapestry-mongodb/src/main/java/org/apache/tapestry5/internal/mongodb/MongoDBSourceImpl.java > +++ > b/tapestry-mongodb/src/main/java/org/apache/tapestry5/internal/mongodb/MongoDBSourceImpl.java > @@ -1,13 +1,18 @@ > package org.apache.tapestry5.internal.mongodb; > > -import com.mongodb.*; > +import java.net.UnknownHostException; > +import java.util.List; > + > import org.apache.tapestry5.ioc.annotations.Symbol; > import org.apache.tapestry5.mongodb.MongoDBSource; > import org.apache.tapestry5.mongodb.MongoDBSymbols; > import org.slf4j.Logger; > > -import java.net.UnknownHostException; > -import java.util.List; > +import com.mongodb.MongoClient; > +import com.mongodb.MongoClientOptions; > +import com.mongodb.ReadPreference; > +import com.mongodb.ServerAddress; > +import com.mongodb.WriteConcern; > > /** > * Default implementation for {@link > org.apache.tapestry5.mongodb.MongoDBSource} > @@ -49,8 +54,6 @@ public class MongoDBSourceImpl implements MongoDBSource > } > } > > - > - @Override > public MongoClient getMongo() > { > return this.mongoClient; > > http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9e8cc984/tapestry-mongodb/src/main/java/org/apache/tapestry5/mongodb/modules/MongodbModule.java > ---------------------------------------------------------------------- > diff --git > a/tapestry-mongodb/src/main/java/org/apache/tapestry5/mongodb/modules/MongodbModule.java > > b/tapestry-mongodb/src/main/java/org/apache/tapestry5/mongodb/modules/MongodbModule.java > index 70d3004..73c14b9 100644 > --- > a/tapestry-mongodb/src/main/java/org/apache/tapestry5/mongodb/modules/MongodbModule.java > +++ > b/tapestry-mongodb/src/main/java/org/apache/tapestry5/mongodb/modules/MongodbModule.java > @@ -1,7 +1,5 @@ > package org.apache.tapestry5.mongodb.modules; > > -import com.mongodb.ReadPreference; > -import com.mongodb.WriteConcern; > import org.apache.tapestry5.internal.mongodb.MongoDBImpl; > import org.apache.tapestry5.internal.mongodb.MongoDBSourceImpl; > import org.apache.tapestry5.ioc.Configuration; > @@ -18,6 +16,9 @@ import org.apache.tapestry5.mongodb.MongoDBSource; > import org.apache.tapestry5.mongodb.MongoDBSymbols; > import org.slf4j.Logger; > > +import com.mongodb.ReadPreference; > +import com.mongodb.WriteConcern; > + > /** > * Defines services which are responsible for MongoDB initializations and > connections. > */ > @@ -69,7 +70,6 @@ public class MongodbModule > { > configuration.add(new CoercionTuple(String.class, WriteConcern.class, > new Coercion<String, WriteConcern>() { > - @Override > public WriteConcern coerce(String input) > { > if (input.equalsIgnoreCase("FSYNC_SAFE")) > @@ -109,7 +109,6 @@ public class MongodbModule > )); > > configuration.add(new CoercionTuple(String.class, > ReadPreference.class, new Coercion<String, ReadPreference>() { > - @Override > public ReadPreference coerce(String input) > { > if (input.equalsIgnoreCase("SECONDARY")) >
--------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
