Changeset 30112 in osm for applications/editors/josm/plugins/OpeningHoursEditor/src

Timestamp:

2013-12-07T20:50:29+01:00 (11 years ago)

Author:

donvip

Message:

[josm_openinghours] remove generated code from SVN, use JOSM's JavaCC

Location:

applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/parser

Files:

• OpeningTimeCompiler.java (deleted)
• OpeningTimeCompiler.jj (modified) (8 diffs)
• OpeningTimeCompilerConstants.java (deleted)
• OpeningTimeCompilerTokenManager.java (deleted)

applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/parser/OpeningTimeCompiler.jj

@@ -9 +9 @@
 timespan ::= [ dayspanlist " " ] daytimespanlist
 
-daytimespanlist ::=     daytimespan [ "," daytimespanlist ]
+daytimespanlist ::= daytimespan [ "," daytimespanlist ]
 daytimespan ::= off | ( daytime ( openend |  [ "-" daytime ]) )
-daytime ::=     (DIGIT DIGIT ":" DIGIT DIGIT )
+daytime ::= (DIGIT DIGIT ":" DIGIT DIGIT )
 openend ::= PLUS
 off ::= OFF
 
-dayspanlist ::= dayspan [ "," dayspanlist ]
-dayspan ::=     WEEKDAY [ "-" WEEKDAY ]
+dayspanlist ::= dayspan [ "," dayspanlist ]
+dayspan ::= WEEKDAY [ "-" WEEKDAY ]
 */
 
@@ -77 +77 @@
   {
     if (time.size() == 0) {
-                ArrayList<DaySpan> daySpans = new ArrayList<DaySpan>();
-        daySpans.add(new DaySpan(0,6));
-                ArrayList<DaytimeSpan> timeSpans = new ArrayList<DaytimeSpan>();
-        timeSpans.add(new DaytimeSpan(0, 24 * 60));
-        time.add(new DateTime(daySpans, timeSpans));
-        }
-        
+          ArrayList<DaySpan> daySpans = new ArrayList<DaySpan>();
+        daySpans.add(new DaySpan(0,6));
+          ArrayList<DaytimeSpan> timeSpans = new ArrayList<DaytimeSpan>();
+        timeSpans.add(new DaytimeSpan(0, 24 * 60));
+        time.add(new DateTime(daySpans, timeSpans));
+    }
+        
     return time;
   }
@@ -99 +99 @@
     list.add(first);
     if(second != null)
-        list.addAll(second);
+        list.addAll(second);
     return list;
   }
@@ -128 +128 @@
     list.add(first);
     if(second != null)
-        list.addAll(second);
+        list.addAll(second);
     return list;
   }
@@ -144 +144 @@
   {
     if (end < 0)
-        end = start;
+        end = start;
     else if(end < start)
-        throw new SyntaxException(null, usedTokens.lastElement().beginColumn - 1, usedTokens.lastElement().endColumn + 1);
+        throw new SyntaxException(null, usedTokens.lastElement().beginColumn - 1, usedTokens.lastElement().endColumn + 1);
     
     return new DaytimeSpan(start, end);
@@ -167 +167 @@
 
     if (hour > 24)
-        throw new SyntaxException(null, th1.beginColumn - 1, th0.endColumn + 1);
+        throw new SyntaxException(null, th1.beginColumn - 1, th0.endColumn + 1);
     if (minute >= 60 || (hour == 24 && minute != 0))
-        throw new SyntaxException(null, tm1.beginColumn - 1, tm0.endColumn + 1);
+        throw new SyntaxException(null, tm1.beginColumn - 1, tm0.endColumn + 1);
 
     return hour * 60 + minute;
@@ -235 +235 @@
   {
     if(end < 0)
-        end = start;
+        end = start;
     else if(end < start)
-        throw new SyntaxException(null, usedTokens.lastElement().beginColumn - 1, usedTokens.lastElement().endColumn + 1);
+        throw new SyntaxException(null, usedTokens.lastElement().beginColumn - 1, usedTokens.lastElement().endColumn + 1);
     
     return new DaySpan(start, end);
@@ -253 +253 @@
     for (int i = 0; i < WEEKDAYS.length; ++i)
       if (WEEKDAYS[i].equals(t.image))
-        return i;
-        
+        return i;
+        
     throw new SyntaxException(null, t.beginColumn - 1, t.endColumn + 1);
   }