Add OrgActiveTimestamps

Title must be parsed too, so collecting timestamps from OrgContent
alone is not enough. Added for orgzly/orgzly-android#76

Author: nevenz

src/main/java/com/orgzly/org/OrgActiveTimestamps.java

@@ -0,0 +1,27 @@
+package com.orgzly.org;
+
+import com.orgzly.org.datetime.OrgRange;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+
+public class OrgActiveTimestamps {
+    public static List<OrgRange> parse(String str) {
+        List<OrgRange> timestamps = new ArrayList<>();
+
+        if (str != null && str.length() > 0) {
+            Matcher m = OrgPatterns.DT_OR_RANGE_P.matcher(str);
+
+            while (m.find()) {
+                OrgRange range = OrgRange.parse(m.group());
+
+                if (range.getStartTime().isActive()) {
+                    timestamps.add(range);
+                }
+            }
+        }
+
+        return timestamps;
+    }
+}

src/main/java/com/orgzly/org/OrgContent.java

@@ -1,23 +1,13 @@
 package com.orgzly.org;
 
-import com.orgzly.org.datetime.OrgRange;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-
 /**
  * Text below a heading.
  */
 public class OrgContent {
     private StringBuilder value;
-    private List<OrgRange> timestamps;
-    private boolean dirty; /** Whether timestamps are out of sync with `value`,
-                            * and need to be reparsed. */
 
     public OrgContent() {
         value = new StringBuilder();
-        dirty = false;
     }
 
     /**
@@ -34,12 +24,10 @@ public void set(String value) {
         } else {
             this.value = new StringBuilder(value);
         }
-        dirty = true;
     }
 
     public void append(String s) {
         value.append(s);
-        dirty = true;
     }
 
     /**
@@ -48,41 +36,4 @@ public void append(String s) {
     public String toString() {
         return value.toString();
     }
-
-    /**
-     * @return the list of plain timestamps in this content text
-     */
-    public List<OrgRange> getTimestamps() {
-        if (timestamps == null) {
-            timestamps = new ArrayList<>();
-        }
-        if (dirty) {
-            reparse();
-        }
-        return timestamps;
-    }
-
-    public boolean hasTimestamps() {
-        if (timestamps == null) {
-            return false;
-        }
-        if (dirty) {
-            reparse();
-        }
-        return !timestamps.isEmpty();
-    }
-
-    /** Parse all plain timestamps in this content and rebuild the timestamps list. */
-    private void reparse() {
-        timestamps.clear();
-        Matcher m = OrgPatterns.DT_OR_RANGE_P.matcher(toString());
-        while (m.find()) {
-            OrgRange range = OrgRange.parse(m.group());
-            if (range.getStartTime().isActive()) {
-                timestamps.add(range);
-            }
-        }
-        dirty = false;
-    }
-
 }

src/main/java/com/orgzly/org/OrgHead.java

@@ -122,14 +122,6 @@ public void appendContent(String s) {
         getContentObject().append(s);
     }
 
-    public List<OrgRange> getTimestamps() {
-        return getContentObject().getTimestamps();
-    }
-
-    public boolean hasTimestamps() {
-        return getContentObject().hasTimestamps();
-    }
-
     /**
      * Scheduled time.
      *

src/main/java/com/orgzly/org/datetime/OrgDateTime.java

@@ -414,6 +414,15 @@ public Builder setDelay(OrgDelay delay) {
             return this;
         }
 
+        public Builder setDay(long timestamp) {
+            Calendar cal = new GregorianCalendar();
+            cal.setTimeInMillis(timestamp);
+
+            return setYear(cal.get(Calendar.YEAR))
+                    .setMonth(cal.get(Calendar.MONTH))
+                    .setDay(cal.get(Calendar.DAY_OF_MONTH));
+        }
+
         public OrgDateTime build() {
             OrgDateTime time = new OrgDateTime();
 

src/test/java/com/orgzly/org/OrgActiveTimestampsTest.java

@@ -0,0 +1,36 @@
+package com.orgzly.org;
+
+import com.orgzly.org.datetime.OrgRange;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.List;
+
+public class OrgActiveTimestampsTest extends OrgTestParser {
+    @Test
+    public void testPlainTimestamp() {
+        String str = "<2018-01-15 Mon>\n";
+
+        List<OrgRange> timestamps = OrgActiveTimestamps.parse(str);
+
+        Assert.assertEquals(1, timestamps.size());
+        Assert.assertEquals("<2018-01-15 Mon>", timestamps.get(0).toString());
+    }
+
+    @Test
+    public void testPlainTimestamps() {
+        String str =
+                "<2018-01-15 Mon> some text between timestamps <2018-01-16 Tue>\n" +
+                "Blabla some other text in front <2018-01-17 Wed> text after\n" +
+                "\n\n" +
+                "[2018-01-18 Thu]\n\n";
+
+        List<OrgRange> timestamps = OrgActiveTimestamps.parse(str);
+
+        Assert.assertEquals(3, timestamps.size());
+        Assert.assertEquals("<2018-01-15 Mon>", timestamps.get(0).toString());
+        Assert.assertEquals("<2018-01-16 Tue>", timestamps.get(1).toString());
+        Assert.assertEquals("<2018-01-17 Wed>", timestamps.get(2).toString());
+    }
+}

src/test/java/com/orgzly/org/OrgContentTest.java

@@ -759,37 +759,6 @@ public void testOrgTagsColumnNegativeWithFullWidthChars() throws IOException {
         Assert.assertEquals(expectedStr, parsedStr);
     }
 
-    @Test
-    public void testPlainTimestamps() throws IOException {
-        String str = "* Node\n" +
-            "CLOSED: [2012-12-29 Sat 08:05] DEADLINE: <2012-12-28 Fri> SCHEDULED: <2012-12-27 Thu>\n" +
-            "<2018-01-15 Mon> some text between timestamps <2018-01-16 Tue>\n" +
-            "Blabla some other text in front <2018-01-17 Wed> text after\n" +
-            "\n\n" +
-            "[2018-01-18 Thu]\n\n";
-
-        OrgParsedFile file = parserBuilder.setInput(str).build().parse();
-
-        List<OrgRange> timestamps = file.getHeadsInList().get(0).getHead().getTimestamps();
-        Assert.assertEquals(4, timestamps.size());
-        Assert.assertEquals("<2018-01-15 Mon>", timestamps.get(0).toString());
-        Assert.assertEquals("<2018-01-16 Tue>", timestamps.get(1).toString());
-        Assert.assertEquals("<2018-01-17 Wed>", timestamps.get(2).toString());
-        Assert.assertEquals("[2018-01-18 Thu]", timestamps.get(3).toString());
-    }
-
-    @Test
-    public void testPlainTimestampsNoHeader() throws IOException {
-        String str = "* Node\n" +
-            "<2018-01-15 Mon>\n";
-
-        OrgParsedFile file = parserBuilder.setInput(str).build().parse();
-
-        List<OrgRange> timestamps = file.getHeadsInList().get(0).getHead().getTimestamps();
-        Assert.assertEquals(1, timestamps.size());
-        Assert.assertEquals("<2018-01-15 Mon>", timestamps.get(0).toString());
-    }
-
     private String parsed(String original) throws IOException {
         return parsed(original, OrgParserSettings.getBasic());
     }