On Thu, Nov 20, 2008 at 7:25 PM, <[EMAIL PROTECTED]> wrote: > Author: etnu > Date: Thu Nov 20 19:25:06 2008 > New Revision: 719461 > > URL: http://svn.apache.org/viewvc?rev=719461&view=rev > Log: > Removed useless null check. Only @Optional bindings can ever be null in > Guice-provided objects.
FYI: when we upgrade to Guice 2.0 (there's a filed issue already), binding sites marked with any runtime @Nullable annotation can be bound to null. That doesn't affect this change, of course. > > > Modified: > > > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/HTMLContentRewriter.java > > Modified: > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/HTMLContentRewriter.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/HTMLContentRewriter.java?rev=719461&r1=719460&r2=719461&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/HTMLContentRewriter.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/HTMLContentRewriter.java > Thu Nov 20 19:25:06 2008 > @@ -60,11 +60,10 @@ > */ > public class HTMLContentRewriter implements ContentRewriter { > private final static int MAX_URL_LENGTH = 1500; > - private static final String DEFAULT_CONCAT_URL_BASE = > "/gadgets/concat?"; > > public final static Set<String> TAGS = > Sets.newHashSet("img", "embed", "link", "script", "style"); > - > + > private final static Map<String, Set<String>> LINKING_TAG_ATTRS = > Maps.newHashMap(); > > static { > @@ -81,11 +80,7 @@ > @Named("shindig.content-rewrite.proxy-url")String proxyBaseNoGadget, > @Named("shindig.content-rewrite.concat-url")String > concatBaseNoGadget) { > this.rewriterFeatureFactory = rewriterFeatureFactory; > - if (concatBaseNoGadget != null) { > - this.concatBaseNoGadget = concatBaseNoGadget; > - } else { > - this.concatBaseNoGadget = DEFAULT_CONCAT_URL_BASE; > - } > + this.concatBaseNoGadget = concatBaseNoGadget; > this.proxyBaseNoGadget = proxyBaseNoGadget; > } > > > >
