Skip to content

Commit 8a9b2f3

Browse files
dkrajzewdkrajzew
committed
patching language
1 parent ab20157 commit 8a9b2f3

File tree

16 files changed

+27
-27
lines changed

16 files changed

+27
-27
lines changed

‎src/de/dks/utils/options/OptionsParser.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ public static boolean parse(OptionsCont into, String[] args, boolean continueOnE
2121
for(int pos=0; pos<args.length;) {
2222
// try to parse a token combination
2323
int add = parse(into, args, pos);
24-
// check whether an error occured
24+
// check whether an error occurred
2525
if(add<0) {
26-
// error occured
26+
// error occurred
2727
ok = false;
28-
// maybe we want to continue although an error occured
28+
// maybe we want to continue although an error occurred
2929
if(continueOnError) {
3030
pos += -add;
3131
} else {

‎src/de/dlr/ivf/urmo/router/algorithms/routing/SingleODResult.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ protected SingleODResult(MapResult _origin, MapResult _destination, DijkstraEntr
7474
}
7575

7676
if(dist<0||tt<0) {
77-
System.err.println("Negative distance or travel time occured between '" + origin.em.getOuterID() + "' to '" + destination.em.getOuterID() + "'.");
77+
System.err.println("Negative distance or travel time occurred between '" + origin.em.getOuterID() + "' to '" + destination.em.getOuterID() + "'.");
7878
}
7979
}
8080

‎src/de/dlr/ivf/urmo/router/io/InputReader.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ private static Layer loadLayerFromDB(String layerName, Geometry bounds, Utils.Fo
188188
layer.addObject(o);
189189
// check for duplicates
190190
if(seen.contains(id)) {
191-
System.err.println("Duplicate object '" + id + "' occured.");
191+
System.err.println("Duplicate object '" + id + "' occurred.");
192192
ok = false;
193193
continue;
194194
}
@@ -287,7 +287,7 @@ private static Layer loadLayerFromCSVFile(String layerName, Geometry bounds, Str
287287
layer.addObject(new LayerObject(idGiver.getNextRunningID(), id, var, geom2));
288288
// check for duplicates
289289
if(seen.contains(id)) {
290-
System.err.println("Duplicate object '" + id + "' occured.");
290+
System.err.println("Duplicate object '" + id + "' occurred.");
291291
ok = false;
292292
}
293293
seen.add(id);
@@ -358,7 +358,7 @@ private static Layer loadLayerFromWKTFile(String layerName, Geometry bounds, Str
358358
layer.addObject(new LayerObject(idGiver.getNextRunningID(), id, var, geom));
359359
// check for duplicates
360360
if(seen.contains(id)) {
361-
System.err.println("Duplicate object '" + id + "' occured.");
361+
System.err.println("Duplicate object '" + id + "' occurred.");
362362
ok = false;
363363
}
364364
seen.add(id);

‎src/de/dlr/ivf/urmo/router/io/OutputBuilder.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public static Vector<Aggregator> buildOutputs(OptionsCont options, Layer fromLay
9393
aggAllFrom, aggAllTo, fromLayer, fromAggLayer, toLayer, toAggLayer, writer, comment);
9494
aggregators.add(agg);
9595
} catch(IOException e) {
96-
throw new IOException("Exception '" + e.getMessage() + "' occured while building the od-output.");
96+
throw new IOException("Exception '" + e.getMessage() + "' occurred while building the od-output.");
9797
}
9898
}
9999
if (options.isSet("ext-od-output")) {
@@ -105,7 +105,7 @@ public static Vector<Aggregator> buildOutputs(OptionsCont options, Layer fromLay
105105
aggAllFrom, aggAllTo, fromLayer, fromAggLayer, toLayer, toAggLayer, writer, comment);
106106
aggregators.add(agg);
107107
} catch(IOException e) {
108-
throw new IOException("Exception '" + e.getMessage() + "' occured while building the ext-od-output.");
108+
throw new IOException("Exception '" + e.getMessage() + "' occurred while building the ext-od-output.");
109109
}
110110
}
111111
if (options.isSet("stat-od-output")) {
@@ -117,7 +117,7 @@ public static Vector<Aggregator> buildOutputs(OptionsCont options, Layer fromLay
117117
aggAllFrom, aggAllTo, fromLayer, fromAggLayer, toLayer, toAggLayer, writer, comment);
118118
aggregators.add(agg);
119119
} catch(IOException e) {
120-
throw new IOException("Exception '" + e.getMessage() + "' occured while building the stat-od-output.");
120+
throw new IOException("Exception '" + e.getMessage() + "' occurred while building the stat-od-output.");
121121
}
122122
}
123123
if (options.isSet("interchanges-output")) {
@@ -129,7 +129,7 @@ public static Vector<Aggregator> buildOutputs(OptionsCont options, Layer fromLay
129129
aggAllFrom, aggAllTo, fromLayer, fromAggLayer, toLayer, toAggLayer, writer, comment);
130130
aggregators.add(agg);
131131
} catch(IOException e) {
132-
throw new IOException("Exception '" + e.getMessage() + "' occured while building the interchanges-output.");
132+
throw new IOException("Exception '" + e.getMessage() + "' occurred while building the interchanges-output.");
133133
}
134134
}
135135
if (options.isSet("edges-output")) {
@@ -141,7 +141,7 @@ public static Vector<Aggregator> buildOutputs(OptionsCont options, Layer fromLay
141141
aggAllFrom, aggAllTo, fromLayer, fromAggLayer, toLayer, toAggLayer, writer, comment);
142142
aggregators.add(agg);
143143
} catch(IOException e) {
144-
throw new IOException("Exception '" + e.getMessage() + "' occured while building the edges-output.");
144+
throw new IOException("Exception '" + e.getMessage() + "' occurred while building the edges-output.");
145145
}
146146
}
147147
if (options.isSet("pt-output")) {
@@ -153,7 +153,7 @@ public static Vector<Aggregator> buildOutputs(OptionsCont options, Layer fromLay
153153
aggAllFrom, aggAllTo, fromLayer, fromAggLayer, toLayer, toAggLayer, writer, comment);
154154
aggregators.add(agg);
155155
} catch(IOException e) {
156-
throw new IOException("Exception '" + e.getMessage() + "' occured while building the pt-output.");
156+
throw new IOException("Exception '" + e.getMessage() + "' occurred while building the pt-output.");
157157
}
158158
}
159159
return aggregators;
@@ -183,7 +183,7 @@ public static DirectWriter buildDirectOutput(OptionsCont options, int epsg, Hash
183183
}
184184
return dw;
185185
} catch(IOException e) {
186-
throw new IOException("Exception '" + e.getMessage() + "' occured while building the direct-output.");
186+
throw new IOException("Exception '" + e.getMessage() + "' occurred while building the direct-output.");
187187
}
188188
}
189189

