Changeset 6883 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2014-02-25T01:31:24+01:00 (11 years ago)

Author:

Don-vip

Message:

fix some Sonar issues

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• auth/AbstractCredentialsAgent.java (modified) (1 diff)
• auth/CredentialsManager.java (modified) (1 diff)
• imagery/Grabber.java (modified) (3 diffs)
• remotecontrol/handler/RequestHandler.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java

@@ -10 +10 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 
-abstract public class AbstractCredentialsAgent implements CredentialsAgent {
+public abstract class AbstractCredentialsAgent implements CredentialsAgent {
 
     protected Map<RequestorType, PasswordAuthentication> memoryCredentialsCache = new HashMap<RequestorType, PasswordAuthentication>();

trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java

@@ -27 +27 @@
      * @return the single credential agent used in JOSM
      */
-    static public CredentialsManager getInstance() {
+    public static CredentialsManager getInstance() {
         if (instance == null) {
             CredentialsAgent delegate;

trunk/src/org/openstreetmap/josm/io/imagery/Grabber.java

@@ -8 +8 @@
 import org.openstreetmap.josm.gui.layer.WMSLayer;
 
-abstract public class Grabber implements Runnable {
+public abstract class Grabber implements Runnable {
     protected final MapView mv;
     protected final WMSLayer layer;
@@ -27 +27 @@
         return layer.getBaseImageWidth();
     }
+
     int height(){
         return layer.getBaseImageHeight();
@@ -81 +82 @@
     }
 
-    abstract public boolean loadFromCache(WMSRequest request);
+    public abstract boolean loadFromCache(WMSRequest request);
 
     public void cancel() {
         canceled = true;
     }
-
 }

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java

@@ -93 +93 @@
      * @return the message
      */
-    abstract public String getPermissionMessage();
+    public abstract String getPermissionMessage();
 
     /**
@@ -105 +105 @@
      * @return the preference name and error message or null
      */
-    abstract public PermissionPrefWithDefault getPermissionPref();
-
-    abstract public String[] getMandatoryParams();
+    public abstract PermissionPrefWithDefault getPermissionPref();
+
+    public abstract String[] getMandatoryParams();
 
     public String[] getOptionalParams() {
@@ -137 +137 @@
      * @throws RequestHandlerForbiddenException
      */
-    final public void checkPermission() throws RequestHandlerForbiddenException
-    {
+    public final void checkPermission() throws RequestHandlerForbiddenException {
         /*
          * If the subclass defines a specific preference and if this is set
@@ -147 +146 @@
          */
         PermissionPrefWithDefault permissionPref = getPermissionPref();
-        if((permissionPref != null) && (permissionPref.pref != null))
-        {
+        if (permissionPref != null && permissionPref.pref != null) {
             if (!Main.pref.getBoolean(permissionPref.pref, permissionPref.defaultVal)) {
                 String err = MessageFormat.format("RemoteControl: ''{0}'' forbidden by preferences", myCommand);