svn commit: r770838 - /incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/NameTagHandler.java

[lryan]

Author: lryan
Date: Fri May  1 22:07:14 2009
New Revision: 770838

URL: http://svn.apache.org/viewvc?rev=770838&view=rev
Log:
Make Name tag fallback to displayName if Name object isnt available

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

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/NameTagHandler.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/NameTagHandler.java?rev=770838&r1=770837&r2=770838&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/NameTagHandler.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/NameTagHandler.java
 Fri May  1 22:07:14 2009
@@ -45,13 +45,18 @@
       return;
     }
     JSONObject name = person.optJSONObject("name");
-    if (name == null) {
+
+    String formatted;
+    if (name != null) {
+      formatted = name.optString("formatted");
+      if (formatted.length() == 0) {
+        formatted = name.optString("givenName") + " " + 
name.optString("familyName");
+      }
+    } else if (person.optString("displayName") != null) {
+      formatted = person.optString("displayName");
+    } else {
       return;
     }
-    String formatted = name.optString("formatted");
-    if (formatted.length() == 0) {
-      formatted = name.optString("givenName") + " " + 
name.optString("familyName");
-    }
 
     Document doc = result.getOwnerDocument();
     Element root = doc.createElement("b");