Caldavsync Sources: comparison src/net/fortuna/ical4j/data/CalendarParserImpl.java

-:673420b71fc4
+:16af7597b777
 componentParser.parse(tokeniser, in, handler);
 }
 else {
 propertyParser.parse(tokeniser, in, handler);
 }
-absorbWhitespace(tokeniser);
+absorbWhitespace(tokeniser, in);
 // assertToken(tokeniser, StreamTokenizer.TT_WORD);
 }
 }
 }
 // DQUOTE is ordinary char for property value
 // From sec 4.3.11 of rfc-2445:
 // text       = *(TSAFE-CHAR / ":" / DQUOTE / ESCAPED-CHAR)
 //
 tokeniser.ordinaryChar('"');
-int nextToken = tokeniser.nextToken();
+int nextToken = nextToken(tokeniser, in);
-while (nextToken != StreamTokenizer.TT_EOL
+while (nextToken != StreamTokenizer.TT_EOL) {
-&& nextToken != StreamTokenizer.TT_EOF) {
 if (tokeniser.ttype == StreamTokenizer.TT_WORD) {
 value.append(tokeniser.sval);
 }
 else {
 value.append((char) tokeniser.ttype);
 }
-nextToken = tokeniser.nextToken();
+nextToken = nextToken(tokeniser, in);
 }
 // reset DQUOTE to be quote char
 tokeniser.quoteChar('"');
-if (nextToken == StreamTokenizer.TT_EOF) {
-throw new ParserException("Unexpected end of file",
-getLineNumber(tokeniser, in));
-}
 try {
 handler.propertyValue(value.toString());
 }
 catch (ParseException e) {
 final ParseException eNew = new ParseException("[" + name + "] "
 public void parse(final StreamTokenizer tokeniser, Reader in,
 final ContentHandler handler) throws IOException, ParserException,
 URISyntaxException {
-while (tokeniser.nextToken() == ';') {
+while (nextToken(tokeniser, in) == ';') {
 paramParser.parse(tokeniser, in, handler);
 }
 }
 }
 assertToken(tokeniser, in, '=');
 final StringBuffer paramValue = new StringBuffer();
 // preserve quote chars..
-if (tokeniser.nextToken() == '"') {
+if (nextToken(tokeniser, in) == '"') {
 paramValue.append('"');
 paramValue.append(tokeniser.sval);
 paramValue.append('"');
 }
 else if (tokeniser.sval != null) {
 paramValue.append(tokeniser.sval);
 // check for additional words to account for equals (=) in param-value
-int nextToken = tokeniser.nextToken();
+int nextToken = nextToken(tokeniser, in);
 while (nextToken != ';' && nextToken != ':' && nextToken != ',') {
 if (tokeniser.ttype == StreamTokenizer.TT_WORD) {
 paramValue.append(tokeniser.sval);
 }
 else {
 	paramValue.append((char) tokeniser.ttype);
 }
-nextToken = tokeniser.nextToken();
+nextToken = nextToken(tokeniser, in);
 }
 tokeniser.pushBack();
 } else if(tokeniser.sval == null) {
 	tokeniser.pushBack();
 }
 final ContentHandler handler) throws IOException, ParseException,
 URISyntaxException, ParserException {
 while (Component.BEGIN.equals(tokeniser.sval)) {
 componentParser.parse(tokeniser, in, handler);
-absorbWhitespace(tokeniser);
+absorbWhitespace(tokeniser, in);
 // assertToken(tokeniser, StreamTokenizer.TT_WORD);
 }
 }
 }
 * @throws ParserException when next token in the stream does not match the expected token
 */
 private void assertToken(final StreamTokenizer tokeniser, Reader in, final int token)
 throws IOException, ParserException {
-if (tokeniser.nextToken() != token) {
+if (nextToken(tokeniser, in) != token) {
 throw new ParserException(MessageFormat.format(UNEXPECTED_TOKEN_MESSAGE, new Object[] {
 new Integer(token), new Integer(tokeniser.ttype),
 }), getLineNumber(tokeniser, in));
 }
 /**
 * Absorbs extraneous newlines.
 * @param tokeniser
 * @throws IOException
 */
-private void absorbWhitespace(final StreamTokenizer tokeniser) throws IOException {
+private void absorbWhitespace(final StreamTokenizer tokeniser, Reader in) throws IOException, ParserException {
 // HACK: absorb extraneous whitespace between components (KOrganizer)..
-while (tokeniser.nextToken() == StreamTokenizer.TT_EOL) {
+while (nextToken(tokeniser, in) == StreamTokenizer.TT_EOL) {
 if (log.isTraceEnabled()) {
 log.trace("Absorbing extra whitespace..");
 }
 }
 if (log.isTraceEnabled()) {
 final int unfolded = ((UnfoldingReader) in).getLinesUnfolded();
 line += unfolded;
 }
 return line;
 }
+/**
+* Reads the next token from the tokeniser.
+* This method throws a ParseException when reading EOF.
+* @param tokeniser
+* @param in
+* @return
+* @throws ParseException When reading EOF.
+*/
+private int nextToken(StreamTokenizer tokeniser, Reader in) throws IOException, ParserException {
+int token = tokeniser.nextToken();
+if (token == StreamTokenizer.TT_EOF) {
+throw new ParserException("Unexpected end of file", getLineNumber(tokeniser, in));
+}
+return token;
+}
 }

Caldavsync Sources / file comparison

comparison: src/net/fortuna/ical4j/data/CalendarParserImpl.java

src/net/fortuna/ical4j/data/CalendarParserImpl.java