You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by jo...@apache.org on 2011/01/26 02:58:50 UTC

svn commit: r1063564 - /shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java

Author: johnh
Date: Wed Jan 26 01:58:49 2011
New Revision: 1063564

URL: http://svn.apache.org/viewvc?rev=1063564&view=rev
Log:
Small simplification in JsUriManager initializing libs collections.


Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java?rev=1063564&r1=1063563&r2=1063564&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java Wed Jan 26 01:58:49 2011
@@ -50,7 +50,7 @@ public interface JsUriManager {
   JsUri processExternJsUri(Uri uri) throws GadgetException;
 
   public static class JsUri extends ProxyUriBase {
-    private final static Collection<String> EMPTY_COLL = ImmutableList.<String>of();
+    private final static Collection<String> EMPTY_COLL = ImmutableList.of();
     private final Collection<String> libs;
     private final Collection<String> loadedLibs;
     private final String onload;
@@ -69,8 +69,8 @@ public interface JsUriManager {
         this.jsload = false;
         this.onload = null;
       }
-      this.libs = libs;
-      this.loadedLibs = have;
+      this.libs = nonNullLibs(libs);
+      this.loadedLibs = nonNullLibs(have);
     }
 
     public JsUri(UriStatus status) {
@@ -107,11 +107,11 @@ public interface JsUriManager {
     }
 
     public Collection<String> getLibs() {
-      return nonNullLibs(libs);
+      return libs;
     }
     
     public Collection<String> getLoadedLibs() {
-      return nonNullLibs(loadedLibs);
+      return loadedLibs;
     }
     
     private Collection<String> nonNullLibs(Collection<String> in) {