Changeset 34243

Timestamp:

2020-07-03T12:37:50+12:00 (4 years ago)

Author:

ak19

Message:

Minor.

File:

• main/trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfigXMLReadWrite.java (modified) (5 diffs)

main/trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfigXMLReadWrite.java

@@ -2809 +2809 @@
      * For now it only makes sense to allow a collection's about page description to contain HTML.
      * Collection titles may go into a pre tag or text only context or into HTML headings,
-     * where preserving any HTML int coll title would become meaningless or even a hindrance.
+     * where preserving any HTML in coll title would become meaningless or even a hindrance.
      * TODO: if users used HTML pre tags, they'll have wanted whitespace preserved.
      * TODO There's probably a better way to do this, but I'm unable to think of it. Messy but works.
@@ -2820 +2820 @@
     // <displayItem></displayItem> or self-closing(!) <displayItem/> when no text for colldescr
     // Remove xml processing instr too by removing <displayItem until first > after that
-    // this will also handle self-closing tag case
+    // This will also handle the self-closing tag case
     String lookFor = "<displayItem";
     int start = text.indexOf(lookFor);
@@ -2831 +2831 @@
 
     // If we have a positive number of lines remaining, it means it wasn't a self-closing
-    // tag. Remove the closing tag
+    // tag. Need to remove the closing tag
     String[] lines = text.split("\\r?\\n");
     text = "";              
@@ -2837 +2837 @@
         for (int j = 0; j < lines.length-1; j++) { // skip last line: closing tag
         text += lines[j].trim() + "\n"; // Easiest solution:
-                                   // trim white space introduced by the one extra level of
-                                   // indentation intoduced when enclosing <dispItem> tags removed
+                               // trim white space of the one extra level of indentation
+                           // that became apparent when enclosing <dispItem> tags removed
         }
     }
@@ -2846 +2846 @@
                // while displaying the html as html (without char entities) in the config file editor
     
-    return text;//.trim(); // don't want trailing whitespace within displayItem
+    return text; //already trimmed to remove all but final newline
     }