svn commit: r749442 - in /incubator/shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/ main/java/org/apache/shindig/gadgets/spec/ test/java/org/apache/shindig/gadgets/spec/

[lryan]

Author: lryan
Date: Mon Mar  2 21:35:44 2009
New Revision: 749442

URL: http://svn.apache.org/viewvc?rev=749442&view=rev
Log:
Only user x-html-sanitized for the external name of the new sanitized view 
type. Use HTML_SANITIZED as the internal enum name. No need for them to match.

Modified:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultUrlGenerator.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/View.java
    
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultUrlGenerator.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultUrlGenerator.java?rev=749442&r1=749441&r2=749442&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultUrlGenerator.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultUrlGenerator.java
 Mon Mar  2 21:35:44 2009
@@ -121,7 +121,7 @@
         uri = new UriBuilder(view.getHref());
         break;
       case HTML:
-      case X_HTML_SANITIZED:
+      case HTML_SANITIZED:
       default:
         Uri iframeBaseUri = iframeBaseUris.get(context.getContainer());
         uri = iframeBaseUri != null ? new UriBuilder(iframeBaseUri) : new 
UriBuilder();

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java?rev=749442&r1=749441&r2=749442&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
 Mon Mar  2 21:35:44 2009
@@ -139,7 +139,7 @@
    */
   public boolean sanitizeOutput() {
     return (getCurrentView() != null &&
-        getCurrentView().getType() == View.ContentType.X_HTML_SANITIZED) ||
+        getCurrentView().getType() == View.ContentType.HTML_SANITIZED) ||
         
"1".equals(getContext().getParameter(ProxyBase.SANITIZE_CONTENT_PARAM));
   }
 }
\ No newline at end of file

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/View.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/View.java?rev=749442&r1=749441&r2=749442&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/View.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/View.java
 Mon Mar  2 21:35:44 2009
@@ -332,7 +332,7 @@
    * Possible values for Content/@type
    */
   public enum ContentType {
-    HTML("html"), URL("url"), X_HTML_SANITIZED("x-html-sanitized");
+    HTML("html"), URL("url"), HTML_SANITIZED("x-html-sanitized");
 
     private String viewName;
 

Modified: 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java?rev=749442&r1=749441&r2=749442&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java
 Mon Mar  2 21:35:44 2009
@@ -90,7 +90,7 @@
                  " quirks=\"false\"><![CDATA[blah]]></Content>";
     View view = new View("default", Arrays.asList(XmlUtil.parse(xml)), 
SPEC_URL);
 
-    assertEquals(View.ContentType.X_HTML_SANITIZED, view.getType());
+    assertEquals(View.ContentType.HTML_SANITIZED, view.getType());
     assertEquals(contentType, view.getRawType());
   }