You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by et...@apache.org on 2008/02/14 02:21:58 UTC

svn commit: r627630 - /incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecParser.java

Author: etnu
Date: Wed Feb 13 17:21:57 2008
New Revision: 627630

URL: http://svn.apache.org/viewvc?rev=627630&view=rev
Log:
Fixed handling of EnumValue to make display_value optional as per spec.


Modified:
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecParser.java

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecParser.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecParser.java?rev=627630&r1=627629&r2=627630&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecParser.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecParser.java Wed Feb 13 17:21:57 2008
@@ -251,9 +251,12 @@
         // Must have both name and value.
         Node value = childAttrs.getNamedItem("value");
         Node displayValue = childAttrs.getNamedItem("display_value");
-        if (value != null && displayValue != null) {
-          up.enumValues.put(value.getTextContent(),
-                            displayValue.getTextContent());
+        if (value != null) {
+          String valueText = value.getTextContent();
+          String displayText = displayValue == null
+              ? valueText
+              : displayValue.getTextContent();
+          up.enumValues.put(valueText, displayText);
         }
       }
     }