code cleanup

src/org/openstreetmap/josm/plugins/conflation/ConflationPlugin.java

@@ -7,6 +7,9 @@
 import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.spi.preferences.Config;
 
+/**
+ * Conflation plugin.
+ */
 public class ConflationPlugin extends Plugin {
 
     /**

src/org/openstreetmap/josm/plugins/conflation/ConflationToggleDialog.java

@@ -82,9 +82,13 @@
 import org.openstreetmap.josm.plugins.conflation.config.SettingsDialog;
 import org.openstreetmap.josm.spi.preferences.IPreferences;
 import org.openstreetmap.josm.tools.InputMapUtils;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.xml.sax.SAXException;
 
+/**
+ * Conflation dialog.
+ */
 public class ConflationToggleDialog extends ToggleDialog
 implements DataSelectionListener, DataSetListener, SimpleMatchListListener, LayerChangeListener {
 
@@ -130,8 +134,6 @@ protected void buttonAction(int buttonIndex, ActionEvent evt) {
                             ConflationToggleDialog.this.settings = this.getSettings();
                             ConflationToggleDialog.this.settingsDialog.savePreferences(pref);
                             ConflationToggleDialog.this.performMatching();
-                        } else {
-                            // do nothing
                         }
                     } else {
                         super.buttonAction(buttonIndex, evt);
@@ -441,7 +443,9 @@ private void setListsContentAddListnersAndLayer(SimpleMatchList matchList,
                 MainApplication.getLayerManager().addLayer(conflationLayer);
             }
         } catch (Exception ex) {
-            JOptionPane.showMessageDialog(MainApplication.getMainFrame(), ex.toString(), "Error adding conflation layer", JOptionPane.ERROR_MESSAGE);
+            Logging.error(ex);
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(), ex.toString(),
+                    "Error adding conflation layer", JOptionPane.ERROR_MESSAGE);
         }
         if (conflationLayer != null) {
             conflationLayer.setMatches(matches);

src/org/openstreetmap/josm/plugins/conflation/ConflationUtils.java

@@ -15,6 +15,9 @@
 import org.openstreetmap.josm.data.osm.visitor.MergeSourceBuildingVisitor;
 import org.openstreetmap.josm.gui.MainApplication;
 
+/**
+ * Utilities class.
+ */
 public final class ConflationUtils {
 
     private ConflationUtils() {}

src/org/openstreetmap/josm/plugins/conflation/MatchesComputation.java

@@ -162,7 +162,5 @@ public void allowCancellationRequests() {
         public boolean isCancelRequested() {
             return josmMonitor.isCanceled();
         }
-
     }
-
 }

src/org/openstreetmap/josm/plugins/conflation/SimpleMatchListListener.java

@@ -24,5 +24,4 @@ public interface SimpleMatchListListener {
      * @param list The new list.
      */
     void simpleMatchListIntervalRemoved(SimpleMatchList list, int firstRow, int lastRow);
-
 }

src/org/openstreetmap/josm/plugins/conflation/SimpleMatchSettings.java

@@ -43,7 +43,6 @@ public class SimpleMatchSettings {
      */
     public Collection<String> overwriteTags;
 
-
     /**
      * A Collection that always answer true when asked if it contains any object (except for the removed items!).
      */

src/org/openstreetmap/josm/plugins/conflation/command/ConflateMatchCommand.java

@@ -41,7 +41,6 @@
 import org.openstreetmap.josm.tools.UserCancelException;
 import org.openstreetmap.josm.tools.Utils;
 
-
 /**
  * Command to conflate one object with another.
  */

src/org/openstreetmap/josm/plugins/conflation/config/AdvancedMatchFinderPanel.java

@@ -49,7 +49,6 @@
 import com.vividsolutions.jcs.conflate.polygonmatch.WindowFilter;
 import com.vividsolutions.jcs.plugin.conflate.polygonmatch.MyValidatingTextField;
 
-
 /**
  * This advanced panel is a modified version of the original code
  * from Vivd Solutions for the JUMP JCS Plugin ToolboxPanel.java.

src/org/openstreetmap/josm/plugins/conflation/config/MatchFinderPanel.java

@@ -12,5 +12,4 @@ public abstract class MatchFinderPanel extends JPanel {
     public abstract FCMatchFinder getMatchFinder();
 
     public abstract void savePreferences(IPreferences pref);
-
 }

src/org/openstreetmap/josm/plugins/conflation/config/ProgrammingMatchFinderPanel.java

@@ -17,7 +17,6 @@
 import com.vividsolutions.jcs.conflate.polygonmatch.FCMatchFinder;
 import com.vividsolutions.jcs.conflate.polygonmatch.FeatureMatcher;
 
-
 /**
  * Programming Match Finder Panel.
  * Allow user to directly enter a constructor expression.

src/org/openstreetmap/josm/plugins/conflation/config/SettingsDialog.java

@@ -266,7 +266,6 @@ private Border createLightTitleBorder(String title) {
         return new CompoundBorder(tileBorder, emptyBorder);
     }
 
-
     public boolean checkValidityOrNotifyProblems() {
         if (referenceSelection.isEmpty() || subjectSelection.isEmpty()) {
             JOptionPane.showMessageDialog(MainApplication.getMainFrame(),

src/org/openstreetmap/josm/plugins/conflation/matcher/AccentlessNormalizeRule.java

@@ -13,5 +13,4 @@ public class AccentlessNormalizeRule implements NormalizeRule {
     public String normalize(String value) {
         return Normalizer.normalize(value, Normalizer.Form.NFD).replaceAll("\\p{M}", "");
     }
-
 }

src/org/openstreetmap/josm/plugins/conflation/matcher/ExactValueMatcher.java

@@ -9,5 +9,4 @@ public class ExactValueMatcher implements ValueMatcher {
     public double match(String target, String candidate) {
         return target.equals(candidate) ? 1.0 : 0.0;
     }
-
 }

src/org/openstreetmap/josm/plugins/conflation/matcher/LowerCaseNormalizeRule.java

@@ -1,6 +1,8 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.conflation.matcher;
 
+import java.util.Locale;
+
 import org.openstreetmap.josm.data.validation.tests.SimilarNamedWays.NormalizeRule;
 
 public class LowerCaseNormalizeRule implements NormalizeRule {
@@ -9,7 +11,6 @@ public class LowerCaseNormalizeRule implements NormalizeRule {
 
     @Override
     public String normalize(String t) {
-        return t.toLowerCase();
+        return t.toLowerCase(Locale.ENGLISH);
     }
-
 }

src/org/openstreetmap/josm/plugins/conflation/matcher/NoneNormalizeRule.java

@@ -9,5 +9,4 @@ public class NoneNormalizeRule implements NormalizeRule {
     public String normalize(String value) {
         return value;
     }
-
 }

src/org/openstreetmap/josm/plugins/conflation/matcher/ValueMatcher.java

@@ -9,5 +9,4 @@ public interface ValueMatcher {
      * @return matching score (between 0.0 and 1.0)
      */
     double match(String target, String candidate);
-
 }