Index: /applications/editors/josm/plugins/surveyor/src/org/dinopolis/util/io/Tokenizer.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/org/dinopolis/util/io/Tokenizer.java	(revision 36491)
+++ /applications/editors/josm/plugins/surveyor/src/org/dinopolis/util/io/Tokenizer.java	(revision 36492)
@@ -251,16 +251,4 @@
 //----------------------------------------------------------------------
 /**
- * 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,5 +269,5 @@
   public String getDelimiters()
   {
-    return(delimiters_);
+    return delimiters_;
   }
 
@@ -303,5 +291,5 @@
   public int getEscapeChar()
   {
-    return(escapeChar_);
+    return escapeChar_;
   }
 
@@ -327,5 +315,5 @@
   public boolean respectEscapedCharacters()
   {
-    return(respectEscapedChars_);
+    return respectEscapedChars_;
   }
 
@@ -338,5 +326,5 @@
   public int getQuoteChar()
   {
-    return (quoteChar_);
+    return quoteChar_;
   }
 
@@ -373,5 +361,5 @@
   public boolean respectQuotedWords()
   {
-    return(respectQuotedWords_);
+    return respectQuotedWords_;
   }
 
@@ -402,5 +390,5 @@
   public boolean isEolSignificant()
   {
-    return(eolIsSignificant_);
+    return eolIsSignificant_;
   }
 
@@ -414,5 +402,5 @@
   public int getLineNumber()
   {
-    return(lineCount_);
+    return lineCount_;
   }
 
@@ -426,5 +414,5 @@
   public String getWord()
   {
-    return(buffer_.toString());
+    return buffer_.toString();
   }
 
@@ -437,5 +425,5 @@
   public int getLastToken()
   {
-    return(lastToken_);
+    return lastToken_;
   }
 
@@ -454,7 +442,7 @@
         // check for escape mode:
     if(escapeMode_)
-      return(false);
-
-    return(delimiters_.indexOf(character) >= 0);
+      return false;
+
+    return delimiters_.indexOf(character) >= 0;
   }
 
@@ -472,11 +460,11 @@
   {
     if(!respectQuotedWords_)
-      return(false);
+      return false;
 
         // check for escape mode:
     if(escapeMode_)
-      return(false);
-
-    return(character == quoteChar_);
+      return false;
+
+    return character == quoteChar_;
   }
 
@@ -493,11 +481,11 @@
   {
     if(!respectEscapedChars_)
-      return(false);
+      return false;
 
         // check for escape mode:
     if(escapeMode_)
-      return(false);
-
-    return(character == escapeChar_);
+      return false;
+
+    return character == escapeChar_;
   }
 
@@ -520,10 +508,10 @@
       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,5 +572,5 @@
       next_char = readNextChar();
     }
-    return(next_char);
+    return next_char;
   }
 
@@ -609,5 +597,5 @@
     {
       lastToken_ = EOF;
-      return(EOF);
+      return EOF;
     }
 
@@ -619,10 +607,10 @@
       {
         lastToken_ = EOL;
-        return(EOL);
+        return EOL;
       }
       else
       {
         lastToken_ = DELIMITER;
-        return(DELIMITER);
+        return DELIMITER;
       }
     }
@@ -632,5 +620,5 @@
     {
       lastToken_ = DELIMITER;
-      return(DELIMITER);
+      return DELIMITER;
     }
 
@@ -644,5 +632,5 @@
         {
           lastToken_ = ERROR;
-          return(ERROR);
+          return ERROR;
         }
         else
@@ -651,5 +639,5 @@
           {
             lastToken_ = QUOTED_WORD;
-            return(QUOTED_WORD);
+            return QUOTED_WORD;
           }
 
@@ -669,5 +657,5 @@
         reader_.unread(next_char);
         lastToken_ = WORD;
-        return(WORD);
+        return WORD;
       }
     }
@@ -685,5 +673,5 @@
   {
     if(lastToken_ == EOF)
-      return(false);
+      return false;
 
     if((lastToken_ == EOL) || (lastToken_ == NOT_STARTED))
@@ -691,9 +679,9 @@
       int next_char = readNextChar();
       if(next_char == -1)
-        return(false);
+        return false;
 
       reader_.unread(next_char);
     }
-    return(true);
+    return true;
   }
 
@@ -735,5 +723,5 @@
         case Tokenizer.EOF:
           list.add(word);
-          return(list);
+          return list;
         default:
           System.err.println("Unknown Token: "+token);
@@ -741,5 +729,5 @@
       token = nextToken();
     }
-//    return(list);
+//    return list;
   }
 
@@ -784,5 +772,5 @@
           new_list.add(value);
       }
-      return(new_list);
+      return new_list;
     }
 }
Index: /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/AutoSaveGpsLayerTimerTask.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/AutoSaveGpsLayerTimerTask.java	(revision 36491)
+++ /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/AutoSaveGpsLayerTimerTask.java	(revision 36492)
@@ -36,5 +36,5 @@
      * Constructor using the file to write to and the name of the layer.
      * @param filename the file to write to.
-     * @param gpsLayername the name of the layer holding the gps data.
+     * @param layerName the name of the layer holding the gps data.
      */
     public AutoSaveGpsLayerTimerTask(String filename, String layerName) {
Index: /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/ButtonDescription.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/ButtonDescription.java	(revision 36491)
+++ /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/ButtonDescription.java	(revision 36492)
@@ -48,5 +48,8 @@
     
     /**
-     * @param actions a list of actions to be performed.
+     * @param label label of the button
+     * @param hotkey Hotkey for the button action
+     * @param iconName name of the icon to display
+     * @param buttonAction the actions to be performed.
      * @param type if <code>null</code> {@link ButtonType#SINGLE} is used.
      */
@@ -56,5 +59,8 @@
 
     /**
-     * @param actions a list of actions to be performed.
+     * @param label label of the button
+     * @param hotkey Hotkey for the button action
+     * @param iconName name of the icon to display
+     * @param actionDescription the action to be performed.
      * @param type if <code>null</code> {@link ButtonType#SINGLE} is used.
      */
@@ -65,5 +71,5 @@
     /**
      * Helper method to create a list from one element.
-     * @param buttonActionClassName the action's class name.
+     * @param actionDescription the action's class name.
      * @return a list holding one ButtonActionDescription element.
      */
@@ -75,4 +81,7 @@
 
     /**
+     * @param label label of the button
+     * @param hotkey Hotkey for the button action
+     * @param iconName name of the icon to display
      * @param actions a list of actions to be performed.
      * @param type if <code>null</code> {@link ButtonType#SINGLE} is used.
Index: /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/MetaAction.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/MetaAction.java	(revision 36491)
+++ /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/MetaAction.java	(revision 36492)
@@ -67,8 +67,8 @@
         // toggle on/off
         Boolean selected = (Boolean) getValue(ActionConstants.SELECTED_KEY);
-        if (selected == null || selected == Boolean.FALSE) {
-            selected = Boolean.TRUE;
+        if (selected == null || selected == false) {
+            selected = true;
         } else {
-            selected = Boolean.FALSE;
+            selected = false;
         }
         putValue(ActionConstants.SELECTED_KEY, selected);
Index: /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/SurveyorShowAction.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/SurveyorShowAction.java	(revision 36491)
+++ /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/SurveyorShowAction.java	(revision 36492)
@@ -33,6 +33,6 @@
 
 /**
+ * Show Surveyor menu
  * @author cdaller
- *
  */
 public class SurveyorShowAction extends JosmAction {
@@ -77,5 +77,5 @@
                 public void actionPerformed(ActionEvent e) {
                     if (MainApplication.getMap() != null && MainApplication.getMap().mapView != null) {
-                        MainApplication.getMap().mapView.zoomToFactor(1/2);
+                        MainApplication.getMap().mapView.zoomToFactor(0.5);
                     }
                 }
Index: /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/action/AbstractSurveyorAction.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/action/AbstractSurveyorAction.java	(revision 36491)
+++ /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/action/AbstractSurveyorAction.java	(revision 36492)
@@ -7,6 +7,6 @@
 
 /**
+ * Abstract base action
  * @author cdaller
- *
  */
 public abstract class AbstractSurveyorAction implements SurveyorAction {
Index: /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/action/BeepAction.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/action/BeepAction.java	(revision 36491)
+++ /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/action/BeepAction.java	(revision 36492)
@@ -11,6 +11,6 @@
 
 /**
+ * Action to issue a Beep
  * @author cdaller
- *
  */
 public class BeepAction implements SurveyorAction {
Index: /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/action/ConsolePrinterAction.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/action/ConsolePrinterAction.java	(revision 36491)
+++ /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/action/ConsolePrinterAction.java	(revision 36492)
@@ -6,6 +6,6 @@
 
 /**
+ * Action to print coordinates to standard output
  * @author cdaller
- *
  */
 public class ConsolePrinterAction extends AbstractSurveyorAction {
Index: /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/action/SystemExecuteAction.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/action/SystemExecuteAction.java	(revision 36491)
+++ /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/action/SystemExecuteAction.java	(revision 36492)
@@ -12,6 +12,6 @@
 
 /**
+ * Action class to execute GPS system command
  * @author cdaller
- *
  */
 public class SystemExecuteAction extends AbstractSurveyorAction {
Index: /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/action/TaggingPresetAction.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/action/TaggingPresetAction.java	(revision 36491)
+++ /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/action/TaggingPresetAction.java	(revision 36492)
@@ -13,6 +13,6 @@
 
 /**
+ * Tagging action
  * @author cdaller
- *
  */
 public class TaggingPresetAction implements SurveyorAction {
Index: /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/action/gui/DialogClosingThread.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/action/gui/DialogClosingThread.java	(revision 36491)
+++ /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/action/gui/DialogClosingThread.java	(revision 36492)
@@ -15,6 +15,6 @@
 
 /**
+ * Thread for dialog closing
  * @author cdaller
- *
  */
 public class DialogClosingThread extends Thread implements KeyListener, DocumentListener {
Index: /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/action/gui/WaypointDialog.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/action/gui/WaypointDialog.java	(revision 36491)
+++ /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/action/gui/WaypointDialog.java	(revision 36492)
@@ -8,6 +8,6 @@
 
 /**
+ * Dialog for waypoints
  * @author cdaller
- *
  */
 public class WaypointDialog {
Index: /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/util/LayerUtil.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/util/LayerUtil.java	(revision 36491)
+++ /applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/util/LayerUtil.java	(revision 36492)
@@ -6,6 +6,6 @@
 
 /**
+ * Utility class for layer handling
  * @author cdaller
- *
  */
 public final class LayerUtil {