svn commit: r992481 - in /incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c: IW3CXMLConfiguration.java impl/WidgetManifestModel.java

[scottbw]

Author: scottbw
Date: Fri Sep  3 21:26:27 2010
New Revision: 992481

URL: http://svn.apache.org/viewvc?rev=992481&view=rev
Log:
Fixed a conformance problem with the ViewModes implementation - I've updated 
the list of supported modes to be in tune with the latest spec at 
http://www.w3.org/TR/view-mode/ and put some checking in WidgetManifestModel to 
ensure unsupported modes aren't simply copied over when processing the manifest 
file.

Modified:
    
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IW3CXMLConfiguration.java
    
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/WidgetManifestModel.java

Modified: 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IW3CXMLConfiguration.java
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IW3CXMLConfiguration.java?rev=992481&r1=992480&r2=992481&view=diff
==============================================================================
--- 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IW3CXMLConfiguration.java
 (original)
+++ 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IW3CXMLConfiguration.java
 Fri Sep  3 21:26:27 2010
@@ -24,7 +24,7 @@ public interface IW3CXMLConfiguration {
                public static final String VERSION_ATTRIBUTE = "version"; // 
widget
                public static final String MODE_ATTRIBUTE = "viewmodes"; 
//widget
                // Values of widget view modes
-               public static final String[] VIEWMODES = {"application", 
"floating", "fullscreen", "mini", "all"};
+               public static final String[] VIEWMODES = {"windowed", 
"floating", "fullscreen", "maximized", "minimized", "all"};
                public static final String DEFAULT_VIEWMODE = "floating";
                
        public static final String NAME_ELEMENT = "name"; // widget[0..*]

Modified: 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/WidgetManifestModel.java
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/WidgetManifestModel.java?rev=992481&r1=992480&r2=992481&view=diff
==============================================================================
--- 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/WidgetManifestModel.java
 (original)
+++ 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/WidgetManifestModel.java
 Fri Sep  3 21:26:27 2010
@@ -17,6 +17,7 @@ package org.apache.wookie.w3c.impl;
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.apache.commons.compress.archivers.zip.ZipFile;
@@ -282,6 +283,12 @@ public class WidgetManifestModel impleme
                        fViewModes = IW3CXMLConfiguration.DEFAULT_VIEWMODE;
                } else {
                        fViewModes = UnicodeUtils.normalizeSpaces(fViewModes);
+                       String modes = "";
+                       // remove any unsupported modes
+                       for (String mode:fViewModes.split(" ")){
+                               if 
(Arrays.asList(IW3CXMLConfiguration.VIEWMODES).contains(mode)) modes = modes + 
mode +" ";
+                       }
+                       fViewModes = modes.trim();
                }
                // xml:lang optional
                fLang = 
element.getAttributeValue(IW3CXMLConfiguration.LANG_ATTRIBUTE, 
Namespace.XML_NAMESPACE);