GatherMarriageCertificateGroomTimeLine::AddGroomRank

GatherMarriageCertificateBrideTimeLine::AddBrideRank

src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/marriagecertificate/GatherMarriageCertificateBrideTimeLineDataImpl.java

@@ -64,14 +64,16 @@ public class GatherMarriageCertificateBrideTimeLineDataImpl implements GatherMar
     private void addBrideRank(TreeMap<DMY, List<String>> timeLine, MarriageCertificate marriageCertificate) {
         logger.info("GatherMarriageCertificateBrideTimeLineDataImpl::AddBrideRank");
 
-        if (marriageCertificate.getBrideRank() != null  && !marriageCertificate.getBrideRank().isEmpty()) {
-            List<String> existingValues = timeLine.get(getDMY(marriageCertificate.getWhenMarried()));
-            if (existingValues == null) {
-                existingValues = new ArrayList<>();
-            }
+        List<String> existingValues = timeLine.get(getDMY(marriageCertificate.getWhenMarried()));
+        if (existingValues == null) {
+            existingValues = new ArrayList<>();
+        }
+
+        if (marriageCertificate.getBrideRank() != null) {
             existingValues.add("Rank registered as " + marriageCertificate.getBrideRank());
-            timeLine.put(getDMY(marriageCertificate.getWhenMarried()), existingValues);
         }
+        timeLine.put(getDMY(marriageCertificate.getWhenMarried()), existingValues);
+
     }
 
 

src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/marriagecertificate/GatherMarriageCertificateGroomTimeLineDataImpl.java

@@ -62,14 +62,16 @@ public class GatherMarriageCertificateGroomTimeLineDataImpl implements GatherMar
     private void addGroomRank(TreeMap<DMY, List<String>> timeLine, MarriageCertificate marriageCertificate) {
         logger.info("GatherMarriageCertificateBrideTimeLineDataImpl::AddGroomRank");
 
-        if (marriageCertificate.getGroomRank() != null  && !marriageCertificate.getGroomRank().isEmpty()) {
-            List<String> existingValues = timeLine.get(getDMY(marriageCertificate.getWhenMarried()));
-            if (existingValues == null) {
-                existingValues = new ArrayList<>();
-            }
+        List<String> existingValues = timeLine.get(getDMY(marriageCertificate.getWhenMarried()));
+        if (existingValues == null) {
+            existingValues = new ArrayList<>();
+        }
+
+        if (marriageCertificate.getGroomRank() != null) {
             existingValues.add("Rank registered as " + marriageCertificate.getGroomRank());
-            timeLine.put(getDMY(marriageCertificate.getWhenMarried()), existingValues);
         }
+        timeLine.put(getDMY(marriageCertificate.getWhenMarried()), existingValues);
+
     }