Index: /applications/editors/josm/plugins/lakewalker/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- /applications/editors/josm/plugins/lakewalker/.settings/org.eclipse.jdt.ui.prefs	(revision 32911)
+++ /applications/editors/josm/plugins/lakewalker/.settings/org.eclipse.jdt.ui.prefs	(revision 32912)
@@ -1,3 +1,2 @@
-#Sun Jan 24 21:18:20 CET 2010
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
@@ -9,4 +8,5 @@
 sp_cleanup.add_missing_nls_tags=false
 sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
 sp_cleanup.add_serial_version_id=false
 sp_cleanup.always_use_blocks=true
@@ -14,8 +14,10 @@
 sp_cleanup.always_use_this_for_non_static_field_access=false
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.correct_indentation=false
 sp_cleanup.format_source_code=false
 sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.make_local_variable_final=false
 sp_cleanup.make_parameters_final=false
@@ -33,4 +35,5 @@
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=true
 sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true
@@ -38,5 +41,5 @@
 sp_cleanup.remove_unnecessary_casts=true
 sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_imports=true
 sp_cleanup.remove_unused_local_variables=false
 sp_cleanup.remove_unused_private_fields=true
@@ -46,6 +49,8 @@
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=false
 sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
 sp_cleanup.use_this_for_non_static_field_access=false
Index: /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/BooleanConfigurer.java
===================================================================
--- /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/BooleanConfigurer.java	(revision 32911)
+++ /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/BooleanConfigurer.java	(revision 32912)
@@ -65,4 +65,5 @@
             box.setSelected(booleanValue().booleanValue());
             box.addItemListener(new java.awt.event.ItemListener() {
+                @Override
                 public void itemStateChanged(java.awt.event.ItemEvent e) {
                     setValue(box.isSelected());
Index: /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/DoubleConfigurer.java
===================================================================
--- /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/DoubleConfigurer.java	(revision 32911)
+++ /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/DoubleConfigurer.java	(revision 32912)
@@ -12,5 +12,5 @@
 
     public DoubleConfigurer(String key, String name) {
-        this(key, name, new Double(0));
+        this(key, name, 0d);
     }
 
Index: /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java
===================================================================
--- /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java	(revision 32911)
+++ /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java	(revision 32912)
@@ -58,4 +58,5 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         if (Main.map == null || Main.map.mapView == null || active)
@@ -83,9 +84,5 @@
 
                 // sort files by date (most recent first)
-                Arrays.sort(wmsCache, new Comparator<File>() {
-                    public int compare(File f1, File f2) {
-                        return (int) (f2.lastModified()-f1.lastModified());
-                    }
-                });
+                Arrays.sort(wmsCache, Comparator.comparingLong(File::lastModified));
 
                 // delete aged or oversized, keep newest. Once size/age limit was reached delete all older files
@@ -296,4 +293,5 @@
     }
 
+    @Override
     public void mouseClicked(MouseEvent e) {
         if (active) {
@@ -305,13 +303,17 @@
     }
 
+    @Override
     public void mouseEntered(MouseEvent e) {
     }
 
+    @Override
     public void mouseExited(MouseEvent e) {
     }
 
+    @Override
     public void mousePressed(MouseEvent e) {
     }
 
+    @Override
     public void mouseReleased(MouseEvent e) {
     }
Index: /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java
===================================================================
--- /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java	(revision 32911)
+++ /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java	(revision 32912)
@@ -73,5 +73,7 @@
     }
 
+    @Override
     public void addGui(PreferenceTabbedPane gui) {
+        //CHECKSTYLE.OFF: LineLength
         maxSegsConfig.setToolTipText(tr("Maximum number of segments allowed in each generated way. Default 250."));
         maxNodesConfig.setToolTipText(tr("Maximum number of nodes to generate before bailing out (before simplifying lines). Default 50000."));
@@ -88,4 +90,5 @@
         maxCacheAgeConfig.setToolTipText(tr("Maximum age of each cached file in days. Default is 100"));
         sourceConfig.setToolTipText(tr("Data source text. Default is Landsat."));
+        //CHECKSTYLE.ON: LineLength
 
         /*String description =*/ tr("A plugin to trace water bodies on Landsat imagery.");
@@ -148,4 +151,5 @@
     * Save entered preference values on OK button
     */
+    @Override
     public boolean ok() {
         Main.pref.put(PREF_MAX_SEG, maxSegsConfig.getValueString());
Index: /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/StringEnumConfigurer.java
===================================================================
--- /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/StringEnumConfigurer.java	(revision 32911)
+++ /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/StringEnumConfigurer.java	(revision 32912)
@@ -50,4 +50,5 @@
             setValue(value);
             box.addActionListener(new ActionListener() {
+                @Override
                 public void actionPerformed(ActionEvent e) {
                     noUpdate = true;