Merge pull request #65 from scijava/fix-map-converter

Fix MapToHTMLTableConverter

Author: hadim

notebooks/Test.ipynb

@@ -116,6 +116,70 @@
     "assert(a_groovy_dict[\"a_string\"] == \"Hello\")\n",
     "assert(a_groovy_dict[\"a_number\"] == 87)"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 3,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<style>table.converted {color: #333; font-family: Helvetica, Arial, sans-serif; border-collapse: collapse; border-spacing: 0;}table.converted td, table.converted th {border: 1px solid #C9C7C7;}table.converted th, table.converted td.rowLabel {background: #626262; color: #FFFFFF; font-weight: bold; text-align: left;}table.converted td {text-align: left;}table.converted tr:nth-child(even) {background: #F3F3F3;}table.converted tr:nth-child(odd) {background: #FFFFFF;}table.converted tbody tr:hover {background: #BDF4B5;}table.converted td.rowLabel, table.converted th.rowLabel {display: none;}</style><table class =\"converted\"><thead><tr><th>Key</th><th>Value</th></tr></thead><tbody><tr><td>:a</td><td>4</td></tr><tr><td>:e</td><td>&lt;none&gt;</td></tr></tbody></table>"
+      ]
+     },
+     "execution_count": 3,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "#!clojure\n",
+    "{:a 4, :e nil}"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 4,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<style>table.converted {color: #333; font-family: Helvetica, Arial, sans-serif; border-collapse: collapse; border-spacing: 0;}table.converted td, table.converted th {border: 1px solid #C9C7C7;}table.converted th, table.converted td.rowLabel {background: #626262; color: #FFFFFF; font-weight: bold; text-align: left;}table.converted td {text-align: left;}table.converted tr:nth-child(even) {background: #F3F3F3;}table.converted tr:nth-child(odd) {background: #FFFFFF;}table.converted tbody tr:hover {background: #BDF4B5;}table.converted td.rowLabel, table.converted th.rowLabel {display: none;}</style><table class =\"converted\"><thead><tr><th>Key</th><th>Value</th></tr></thead><tbody><tr><td>a</td><td>4</td></tr><tr><td>e</td><td>&lt;none&gt;</td></tr></tbody></table>"
+      ]
+     },
+     "execution_count": 4,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "#!groovy\n",
+    "[a:4, e: null]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 5,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<style>table.converted {color: #333; font-family: Helvetica, Arial, sans-serif; border-collapse: collapse; border-spacing: 0;}table.converted td, table.converted th {border: 1px solid #C9C7C7;}table.converted th, table.converted td.rowLabel {background: #626262; color: #FFFFFF; font-weight: bold; text-align: left;}table.converted td {text-align: left;}table.converted tr:nth-child(even) {background: #F3F3F3;}table.converted tr:nth-child(odd) {background: #FFFFFF;}table.converted tbody tr:hover {background: #BDF4B5;}table.converted td.rowLabel, table.converted th.rowLabel {display: none;}</style><table class =\"converted\"><thead><tr><th>Salutation</th><th>Valediction</th></tr></thead><tbody><tr><td>hello</td><td>goodbye</td></tr><tr><td>hi</td><td>bye</td></tr><tr><td>hey</td><td>&lt;none&gt;</td></tr></tbody></table>"
+      ]
+     },
+     "execution_count": 5,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "#!groovy\n",
+    "[[\"Salutation\":\"hello\", \"Valediction\":\"goodbye\"], [\"Salutation\":\"hi\", \"Valediction\":\"bye\"], \n",
+    " [\"Salutation\":\"hey\", \"Valediction\":null]]"
+   ]
   }
  ],
  "metadata": {

src/main/java/org/scijava/notebook/converter/HTMLNotebookOutputConverter.java

@@ -39,7 +39,8 @@ public abstract class HTMLNotebookOutputConverter<I, O extends HTMLNotebookOutpu
 
     /** Gets an HTML string representing the given object. */
     protected String asHTML(final Object o) {
-        return convertService.convert(o, HTMLFriendlyNotebookOutput.class).toHTML();
+        final HTMLFriendlyNotebookOutput converted = convertService.convert(o, HTMLFriendlyNotebookOutput.class);
+        return converted == null ? "&lt;none&gt;" : converted.toHTML();
     }
 
 }

src/main/java/org/scijava/notebook/converter/MapToHTMLTableNotebookConverter.java

@@ -67,8 +67,8 @@ public HTMLTableNotebookOutput convert(final Object object) {
 
         // Append the rows
         for (final K key : table.keySet()) {
-            final String k = (key != null) ? asHTML(key) : "";
-            final String v = (key != null) ? asHTML(table.get(key)) : "";
+            final String k = asHTML(key);
+            final String v = asHTML(table.get(key));
             htmlTable += HTMLTableBuilder.appendData(k, true, false);
             htmlTable += HTMLTableBuilder.appendData(v, false, true);
         }