Changeset 6223 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

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

Author:

Don-vip

Message:

Sonar - fix various violations

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• LanguageInfo.java (modified) (1 diff)
• MultikeyActionsHandler.java (modified) (4 diffs)
• Property.java (modified) (3 diffs)

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);
 }