Changeset 32787 in osm

Timestamp:

2016-08-09T01:06:50+02:00 (8 years ago)

Author:

donvip

Message:

checkstyle

Location:

applications/editors/josm/plugins/mapdust

Files:

• .checkstyle (added)
• .classpath (modified) (1 diff)
• .project (modified) (1 diff)
• README (modified) (1 diff)
• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/MapdustLayer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/gui/MapdustActionUploader.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/gui/MapdustGUI.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/gui/action/adapter/WindowClose.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteFilterBug.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteRefresh.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/gui/action/show/ShowReOpenBugAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/AbstractDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/CommentBugDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/FilterBugDialog.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/mapdust/gui/component/model/CommentListModel.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustActionPanel.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugListPanel.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/gui/component/renderer/BugListCellRenderer.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/mapdust/gui/component/renderer/ComboBoxRenderer.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/gui/component/slider/RelevanceSlider.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/mapdust/gui/component/slider/RelevanceSliderUI.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/mapdust/gui/component/util/ComponentUtil.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustActionObservable.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustActionObserver.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustBugDetailsObservable.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustBugDetailsObserver.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustBugObservable.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustBugObserver.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustUpdateObservable.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustUpdateObserver.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/gui/value/MapdustPluginState.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/gui/value/MapdustRelevanceValue.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/gui/value/MapdustServiceCommand.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/mapdust/service/MapdustConverter.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/service/connector/MapdustConnector.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/service/connector/MapdustConnectorException.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/GeneralContent.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/Geometry.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustBugContent.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustBugProperties.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustCommentProperties.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustGetBugResponse.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustGetBugsResponse.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustGetResponse.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustPostResponse.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/mapdust/service/value/MapdustResponseStatusCode.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/service/value/RelevanceRange.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/util/Configuration.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapdust/util/http/HttpConnector.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/mapdust/util/retry/RetryAgent.java (modified) (6 diffs)
• src/org/openstreetmap/josm/plugins/mapdust/util/retry/RetryMode.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/mapdust/util/retry/RetrySetup.java (modified) (1 diff)

applications/editors/josm/plugins/mapdust/.classpath

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-        <classpathentry kind="src" path="src"/>
-        <classpathentry including="conf/|images/" kind="src" path=""/>
-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
-        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-GSON"/>
-        <classpathentry kind="output" path="build/classes"/>
+    <classpathentry kind="src" path="src"/>
+    <classpathentry excluding="build|data" including="conf/|images/" kind="src" path=""/>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+    <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+    <classpathentry combineaccessrules="false" kind="src" path="/JOSM-GSON"/>
+    <classpathentry kind="output" path="build/classes"/>
 </classpath>

applications/editors/josm/plugins/mapdust/.project

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-        <name>JOSM-mapdust</name>
-        <comment></comment>
-        <projects>
-        </projects>
-        <buildSpec>
-                <buildCommand>
-                        <name>org.eclipse.jdt.core.javabuilder</name>
-                        <arguments>
-                        </arguments>
-                </buildCommand>
-                <buildCommand>
-                        <name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
-                        <arguments>
-                        </arguments>
-                </buildCommand>
-        </buildSpec>
-        <natures>
-                <nature>org.eclipse.jdt.core.javanature</nature>
-        </natures>
+    <name>JOSM-mapdust</name>
+    <comment></comment>
+    <projects>
+    </projects>
+    <buildSpec>
+        <buildCommand>
+            <name>org.eclipse.jdt.core.javabuilder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+        <buildCommand>
+            <name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+        <buildCommand>
+            <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+    </buildSpec>
+    <natures>
+        <nature>org.eclipse.jdt.core.javanature</nature>
+        <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+    </natures>
 </projectDescription>

applications/editors/josm/plugins/mapdust/README

@@ -2 +2 @@
 in order to help to improve the Open Street Map.
 The MapDust plugin contains the following features:
-        - viewing the Bug Reports on the current area
-        - viewing the details of a given Bug report
-        - creating a new Bug Report
-        - commenting a new Bug Report
-        - closing a given Bug Report
-        - re-opening a given Bug Report
-        - invalidating a given Bug Report
-        - working in online and offline mode
-        
+    - viewing the Bug Reports on the current area
+    - viewing the details of a given Bug report
+    - creating a new Bug Report
+    - commenting a new Bug Report
+    - closing a given Bug Report
+    - re-opening a given Bug Report
+    - invalidating a given Bug Report
+    - working in online and offline mode
+
 * This plugin was created by Beata Jancso <beata.jancso@skobbler.com> .
 * This plugin is licensed under the GNU GPL v3 or later. See GPL-v3,0.txt for 
   more details.
-     
+    

applications/editors/josm/plugins/mapdust/build.xml

@@ -13 +13 @@
     <import file="../build-common.xml"/>
   
-        <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
+    <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
         <include name="gson.jar"/>
     </fileset>

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustLayer.java

@@ -279 +279 @@
         DateFormat df = DateFormat.getDateInstance(DateFormat.DEFAULT,
                 Locale.getDefault());
-        String text = "<html><b>Type:</b> " + bug.getType().getValue() ;
+        String text = "<html><b>Type:</b> " + bug.getType().getValue();
         text += "<br/>";
         text += "<b>Status:</b> " + bug.getStatus().getValue() + "<br/>";
@@ -287 +287 @@
         text += "<b>Created on:</b> " + df.format(bug.getDateCreated());
         text += "<br/>";
-        text += "<b>Last modified on:</b> "+ df.format(bug.getDateUpdated()) ;
+        text += "<b>Last modified on:</b> "+ df.format(bug.getDateUpdated());
         text += "<br/>";
         text += "<b>Comments:</b> " + bug.getNumberOfComments();

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java

@@ -133 +133 @@
         Main.pref.put("mapdust.showError", true);
         Main.pref.put("mapdust.version", getPluginInformation().version);
-        Main.pref.put("mapdust.localVersion",getPluginInformation().localversion);
+        Main.pref.put("mapdust.localVersion", getPluginInformation().localversion);
         Main.pref.addPreferenceChangeListener(this);
     }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/MapdustActionUploader.java

@@ -42 +42 @@
  * @version $Revision$
  */