@@ -212,7 +212,7 @@ public static void writeEdgeAllocation(String outputName, OptionsCont options, H
212212
emw.writeResults(nearestEdges);
213213
emw.close();
214214
} catch(IOException e) {
215-
throw new IOException("Exception '" + e.getMessage() + "' occured while building the " + outputName + ".");
215+
throw new IOException("Exception '" + e.getMessage() + "' occurred while building the " + outputName + ".");
216216
}
217217
}
218218

‎tests/urmoac/input/csv/errors/point_duplicate_id/errors.urmoac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Duplicate object '1000' occured.
1+
Duplicate object '1000' occurred.
22
Objects could not be loaded.
33
Quitting on error...

‎tests/urmoac/input/csv/errors/polygons_duplicate_id/errors.urmoac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Duplicate object '1000' occured.
1+
Duplicate object '1000' occurred.
22
Objects could not be loaded.
33
Quitting on error...

‎tests/urmoac/input/wkt/errors/point_duplicate_id/errors.urmoac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Duplicate object '1000' occured.
1+
Duplicate object '1000' occurred.
22
Objects could not be loaded.
33
Quitting on error...

‎tests/urmoac/input/wkt/errors/polygons_duplicate_id/errors.urmoac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Duplicate object '1000' occured.
1+
Duplicate object '1000' occurred.
22
Objects could not be loaded.
33
Quitting on error...

‎tests/urmoac/output/zz_sqlite/simple_offset_existing/X2r_output/errors.urmoac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Exception 'org.sqlite.SQLiteException: [SQLITE_ERROR] SQL error or missing database (table test_o2r already exists)' occured while building the origins-to-road-output.
1+
Exception 'org.sqlite.SQLiteException: [SQLITE_ERROR] SQL error or missing database (table test_o2r already exists)' occurred while building the origins-to-road-output.
22
Quitting on error...

‎tests/urmoac/output/zz_sqlite/simple_offset_existing/direct_output/errors.urmoac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Exception 'org.sqlite.SQLiteException: [SQLITE_ERROR] SQL error or missing database (table test already exists)' occured while building the direct-output.
1+
Exception 'org.sqlite.SQLiteException: [SQLITE_ERROR] SQL error or missing database (table test already exists)' occurred while building the direct-output.
22
Quitting on error...

0 commit comments

Comments
 (0)