Changeset 36492 in osm for applications/editors/josm/plugins/surveyor/src/org/dinopolis

Timestamp:

2026-02-16T13:56:08+01:00 (3 months ago)

Author:

stoecker

Message:

fix compiler error and warnings

File:

• applications/editors/josm/plugins/surveyor/src/org/dinopolis/util/io/Tokenizer.java (modified) (26 diffs)

applications/editors/josm/plugins/surveyor/src/org/dinopolis/util/io/Tokenizer.java

@@ -251 +251 @@
 //----------------------------------------------------------------------
 /**
- * Get the first delimiter character.
- *
- * @return the delimiter character.
- * @deprecated use the getDelimiters() method now
- */
-  public int getDelimiter()
-  {
-    return(delimiters_.charAt(0));
-  }
-
-//----------------------------------------------------------------------
-/**
  * Set the delimiter characters. All characters in the delimiters are
  * used as delimiter.
@@ -281 +269 @@
   public String getDelimiters()
   {
-    return(delimiters_);
+    return delimiters_;
   }
 
@@ -303 +291 @@
   public int getEscapeChar()
   {
-    return(escapeChar_);
+    return escapeChar_;
   }
 
@@ -327 +315 @@
   public boolean respectEscapedCharacters()
   {
-    return(respectEscapedChars_);
+    return respectEscapedChars_;
   }
 
@@ -338 +326 @@
   public int getQuoteChar()
   {
-    return (quoteChar_);
+    return quoteChar_;
   }
 
@@ -373 +361 @@
   public boolean respectQuotedWords()
   {
-    return(respectQuotedWords_);
+    return respectQuotedWords_;
   }
 
@@ -402 +390 @@
   public boolean isEolSignificant()
   {
-    return(eolIsSignificant_);
+    return eolIsSignificant_;
   }
 
@@ -414 +402 @@
   public int getLineNumber()
   {
-    return(lineCount_);
+    return lineCount_;
   }
 
@@ -426 +414 @@
   public String getWord()
   {
-    return(buffer_.toString());
+    return buffer_.toString();
   }
 
@@ -437 +425 @@
   public int getLastToken()
   {
-    return(lastToken_);
+    return lastToken_;
   }
 
@@ -454 +442 @@
         // check for escape mode:
     if(escapeMode_)
-      return(false);
-
-    return(delimiters_.indexOf(character) >= 0);
+      return false;
+
+    return delimiters_.indexOf(character) >= 0;
   }
 
@@ -472 +460 @@
   {
     if(!respectQuotedWords_)
-      return(false);
+      return false;
 
         // check for escape mode:
     if(escapeMode_)
-      return(false);
-
-    return(character == quoteChar_);
+      return false;
+
+    return character == quoteChar_;
   }
 
@@ -493 +481 @@
   {
     if(!respectEscapedChars_)
-      return(false);
+      return false;
 
         // check for escape mode:
     if(escapeMode_)
-      return(false);
-
-    return(character == escapeChar_);
+      return false;
+
+    return character == escapeChar_;
   }
 
@@ -520 +508 @@
       if(character == '\n')   // add line count, even if in escape mode!
         lineCount_++;
-      return(false);
+      return false;
     }
     if(character == -1)
       eofReached_ = true;
 
-    return((character=='\n') || (character=='\r') || (character == -1));
+    return (character=='\n') || (character=='\r') || (character == -1);
   }
 
@@ -584 +572 @@
       next_char = readNextChar();
     }
-    return(next_char);
+    return next_char;
   }
 
@@ -609 +597 @@
     {
       lastToken_ = EOF;
-      return(EOF);
+      return EOF;
     }
 
@@ -619 +607 @@
       {
         lastToken_ = EOL;
-        return(EOL);
+        return EOL;
       }
       else
       {
         lastToken_ = DELIMITER;
-        return(DELIMITER);
+        return DELIMITER;
       }
     }
@@ -632 +620 @@
     {
       lastToken_ = DELIMITER;
-      return(DELIMITER);
+      return DELIMITER;
     }
 
@@ -644 +632 @@
         {
           lastToken_ = ERROR;
-          return(ERROR);
+          return ERROR;
         }
         else
@@ -651 +639 @@
           {
             lastToken_ = QUOTED_WORD;
-            return(QUOTED_WORD);
+            return QUOTED_WORD;
           }
 
@@ -669 +657 @@
         reader_.unread(next_char);
         lastToken_ = WORD;
-        return(WORD);
+        return WORD;
       }
     }
@@ -685 +673 @@
   {
     if(lastToken_ == EOF)
-      return(false);
+      return false;
 
     if((lastToken_ == EOL) || (lastToken_ == NOT_STARTED))
@@ -691 +679 @@
       int next_char = readNextChar();
       if(next_char == -1)
-        return(false);
+        return false;
 
       reader_.unread(next_char);
     }
-    return(true);
+    return true;
   }
 
@@ -735 +723 @@
         case Tokenizer.EOF:
           list.add(word);
-          return(list);
+          return list;
         default:
           System.err.println("Unknown Token: "+token);
@@ -741 +729 @@
       token = nextToken();
     }
-//    return(list);
+//    return list;
   }
 
@@ -784 +772 @@
           new_list.add(value);
       }
-      return(new_list);
+      return new_list;
     }
 }