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

Timestamp:

2014-11-25T23:51:45+01:00 (9 years ago)

Author:

Don-vip

Message:

fix some Sonar issues recently introduced

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (7 diffs)

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

@@ -91 +91 @@
 public class ImageProvider {
 
+    private static final String HTTP_PROTOCOL  = "http://";
+    private static final String HTTPS_PROTOCOL = "https://";
+    private static final String WIKI_PROTOCOL  = "wiki://";
+
     /**
      * Position of an overlay icon
@@ -266 +270 @@
      * @since 7687
      */
-    static public Dimension getImageSizes(ImageSizes size) {
+    public static Dimension getImageSizes(ImageSizes size) {
         int sizeval;
         switch(size) {
@@ -458 +462 @@
      */
     public void getInBackground(final ImageCallback callback) {
-        if (name.startsWith("http://") || name.startsWith("wiki://")) {
+        if (name.startsWith(HTTP_PROTOCOL) || name.startsWith(WIKI_PROTOCOL)) {
             Runnable fetch = new Runnable() {
                 @Override
@@ -486 +490 @@
      */
     public void getInBackground(final ImageResourceCallback callback) {
-        if (name.startsWith("http://") || name.startsWith("wiki://")) {
+        if (name.startsWith(HTTP_PROTOCOL) || name.startsWith(WIKI_PROTOCOL)) {
             Runnable fetch = new Runnable() {
                 @Override
@@ -572 +576 @@
             ImageType type = name.toLowerCase().endsWith(".svg") ? ImageType.SVG : ImageType.OTHER;
 
-            if (name.startsWith("http://") || name.startsWith("https://")) {
+            if (name.startsWith(HTTP_PROTOCOL) || name.startsWith(HTTPS_PROTOCOL)) {
                 String url = name;
                 ImageResource ir = cache.get(url);
@@ -581 +585 @@
                 }
                 return ir;
-            } else if (name.startsWith("wiki://")) {
+            } else if (name.startsWith(WIKI_PROTOCOL)) {
                 ImageResource ir = cache.get(name);
                 if (ir != null) return ir;
@@ -984 +988 @@
      * overlay must be transparent in the background.
      * Also scaling is not cared about with current implementation.
+     * @deprecated this method will be refactored
      */
     @Deprecated