Changeset 6223 in josm for trunk

Timestamp:

2013-09-08T05:51:16+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar - fix various violations

Location:

trunk/src/org/openstreetmap/josm

Files:

• corrector/CorrectionTable.java (modified) (3 diffs)
• data/osm/User.java (modified) (5 diffs)
• gui/help/HelpBrowserHistory.java (modified) (1 diff)
• gui/history/HistoryBrowserDialogManager.java (modified) (1 diff)
• gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (4 diffs)
• gui/preferences/PreferenceTabbedPane.java (modified) (1 diff)
• io/OsmServerObjectReader.java (modified) (1 diff)
• io/remotecontrol/RequestProcessor.java (modified) (4 diffs)
• tools/LanguageInfo.java (modified) (1 diff)
• tools/MultikeyActionsHandler.java (modified) (4 diffs)
• tools/Property.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/corrector/CorrectionTable.java

@@ -10 +10 @@
 import javax.swing.table.TableCellRenderer;
 
-public abstract class CorrectionTable<TM extends CorrectionTableModel<?>>
+public abstract class CorrectionTable<T extends CorrectionTableModel<?>>
         extends JTable {
 
@@ -34 +34 @@
     private static BoldRenderer boldRenderer = null;
 
-    protected CorrectionTable(TM correctionTableModel) {
+    protected CorrectionTable(T correctionTableModel) {
         super(correctionTableModel);
 
@@ -58 +58 @@
 
     @SuppressWarnings("unchecked")
-    public TM getCorrectionTableModel() {
-        return (TM)getModel();
+    public T getCorrectionTableModel() {
+        return (T)getModel();
     }
 

trunk/src/org/openstreetmap/josm/data/osm/User.java

@@ -39 +39 @@
      *
      * @param name the name
+     * @return a new local user with the given name
      */
     public static User createLocalUser(String name) {
@@ -57 +58 @@
      * @param uid  the user id
      * @param name the name
+     * @return a new OSM user with the given name and uid
      */
     public static User createOsmUser(long uid, String name) {
@@ -107 +109 @@
     }
 
+    /**
+     * Replies the anonymous user
+     * @return The anonymous user
+     */
     public static User getAnonymous() {
         return anonymous;
@@ -175 +181 @@
     }
 
+    /**
+     * Determines if this user is known to OSM
+     * @return {@code true} if this user is known to OSM, {@code false} otherwise
+     */
     public boolean isOsmUser() {
         return uid > 0;
     }
 
+    /**
+     * Determines if this user is local
+     * @return {@code true} if this user is local, {@code false} otherwise
+     */
     public boolean isLocalUser() {
         return uid < 0;
@@ -205 +219 @@
     public String toString() {
         StringBuffer s = new StringBuffer();
-        s.append("id:"+uid);
+        s.append("id:").append(uid);
         if (names.size() == 1) {
-            s.append(" name:"+getName());
+            s.append(" name:").append(getName());
         }
         else if (names.size() > 1) {

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java

@@ -52 +52 @@
         boolean add=true;
 
-        if (historyPos >= 0 && historyPos < history.size() && history.get(historyPos).equals(url.toString())) {
+        if (historyPos >= 0 && historyPos < history.size() && history.get(historyPos).equals(url)) {
             add = false;
         } else if (historyPos == history.size() -1) {

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java

@@ -188 +188 @@
         @Override
         public boolean evaluate(OsmPrimitive p) {
-            if (hds.getHistory(p.getPrimitiveId()) == null)
+            History h = hds.getHistory(p.getPrimitiveId());
+            if (h == null)
                 // reload if the history is not in the cache yet
                 return true;
-            else if (!p.isNew() && hds.getHistory(p.getPrimitiveId()).getByVersion(p.getUniqueId()) == null)
+            else if (!p.isNew() && h.getByVersion(p.getUniqueId()) == null)
                 // reload if the history object of the selected object is not in the cache yet
                 return true;

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -33 +33 @@
 import java.util.Comparator;
 import java.util.Date;
+import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.List;
@@ -73 +74 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.io.GpxReader;
 import org.openstreetmap.josm.tools.ExifReader;
@@ -79 +81 @@
 import org.openstreetmap.josm.tools.PrimaryDateParser;
 import org.xml.sax.SAXException;
-import org.openstreetmap.josm.gui.widgets.JosmTextField;
 
 /** This class displays the window to select the GPX file and the offset (timezone + delta).
@@ -881 +882 @@
             final JSlider sldTimezone = new JSlider(-24, 24, 0);
             sldTimezone.setPaintLabels(true);
-            Hashtable<Integer,JLabel> labelTable = new Hashtable<Integer, JLabel>();
+            Dictionary<Integer,JLabel> labelTable = new Hashtable<Integer, JLabel>();
             labelTable.put(-24, new JLabel("-12:00"));
             labelTable.put(-12, new JLabel( "-6:00"));

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -201 +201 @@
             @Override
             public boolean identify(TabPreferenceSetting tps, Object name) {
-                return name != null && tps != null && tps.getIconName() != null && tps.getIconName().equals(name);
+                return name != null && tps != null && tps.getIconName() != null && name.equals(tps.getIconName());
             }}, name);
     }

trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java

@@ -129 +129 @@
                 sb.append("/full");
             } else if (version > 0) {
-                sb.append("/"+version);
+                sb.append("/").append(version);
             }
 

trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java

@@ -19 +19 @@
 import java.util.StringTokenizer;
 import java.util.TreeMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.io.remotecontrol.handler.AddNodeHandler;
@@ -78 +75 @@
     /**
      * Spawns a new thread for the request
+     * @param request The request to process
      */
     public static void processRequest(Socket request) {
@@ -214 +212 @@
                 String usage = getUsageAsHtml();
                 String websiteDoc = HelpUtil.getWikiBaseHelpUrl() +"/Help/Preferences/RemoteControl";
-                String help = "No command specified! The following commands are available:<ul>"
-                        + usage.toString()
+                String help = "No command specified! The following commands are available:<ul>" + usage
                         + "</ul>" + "See <a href=\""+websiteDoc+"\">"+websiteDoc+"</a> for complete documentation.";
                 sendBadRequest(out, help);
@@ -449 +446 @@
     /**
      * Reports HTML message with the description of all available commands
-     * @return
+     * @return HTML message with the description of all available commands
      * @throws IllegalAccessException
      * @throws InstantiationException 

trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java

@@ -38 +38 @@
             if(code.matches("[^_]+_[^_]+")) {
                 code = code.substring(0,2);
-                if(code == "en")
+                if ("en".equals(code))
                     return null;
             } else {
                 return null;
             }
-        } else if(type == LocaleType.DEFAULTNOTENGLISH && code == "en")
+        } else if(type == LocaleType.DEFAULTNOTENGLISH && "en".equals(code))
             return null;
         return code.substring(0,1).toUpperCase() + code.substring(1) + ":";

trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java

@@ -30 +30 @@
 
     private static final long DIALOG_DELAY = 1000;
-    private static final String STATUS_BAR_ID = new String("multikeyShortcut");
+    private static final String STATUS_BAR_ID = "multikeyShortcut";
 
     private Map<MultikeyShortcutAction, MyAction> myActions = new HashMap<MultikeyShortcutAction,MyAction>();
@@ -120 +120 @@
     private static MultikeyActionsHandler instance;
 
+    /**
+     * Replies the unique instance of this class.
+     * @return The unique instance of this class
+     */
     public static MultikeyActionsHandler getInstance() {
         if (instance == null) {
@@ -203 +207 @@
     }
 
+    /**
+     * Registers an action and its shortcut
+     * @param action The action to add
+     */
     public void addAction(MultikeyShortcutAction action) {
-        if(action.getMultikeyShortcut() != null) {
+        if (action.getMultikeyShortcut() != null) {
             MyAction myAction = new MyAction(action);
             myActions.put(action, myAction);
@@ -211 +219 @@
     }
 
-    // unregister action and its shortcut completely
+    /**
+     * Unregisters an action and its shortcut completely
+     * @param action The action to remove
+     */
     public void removeAction(MultikeyShortcutAction action) {
         MyAction a = myActions.get(action);

trunk/src/org/openstreetmap/josm/tools/Property.java

@@ -4 +4 @@
 /**
  * Small interface to define a property with both read and write access.
+ * @param <O> Object type
+ * @param <P> Property type
  */
-public interface Property<ObjectType, PropertyType> {
+public interface Property<O, P> {
+    
     /**
      * Get the value of the property.
@@ -11 +14 @@
      * @return the value of the property for the object obj
      */
-    public PropertyType get(ObjectType obj);
+    public P get(O obj);
+    
     /**
      * Set the value of the property for the object.
@@ -17 +21 @@
      * @param value the value the property is set to
      */
-    public void set(ObjectType obj, PropertyType value);
+    public void set(O obj, P value);
 }