svn commit: r944127 - in /shindig/trunk/java: common/src/test/java/org/apache/shindig/protocol/ gadgets/src/main/java/org/apache/shindig/gadgets/http/ gadgets/src/main/java/org/apache/shindig/gadgets/parse/ gadgets/src/main/java/org/apache/shindig/gadg...

[lindner]

Author: lindner
Date: Fri May 14 05:57:23 2010
New Revision: 944127

URL: http://svn.apache.org/viewvc?rev=944127&view=rev
Log:
use contains() instead

Modified:
    
shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java
    
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java
    
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/CompactHtmlSerializer.java
    
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java

Modified: 
shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java?rev=944127&r1=944126&r2=944127&view=diff
==============================================================================
--- 
shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java
 (original)
+++ 
shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java
 Fri May 14 05:57:23 2010
@@ -292,7 +292,7 @@ public class JsonRpcServletTest extends 
     mockControl.verify();
 
     String output = getOutput();
-    assertTrue(-1 != output.indexOf("Unsupported Content-Type 
application/octet-stream"));
+    assertTrue(output.contains("Unsupported Content-Type 
application/octet-stream"));
   }
 
   @Test

Modified: 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java?rev=944127&r1=944126&r2=944127&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java
 Fri May 14 05:57:23 2010
@@ -94,7 +94,7 @@ public class HttpResponseBuilder extends
       // Remove previously set charset:
       String[] parts = StringUtils.split(contentType, ';');
       for (String part : parts) {
-        if (part.indexOf("charset=") < 0) {
+        if (!part.contains("charset=")) {
           newContentType += part + "; ";
         }
       }

Modified: 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/CompactHtmlSerializer.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/CompactHtmlSerializer.java?rev=944127&r1=944126&r2=944127&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/CompactHtmlSerializer.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/CompactHtmlSerializer.java
 Fri May 14 05:57:23 2010
@@ -67,7 +67,7 @@ public class CompactHtmlSerializer exten
    */
   private boolean isIeConditionalComment(Node n) {
     String comment = n.getTextContent();
-    return comment.indexOf("[if ") != -1 && comment.indexOf("[endif]") != -1;
+    return comment.contains("[if ") && comment.contains("[endif]");
   }
 
   /**

Modified: 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java?rev=944127&r1=944126&r2=944127&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
 Fri May 14 05:57:23 2010
@@ -340,7 +340,7 @@ public class ContentRewriterFeature {
         // "*" is handled by ALL
         String urllc = url.toLowerCase();
         for (String substr : bundle.matches) {
-          if (urllc.indexOf(substr) >= 0)
+          if (urllc.contains(substr))
             return true;
         }
         return false;