Fixes #387 - date as a list item

It looks like the only attribute that was showing up in a list incorrectly was date. This fixes it.
dickschoeller · Jun 24, 2017 · 5160d26 · 5160d26
1 parent 5643dae
commit 5160d26
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/...-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/DateListItemRenderer.java b/...-renderer/src/main/java/org/schoellerfamily/gedbrowser/renderer/DateListItemRenderer.java
@@ -1,8 +1,5 @@
 package org.schoellerfamily.gedbrowser.renderer;
 
-import org.schoellerfamily.gedbrowser.datamodel.Date;
-import org.schoellerfamily.gedbrowser.datamodel.visitor.GetDateVisitor;
-
 /**
  * @author Dick Schoeller
  */
@@ -27,8 +24,14 @@ protected DateListItemRenderer(final DateRenderer dateRenderer) {
     @Override
     public StringBuilder renderAsListItem(final StringBuilder builder,
             final boolean newLine, final int pad) {
+        final String listItemContents = getListItemContents();
+        if (listItemContents.isEmpty()) {
+            return builder;
+        }
         GedRenderer.renderPad(builder, pad, newLine);
-        builder.append(getListItemContents());
+        builder.append("<li>");
+        builder.append(listItemContents);
+        builder.append("</li>\n");
         return builder;
     }
 
@@ -37,9 +40,10 @@ public StringBuilder renderAsListItem(final StringBuilder builder,
      */
     @Override
     public String getListItemContents() {
-        final GetDateVisitor visitor = new GetDateVisitor();
-        final Date date = dateRenderer.getGedObject();
-        date.accept(visitor);
-        return visitor.getDate();
+        final String phrase = dateRenderer.renderAsPhrase();
+        if (phrase.isEmpty()) {
+            return "";
+        }
+        return "<span class=\"label\">Date:</span> " + phrase;
     }
 }
diff --git a/.../src/test/java/org/schoellerfamily/gedbrowser/renderer/test/DateListItemRendererTest.java b/.../src/test/java/org/schoellerfamily/gedbrowser/renderer/test/DateListItemRendererTest.java
@@ -64,7 +64,8 @@ public void testGetRenderAsListItem() {
         dlir.renderAsListItem(builder, false, 0);
         final String string = builder.toString();
         assertEquals("Rendered string doesn't match expectation",
-                "14 December 1958 12:00", string);
+                "<li><span class=\"label\">Date:</span>"
+                + " 14 December 1958 12:00</li>\n", string);
     }
 
     /** */
@@ -78,7 +79,9 @@ public void testGetRenderAsListItem2() {
         dlir.renderAsListItem(builder, false, 0);
         final String string = builder.toString();
         assertEquals("Rendered string doesn't match expectation",
-                "14 December 1958", string);
+                "<li><span class=\"label\">Date:</span>"
+                + " 14 December 1958</li>\n",
+                string);
     }
 
     /** */

diff --git a/...wser/src/test/java/org/schoellerfamily/gedbrowser/controller/test/HeadControllerTest.java b/...wser/src/test/java/org/schoellerfamily/gedbrowser/controller/test/HeadControllerTest.java
@@ -73,6 +73,7 @@ public final void testHeadControllerSchoeller() {
                     + "Schoeller</span> [SUB1]</a>")
             .contains("GEDCOM:</span> 5.5.1, LINEAGE-LINKED")
             .contains("Destination:</span> GED55")
+            .contains("Date:</span> 16 FEB 2001 22:04</li>")
             .contains("Character Set:</span> UTF-8")
             .contains(getMenu("mini-schoeller", "A"));
     }