Issue #85 - Splitting up GedcomParser - work is incomplete, tests fail

frizbog · Jul 8, 2016 · 167e124 · 167e124
1 parent e4ed354
commit 167e124
Showing 1 changed file with 7 additions and 19 deletions.
diff --git a/src/main/java/org/gedcom4j/parser/GedcomParser.java b/src/main/java/org/gedcom4j/parser/GedcomParser.java
@@ -600,7 +600,7 @@ private void loadFamily(StringTree st) {
                 } else if (Tag.REFERENCE.equalsText(ch.getTag())) {
                     UserReference u = new UserReference();
                     f.getUserReferences(true).add(u);
-                    loadUserReference(ch, u);
+                    new UserReferenceParser(gedcomParser, ch, u).parse();
                 } else {
                     unknownTag(ch, f);
                 }
@@ -856,7 +856,7 @@ private void loadIndividual(StringTree st) {
                 } else if (Tag.REFERENCE.equalsText(ch.getTag())) {
                     UserReference u = new UserReference();
                     i.getUserReferences(true).add(u);
-                    loadUserReference(ch, u);
+                    new UserReferenceParser(gedcomParser, ch, u).parse();
                 } else if (Tag.SUBMITTER.equalsText(ch.getTag())) {
                     i.getSubmitters(true).add(getSubmitter(ch.getValue()));
                 } else {
@@ -1193,7 +1193,7 @@ private void loadMultimediaRecord55(StringTree st) {
             } else if (Tag.REFERENCE.equalsText(ch.getTag())) {
                 UserReference u = new UserReference();
                 m.getUserReferences(true).add(u);
-                loadUserReference(ch, u);
+                new UserReferenceParser(gedcomParser, ch, u).parse();
             } else if (Tag.RECORD_ID_NUMBER.equalsText(ch.getTag())) {
                 m.setRecIdNumber(new StringWithCustomTags(ch));
             } else if (Tag.CHANGED_DATETIME.equalsText(ch.getTag())) {
@@ -1248,7 +1248,7 @@ private void loadMultimediaRecord551(StringTree st) {
             } else if (Tag.REFERENCE.equalsText(ch.getTag())) {
                 UserReference u = new UserReference();
                 m.getUserReferences(true).add(u);
-                loadUserReference(ch, u);
+                new UserReferenceParser(gedcomParser, ch, u).parse();
             } else if (Tag.RECORD_ID_NUMBER.equalsText(ch.getTag())) {
                 m.setRecIdNumber(new StringWithCustomTags(ch));
             } else if (Tag.CHANGED_DATETIME.equalsText(ch.getTag())) {
@@ -1308,7 +1308,7 @@ private void loadNote(StringTree st, List<Note> notes) {
                 } else if (Tag.REFERENCE.equalsText(ch.getTag())) {
                     UserReference u = new UserReference();
                     note.getUserReferences(true).add(u);
-                    loadUserReference(ch, u);
+                    new UserReferenceParser(gedcomParser, ch, u).parse();
                 } else if (Tag.RECORD_ID_NUMBER.equalsText(ch.getTag())) {
                     note.setRecIdNumber(new StringWithCustomTags(ch));
                 } else if (Tag.CHANGED_DATETIME.equalsText(ch.getTag())) {
@@ -1522,7 +1522,7 @@ private void loadRepository(StringTree st) {
                 } else if (Tag.REFERENCE.equalsText(ch.getTag())) {
                     UserReference u = new UserReference();
                     r.getUserReferences(true).add(u);
-                    loadUserReference(ch, u);
+                    new UserReferenceParser(gedcomParser, ch, u).parse();
                 } else if (Tag.RECORD_ID_NUMBER.equalsText(ch.getTag())) {
                     r.setRecIdNumber(new StringWithCustomTags(ch));
                 } else if (Tag.CHANGED_DATETIME.equalsText(ch.getTag())) {
@@ -1655,7 +1655,7 @@ private void loadSource(StringTree st) {
             } else if (Tag.REFERENCE.equalsText(ch.getTag())) {
                 UserReference u = new UserReference();
                 s.getUserReferences(true).add(u);
-                loadUserReference(ch, u);
+                new UserReferenceParser(gedcomParser, ch, u).parse();
             } else if (Tag.RECORD_ID_NUMBER.equalsText(ch.getTag())) {
                 s.setRecIdNumber(new StringWithCustomTags(ch));
             } else if (Tag.CHANGED_DATETIME.equalsText(ch.getTag())) {
@@ -1814,18 +1814,6 @@ private void loadSubmitter(StringTree st) {
         }
     }
 
-    /**
-     * Load a user reference to from a string tree node
-     * 
-     * @param st
-     *            the string tree node
-     * @param u
-     *            the user reference object
-     */
-    private void loadUserReference(StringTree st, UserReference u) {
-
-    }
-
     /**
      * Notify all listeners about the change
      *