Reviewers: MikeSamuel,

Description:
* Displays errors in list if there was an error
* Displays warnings in a display:none div otherwise

Please review this at http://codereview.appspot.com/217084/show

Affected files:
M java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
  M     javascript/container/gadgets.css


Index: java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
===================================================================
--- java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java (revision 912292) +++ java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java (working copy)
@@ -153,6 +153,10 @@
         cajoledOutput.appendChild(tameCajaClientApi(doc));
         cajoledOutput.appendChild(doc.adoptNode(script));

+ Element messagesNode = formatErrors(doc, is, content.getContent(), mq);
+        messagesNode.setAttribute("style", "display: none");
+        cajoledOutput.appendChild(messagesNode);
+
         if (cajoledCache != null) {
           cajoledCache.addElement(key, cajoledOutput);
         }
@@ -193,22 +197,22 @@
     mc.addInputSource(is);
     SnippetProducer sp = new SnippetProducer(originalSrc, mc);

-    StringBuilder messageText = new StringBuilder();
+    Element errElement = doc.createElement("ul");
+    errElement.setAttribute("class", "gadgets-messages");
     for (Message msg : mq.getMessages()) {
+      StringBuilder messageText = new StringBuilder();
       // Ignore LINT messages
       if (MessageLevel.LINT.compareTo(msg.getMessageLevel()) <= 0) {
         String snippet = sp.getSnippet(msg);
         messageText.append(msg.getMessageLevel().name())
                    .append(' ')
-                   .append(html(msg.format(mc)));
-
-        if (!StringUtils.isEmpty(snippet)) {
-          messageText.append('\n').append(snippet);
-        }
+                   .append(html(msg.format(mc)))
+                   .append(snippet);
+        Element li = doc.createElement("li");
+        li.appendChild(doc.createTextNode(messageText.toString()));
+        errElement.appendChild(li);
       }
     }
-    Element errElement = doc.createElement("pre");
-    errElement.appendChild(doc.createTextNode(messageText.toString()));
     return errElement;
   }

Index: javascript/container/gadgets.css
===================================================================
--- javascript/container/gadgets.css    (revision 912292)
+++ javascript/container/gadgets.css    (working copy)
@@ -59,3 +59,7 @@

 .gadgets-log-entry {
 }
+
+.gadgets-messages {
+       
+}


Reply via email to