-public class MapdustActionUploader {
+public final class MapdustActionUploader {
 
     /** The <code>MapdustActionUploader</code> instance */

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/MapdustGUI.java

@@ -248 +248 @@
             }
             List<MapdustAction> actionList = actionPanel != null ?
-                    actionPanel.getActionList() : new ArrayList<MapdustAction>();
+                    actionPanel.getActionList() : new ArrayList<>();
 
             /* update panels */

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/adapter/WindowClose.java

@@ -63 +63 @@
      * @param btnPanel The button panel
      */
-    public WindowClose(AbstractDialog dialog, MapdustButtonPanel btnPanel ) {
+    public WindowClose(AbstractDialog dialog, MapdustButtonPanel btnPanel) {
         this.dialog = dialog;
         this.btnPanel = btnPanel;

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java

@@ -130 +130 @@
                     mapdustGUI.enableBtnPanel(true);
                     issueDialog.dispose();
-                    if (getMapdustGUI().getActionPanel()!= null) {
+                    if (getMapdustGUI().getActionPanel() != null) {
                         notifyObservers(mapdustAction);
                     }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteFilterBug.java

@@ -98 +98 @@
                 boolean descr = dialog.isDescrFilterChecked();
                 MapdustRelevance minValue = dialog.getSelectedMinRelevance();
-                MapdustRelevance maxValue= dialog.getSelectedMaxRelevance();
+                MapdustRelevance maxValue = dialog.getSelectedMaxRelevance();
                 /* notifies the observers about the filters */
                 notifyObservers(new MapdustBugFilter(statuses, types, descr,

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteRefresh.java

@@ -58 +58 @@
 
     /**
-     * Builds a <code>EexecuteRefresh<code> object
+     * Builds a <code>EexecuteRefresh</code> object
      */
     public ExecuteRefresh() {}

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java

@@ -109 +109 @@
                         } catch (MapdustActionUploaderException e) {
                             String errorMessage = "There was a Mapdust service";
-                            errorMessage+=" error.";
+                            errorMessage += " error.";
                             JOptionPane.showMessageDialog(Main.parent,
                                     tr(errorMessage), tr("Error"),

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/show/ShowReOpenBugAction.java

@@ -80 +80 @@
                 btn = (JToggleButton) event.getSource();
                 btn.setSelected(true);
-            } if (event.getSource() instanceof JMenuItem){
+            }
+            if (event.getSource() instanceof JMenuItem) {
                 getButtonPanel().getBtnReOpenBugReport().setSelected(true);
             }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/AbstractDialog.java

@@ -71 +71 @@
         this.firedButton = firedButton;
     }
-
 }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/CommentBugDialog.java

@@ -244 +244 @@
         return btnOk;
     }
-
 }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/dialog/FilterBugDialog.java

@@ -66 +66 @@
  */
 public class FilterBugDialog extends AbstractDialog {
-    org.openstreetmap.josm.plugins.mapdust.service.value.BugType ttt=org.openstreetmap.josm.plugins.mapdust.service.value.BugType.WRONG_TURN;
+    org.openstreetmap.josm.plugins.mapdust.service.value.BugType ttt = org.openstreetmap.josm.plugins.mapdust.service.value.BugType.WRONG_TURN;
 
     /** The serial version UID */
@@ -292 +292 @@
                         25));
         /* oneway_road type */
-        filterTypes[2] =  new FilterCheckBox(BugType.MISSING_STREET.getKey(),
+        filterTypes[2] = new FilterCheckBox(BugType.MISSING_STREET.getKey(),
                 new Rectangle(110, 125, 20, 25), "dialogs/missing_street.png",
                 BugType.MISSING_STREET.getValue(), new Rectangle(130, 125, 150,

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/model/CommentListModel.java

@@ -90 +90 @@
     @Override
     public void addListDataListener(ListDataListener l) {}
-
 }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustActionPanel.java

@@ -84 +84 @@
      * @param mapdustPlugin The <code>MapdustPlugin</code> object
      */
-    private void addComponents(List<MapdustAction> list,
-            MapdustPlugin mapdustPlugin) {
+    private void addComponents(List<MapdustAction> list, MapdustPlugin mapdustPlugin) {
         /* create components */
-        AbstractAction action = new ExecuteActionList
-        (mapdustPlugin.getMapdustGUI());
+        AbstractAction action = new ExecuteActionList(mapdustPlugin.getMapdustGUI());
         JToggleButton btnUpload = ComponentUtil.createJButton("Upload list data",
                 null, null, action);

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugListPanel.java

@@ -163 +163 @@
             String text = " No bugs in the current view for the selected";
             text += " filters!";
-            JList<String> textJList = new JList<>(new String[] { text });
+            JList<String> textJList = new JList<>(new String[] {text});
             textJList.setBorder(new LineBorder(Color.black, 1, false));
             textJList.setCellRenderer(new BugListCellRenderer());
@@ -192 +192 @@
             String text = " No bugs in the current view for the selected";
             text += " filters!";
-            JList<String> textJList = new JList<>(new String[] { text });
+            JList<String> textJList = new JList<>(new String[] {text});
             textJList.setBorder(new LineBorder(Color.black, 1, false));
             textJList.setCellRenderer(new BugListCellRenderer());

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java

@@ -100 +100 @@
     private String buildText() {
         Integer version;
-        try{
+        try {
             version = Integer.decode(Main.pref.get("mapdust.version"));
-        } catch (NumberFormatException e){
+        } catch (NumberFormatException e) {
             version = null;
         }
                 
         Integer localVersion;
-        try{
-            localVersion= Integer.decode(Main.pref.get("mapdust.localVersion"));
+        try {
+            localVersion = Integer.decode(Main.pref.get("mapdust.localVersion"));
         } catch (NumberFormatException e) {
             localVersion = null;

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/renderer/BugListCellRenderer.java

@@ -63 +63 @@
     public Component getListCellRendererComponent(JList<?> list, Object value,
             int index, boolean isSelected, boolean hasFocus) {
-        JLabel label =(JLabel) super.getListCellRendererComponent(list, value,
-                index,isSelected, hasFocus);
+        JLabel label = (JLabel) super.getListCellRendererComponent(list, value,
+                index, isSelected, hasFocus);
         if (value instanceof MapdustBug) {
             /* show the MapdustBug in the list */
@@ -78 +78 @@
             text += mapdustBug.getType().getValue();
             if (mapdustBug.getAddress() != null) {
-                String addressStr=mapdustBug.getAddress().toString();
+                String addressStr = mapdustBug.getAddress().toString();
                 if (!addressStr.trim().isEmpty()) {
                     text += " (" + mapdustBug.getAddress().toString() + " )";
@@ -85 +85 @@
             DateFormat df = DateFormat.getDateInstance(DateFormat.DEFAULT,
                     Locale.getDefault());
-            text +=" last modified on ";
+            text += " last modified on ";
             text += df.format(mapdustBug.getDateUpdated());
             label.setText(text);
@@ -91 +91 @@
             label.setSize(200, 20);
         }
-        if (value instanceof String){
+        if (value instanceof String) {
             /* show default text in the list */
-            String text=(String)value;
+            String text = (String) value;
             label.setText(text);
             label.setFont(new Font("Times New Roman", Font.BOLD, 12));

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/renderer/ComboBoxRenderer.java

@@ -68 +68 @@
         label.setIcon(icon);
         label.setText(text);
-        label.setFont( new Font("Times New Roman", Font.BOLD, 12));
+        label.setFont(new Font("Times New Roman", Font.BOLD, 12));
         return label;
     }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/slider/RelevanceSlider.java

@@ -158 +158 @@
      */
     public int getUpperValue() {
-        if (upperValue<lowerValue){
-            upperValue=lowerValue;
+        if (upperValue < lowerValue) {
+            upperValue = lowerValue;
         }
         return upperValue;
@@ -183 +183 @@
     public void setExtent(int extent) {
         super.setExtent(extent);
-        this.upperValue=getLowerValue()+getExtent();
+        this.upperValue = getLowerValue()+getExtent();
     }
-
 }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/slider/RelevanceSliderUI.java

@@ -261 +261 @@
                 incr = 1;
             }
-            int delta = incr  * ((direction > 0) ? POSITIVE_SCROLL
+            int delta = incr * ((direction > 0) ? POSITIVE_SCROLL
                     : NEGATIVE_SCROLL);
             if (isUpperSelected) {
@@ -599 +599 @@
         }
     }
-
 }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/util/ComponentUtil.java

@@ -72 +72 @@
  * @version $Revision$
  */
-public class ComponentUtil {
-
+public final class ComponentUtil {
+
+    private ComponentUtil() {
+        // Hide default constructor for utilities classes
+    }
+    
     /**
      * Creates a <code>JLabel</code> object with the given properties.

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustActionObservable.java

@@ -28 +28 @@
 package org.openstreetmap.josm.plugins.mapdust.gui.observer;
 
-
 import org.openstreetmap.josm.plugins.mapdust.gui.value.MapdustAction;
-
 
 /**
@@ -45 +43 @@
      * @param observer The <code>MapdustActionObserver</code> object
      */
-    public void addObserver(MapdustActionObserver observer);
+    void addObserver(MapdustActionObserver observer);
 
     /**
@@ -52 +50 @@
      * @param observer The <code>MapdustActionObserver</code> object
      */
-    public void removeObserver(MapdustActionObserver observer);
+    void removeObserver(MapdustActionObserver observer);
 
     /**
@@ -60 +58 @@
      * @param mapdustAction The <code>MapdustAction</code> object
      */
-    public void notifyObservers(MapdustAction mapdustAction);
+    void notifyObservers(MapdustAction mapdustAction);
 }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustActionObserver.java

@@ -28 +28 @@
 package org.openstreetmap.josm.plugins.mapdust.gui.observer;
 
-
 import org.openstreetmap.josm.plugins.mapdust.gui.value.MapdustAction;
-
 
 /**
@@ -45 +43 @@
      * @param mapdustAction The <code>MapdustAction</code> list
      */
-    public void addAction(MapdustAction mapdustAction);
+    void addAction(MapdustAction mapdustAction);
 }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustBugDetailsObservable.java

@@ -28 +28 @@
 package org.openstreetmap.josm.plugins.mapdust.gui.observer;
 
-
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBug;
-
 
 /**
@@ -45 +43 @@
      * @param observer The <code>MapdustBugDetailsObserver</code> object
      */
-    public void addObserver(MapdustBugDetailsObserver observer);
+    void addObserver(MapdustBugDetailsObserver observer);
 
     /**
@@ -52 +50 @@
      * @param observer The <code>MapdustBugDetailsObserver</code> object
      */
-    public void removeObserver(MapdustBugDetailsObserver observer);
+    void removeObserver(MapdustBugDetailsObserver observer);
 
     /**
@@ -60 +58 @@
      * @param mapdustBug The <code>MapdustBug</code> object
      */
-    public void notifyObservers(MapdustBug mapdustBug);
-
+    void notifyObservers(MapdustBug mapdustBug);
 }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustBugDetailsObserver.java

@@ -28 +28 @@
 package org.openstreetmap.josm.plugins.mapdust.gui.observer;
 
-
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBug;
-
 
 /**
@@ -46 +44 @@
      * @param mapdustBug The <code>MapdustBug</code> object
      */
-    public void showDetails(MapdustBug mapdustBug);
-
+    void showDetails(MapdustBug mapdustBug);
 }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustBugObservable.java

@@ -31 +31 @@
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBug;
 
-
 /**
  * The observable interface for the <code>MapdustBug</code> object. Observes the
@@ -46 +45 @@
      * @param observer The <code>MapdustBugObserver</code> object
      */
-    public void addObserver(MapdustBugObserver observer);
+    void addObserver(MapdustBugObserver observer);
 
     /**
@@ -53 +52 @@
      * @param observer The <code>MapdustBugObserver</code> object
      */
-    public void removeObserver(MapdustBugObserver observer);
+    void removeObserver(MapdustBugObserver observer);
 
     /**
@@ -61 +60 @@
      * @param mapdustBug The <code>MapdustBug</code> object
      */
-    public void notifyObservers(MapdustBug mapdustBug);
-
+    void notifyObservers(MapdustBug mapdustBug);
 }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustBugObserver.java

@@ -28 +28 @@
 package org.openstreetmap.josm.plugins.mapdust.gui.observer;
 
-
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBug;
-
 
 /**
@@ -45 +43 @@
      * @param mapdustBug A <code>MapdustBug</code> object
      */
-    public void changedData(MapdustBug mapdustBug);
-
+    void changedData(MapdustBug mapdustBug);
 }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustUpdateObservable.java

@@ -35 +35 @@
 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBugFilter;
 
-
 /**
  * The observable interface for the MapDust bug update action.
@@ -49 +48 @@
      * @param observer The <code>MapdustUpdateObserver</code> object
      */
-    public void addObserver(MapdustUpdateObserver observer);
+    void addObserver(MapdustUpdateObserver observer);
 
     /**
@@ -56 +55 @@
      * @param observer The <code>MapdustUpdateObserver</code> object
      */
-    public void removeObserver(MapdustUpdateObserver observer);
+    void removeObserver(MapdustUpdateObserver observer);
 
     /**
@@ -65 +64 @@
      * or not.
      */
-    public void notifyObservers(MapdustBugFilter filter, boolean initialUpdate);
-
+    void notifyObservers(MapdustBugFilter filter, boolean initialUpdate);
 }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/observer/MapdustUpdateObserver.java

@@ -55 +55 @@
      * or not.
      */
-    public void update(MapdustBugFilter filter, boolean initialUpdate);
-
+    void update(MapdustBugFilter filter, boolean initialUpdate);
 }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/value/MapdustPluginState.java

@@ -51 +51 @@
      * @param value The value of the object
      */
-    private MapdustPluginState(String value) {
+    MapdustPluginState(String value) {
         this.value = value;
     }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/value/MapdustRelevanceValue.java

@@ -44 +44 @@
  * @version $Revision$
  */
-public class MapdustRelevanceValue {
+public final class MapdustRelevanceValue {
 
     /** The low MapDust bug relevance value */

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/value/MapdustServiceCommand.java

@@ -53 +53 @@
      * Builds a new <code>MapdustServiceCommand</code> object
      */
-    private MapdustServiceCommand() {}
+    MapdustServiceCommand() {}
 
     /**
@@ -61 +61 @@
      * @param value The value
      */
-    private MapdustServiceCommand(String key, String value) {
+    MapdustServiceCommand(String key, String value) {
         this.key = key;
         this.value = value;

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/MapdustConverter.java

@@ -52 +52 @@
  * 
  */
-class MapdustConverter {
+final class MapdustConverter {
+    
+    private MapdustConverter() {
+        // Hide default constructor for utilities classes
+    }
     
     /**

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/MapdustConnector.java

@@ -544 +544 @@
         }
     }
-    
-    
+        
     private <T> T parseResponse(String httpResponse, Class<T> responseType)
             throws MapdustConnectorException {

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/MapdustConnectorException.java

@@ -77 +77 @@
         super(message, cause);
     }
-
 }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/GeneralContent.java

@@ -53 +53 @@
         this.id = id;
     }
-    
-    
+        
     public Long getId() {
         return id;

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/Geometry.java

@@ -28 +28 @@
 package org.openstreetmap.josm.plugins.mapdust.service.connector.response;
 
-
 /**
  * Defines the attributes of the geometry object.
@@ -38 +37 @@
     
     /** The array of coordinates */
-    private Double coordinates[];
+    private Double[] coordinates;
     
     /**
@@ -53 +52 @@
         this.coordinates = coordinates;
     }
-    
-    
+        
     public Double[] getCoordinates() {
         return coordinates;
     }
-    
 }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustBugContent.java

@@ -60 +60 @@
         this.properties = properties;
     }
-    
-    
+        
     public Geometry getGeometry() {
         return geometry;

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustBugProperties.java

@@ -132 +132 @@
         this.comments = comments;
     }
-    
-    
+        
     public Date getDateCreated() {
         return dateCreated;

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustCommentProperties.java

@@ -82 +82 @@
         this.source = source;
     }
-
     
     public Date getDateCreated() {
@@ -91 +90 @@
         return comment;
     }
-
 
     public String getNickname() {

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustGetBugResponse.java

@@ -55 +55 @@
      * Builds a <code>MapdustGetBugResponse</code> object
      *
-     * @param geometry The <code>Geometry</code object
+     * @param geometry The <code>Geometry</code> object
      * @param id The id of the object
      * @param properties The <code>MapdustBugProperties</code> object
@@ -65 +65 @@
         this.properties = properties;
     }
-
     
     public Geometry getGeometry() {

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustGetBugsResponse.java

@@ -54 +54 @@
         this.features = features;
     }
-
     
     public MapdustBugContent[] getFeatures() {
         return features;
     }
-
 }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustGetResponse.java

@@ -58 +58 @@
         this.paging = paging;
     }
-
     
     public Paging getPaging() {
         return paging;
     }
-
 }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/connector/response/MapdustPostResponse.java

@@ -28 +28 @@
 package org.openstreetmap.josm.plugins.mapdust.service.connector.response;
 
-
 /**
  * Represents a response object for the HTTP POST method.
@@ -55 +54 @@
         this.id = id;
     }
-
     
     public Long getId() {

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/value/MapdustResponseStatusCode.java

@@ -88 +88 @@
      * @param description The description of the response
      */
-    private MapdustResponseStatusCode(Integer statusCode, Integer apiCode,
+    MapdustResponseStatusCode(Integer statusCode, Integer apiCode,
             String description) {
         this.statusCode = statusCode;

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/value/RelevanceRange.java

@@ -45 +45 @@
  * @version $Revision$
  */
-public class RelevanceRange implements Serializable, Comparable<RelevanceRange> {
+public final class RelevanceRange implements Serializable, Comparable<RelevanceRange> {
 
     /** The serial version UID */

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/util/Configuration.java

@@ -39 +39 @@
  * @author Bea
  */
-public class Configuration {
+public final class Configuration {
 
     /** The instance of this singleton object type */

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/util/http/HttpConnector.java

@@ -34 +34 @@
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -39 +40 @@
 import java.util.Map;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.plugins.mapdust.util.retry.RetryAgent;
 import org.openstreetmap.josm.plugins.mapdust.util.retry.RetrySetup;
@@ -230 +232 @@
                 buf.append(key).append("=").append(URLEncoder.encode(
                         postParameters.get(key), "utf-8"));
-            } catch (java.io.UnsupportedEncodingException neverHappen) {}
+            } catch (UnsupportedEncodingException e) {
+                Main.error(e);
+            }
             i++;
         }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/util/retry/RetryAgent.java

@@ -28 +28 @@
 package org.openstreetmap.josm.plugins.mapdust.util.retry;
 
+import org.openstreetmap.josm.Main;
 
 /**
@@ -37 +38 @@
  * the cleanup method.
  *
+ * @author rrainn
  * @param <T> the type of the object returned by the target method
- * @author rrainn
  */
 public abstract class RetryAgent<T> {
@@ -129 +130 @@
                         Thread.sleep(delay);
                     } catch (InterruptedException e1) {
-                        // LOG.error(e1.getMessage(), e1);
+                        Main.error(e1);
                         // throw e;
                     }
@@ -139 +140 @@
                 } catch (Exception e) {
                     /* if it can't be cleaned up, there's nothing to do */
-                    // LOG.error("Could not clean up", e);
+                    Main.error("Could not clean up", e);
                 }
             }
@@ -172 +173 @@
                         Thread.sleep(delay);
                     } catch (InterruptedException e1) {
-                        // LOG.error(e1.getMessage(), e1);
+                        Main.error(e1);
                         throw e;
                     }
@@ -182 +183 @@
                 } catch (Exception e) {
                     /* if it can't be cleaned up, there's nothing to do */
-                    // LOG.error("Could not clean up", e);
+                    Main.error("Could not clean up", e);
                 }
             }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/util/retry/RetryMode.java

@@ -28 +28 @@
 package org.openstreetmap.josm.plugins.mapdust.util.retry;
 
-
 /**
  * The mode in which the {@link RetryAgent} should work.
@@ -56 +55 @@
      * @param name the name of the mode
      */
-    private RetryMode(String name) {
+    RetryMode(String name) {
         this.name = name;
     }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/util/retry/RetrySetup.java

@@ -68 +68 @@
      * Returns the method for computing time intervals between attempts.
      *
+     * @return the retry mode
      * @see RetryMode
-     * @return the retry mode
      */
     public RetryMode getMode() {