Even easier subclass, if only the unit is different

awulder · Sep 18, 2013 · adb061c · adb061c
1 parent 72f80d8
commit adb061c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/fitnesse/wikitext/parser/Today.java b/src/fitnesse/wikitext/parser/Today.java
@@ -11,13 +11,15 @@
 public class Today extends SymbolType implements Rule, Translation {
     private static final String Format = "Format";
     private static final String Increment = "Increment";
+    private final int incrementUnit;
 
     public Today() {
-        this("Today", "!today");
+        this("Today", "!today", Calendar.DAY_OF_MONTH);
     }
 
-    protected Today(String symbolName, String symbolText) {
+    protected Today(String symbolName, String symbolText, int unitForIncrement) {
         super(symbolName);
+        incrementUnit = unitForIncrement;
         wikiMatcher(new Matcher().string(symbolText));
         wikiRule(this);
         htmlTranslation(this);
@@ -69,7 +71,7 @@ public String toTarget(Translator translator, Symbol symbol) {
     }
 
     protected void addIncrement(GregorianCalendar calendar, int increment) {
-        calendar.add(Calendar.DAY_OF_MONTH, increment);
+        calendar.add(incrementUnit, increment);
     }
 
     private String makeFormat(String format) {

diff --git a/src/fitnesse/wikitext/test/TodayExtensionTest.java b/src/fitnesse/wikitext/test/TodayExtensionTest.java
@@ -56,12 +56,7 @@ public void translatesInTable() {
 
     private static class MonthsFromToday extends Today {
         public MonthsFromToday() {
-            super("MonthsFromToday", "!monthsFromToday");
-        }
-
-        @Override
-        protected void addIncrement(GregorianCalendar calendar, int increment) {
-            calendar.add(Calendar.MONTH, increment);
+            super("MonthsFromToday", "!monthsFromToday", Calendar.MONTH);
         }
     }
 }