You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by jw...@apache.org on 2013/04/03 00:53:05 UTC

svn commit: r1463784 - in /myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/parse: SkinAdditionNodeParser.java SkinNodeParser.java

Author: jwaldman
Date: Tue Apr  2 22:53:04 2013
New Revision: 1463784

URL: http://svn.apache.org/r1463784
Log:
TRINIDAD-2350 Add support for metadata tag in trinidad-skins schema for skin and skin-addition
thanks to Prakash Udupa for patch

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/parse/SkinAdditionNodeParser.java
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/parse/SkinNodeParser.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/parse/SkinAdditionNodeParser.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/parse/SkinAdditionNodeParser.java?rev=1463784&r1=1463783&r2=1463784&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/parse/SkinAdditionNodeParser.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/parse/SkinAdditionNodeParser.java Tue Apr  2 22:53:04 2013
@@ -18,16 +18,14 @@
  */
 package org.apache.myfaces.trinidadinternal.skin.parse;
 
-import java.util.Map;
-
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
-import org.apache.myfaces.trinidadinternal.share.xml.StringParser;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
 import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
 import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
 import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
+import org.apache.myfaces.trinidadinternal.share.xml.StringParser;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
 
 /**
  * NodeParser for <skin-addition> node in trinidad-skins.xml
@@ -101,6 +99,12 @@ public class SkinAdditionNodeParser exte
     {
       return context.getParser(SkinFeaturesNode.class, namespaceURI, localName);
     }
+    // <metadata/> and its child elements are not for runtime purpose, so, the parser should ignore.
+    else if ("metadata".equals(localName))
+    {
+      return BaseNodeParser.getIgnoreParser();
+    }
+
     return null;
   }
 

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/parse/SkinNodeParser.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/parse/SkinNodeParser.java?rev=1463784&r1=1463783&r2=1463784&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/parse/SkinNodeParser.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/parse/SkinNodeParser.java Tue Apr  2 22:53:04 2013
@@ -19,13 +19,13 @@
 package org.apache.myfaces.trinidadinternal.skin.parse;
 
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
-import org.apache.myfaces.trinidadinternal.share.xml.StringParser;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
 import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
 import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
 import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
+import org.apache.myfaces.trinidadinternal.share.xml.StringParser;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
 
 /**
  * NodeParser for &lt;skin&gt; node in trinidad-skins.xml
@@ -109,6 +109,11 @@ public class SkinNodeParser extends Base
     {
       return context.getParser(SkinFeaturesNode.class, namespaceURI, localName);
     }
+    // <metadata/> and its child elements are not for runtime purpose, so, the parser should ignore.
+    else if ("metadata".equals(localName))
+    {
+      return BaseNodeParser.getIgnoreParser();
+    }
 
     return null;
   }