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

Timestamp:

2014-04-16T02:29:53+02:00 (10 years ago)

Author:

Don-vip

Message:

sonar - fix some more issues

File:

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

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

@@ -457 +457 @@
                     }
 
-                    String full_name = subdir + name + ext;
-                    String cache_name = full_name;
+                    String fullName = subdir + name + ext;
+                    String cacheName = fullName;
                     /* cache separately */
                     if (dirs != null && !dirs.isEmpty()) {
-                        cache_name = "id:" + id + ":" + full_name;
+                        cacheName = "id:" + id + ":" + fullName;
                         if(archive != null) {
-                            cache_name += ":" + archive.getName();
+                            cacheName += ":" + archive.getName();
                         }
                     }
 
-                    ImageResource ir = cache.get(cache_name);
+                    ImageResource ir = cache.get(cacheName);
                     if (ir != null) return ir;
 
@@ -473 +473 @@
                     case ARCHIVE:
                         if (archive != null) {
-                            ir = getIfAvailableZip(full_name, archive, inArchiveDir, type);
+                            ir = getIfAvailableZip(fullName, archive, inArchiveDir, type);
                             if (ir != null) {
-                                cache.put(cache_name, ir);
+                                cache.put(cacheName, ir);
                                 return ir;
                             }
@@ -486 +486 @@
                         // and don't bother to create a URL unless we're actually
                         // creating the image.
-                        URL path = getImageUrl(full_name, dirs, additionalClassLoaders);
+                        URL path = getImageUrl(fullName, dirs, additionalClassLoaders);
                         if (path == null) {
                             continue;
@@ -492 +492 @@
                         ir = getIfAvailableLocalURL(path, type);
                         if (ir != null) {
-                            cache.put(cache_name, ir);
+                            cache.put(cacheName, ir);
                             return ir;
                         }
@@ -602 +602 @@
     }
 
-    private static ImageResource getIfAvailableZip(String full_name, File archive, String inArchiveDir, ImageType type) {
+    private static ImageResource getIfAvailableZip(String fullName, File archive, String inArchiveDir, ImageType type) {
         ZipFile zipFile = null;
-        try
-        {
+        try {
             zipFile = new ZipFile(archive);
             if (inArchiveDir == null || inArchiveDir.equals(".")) {
@@ -612 +611 @@
                 inArchiveDir += "/";
             }
-            String entry_name = inArchiveDir + full_name;
-            ZipEntry entry = zipFile.getEntry(entry_name);
+            String entryName = inArchiveDir + fullName;
+            ZipEntry entry = zipFile.getEntry(entryName);
             if(entry != null)
             {
@@ -624 +623 @@
                     switch (type) {
                     case SVG:
-                        URI uri = getSvgUniverse().loadSVG(is, entry_name);
+                        URI uri = getSvgUniverse().loadSVG(is, entryName);
                         SVGDiagram svg = getSvgUniverse().getDiagram(uri);
                         return svg == null ? null : new ImageResource(svg);
@@ -755 +754 @@
         /** Quit parsing, when a certain condition is met */
         class SAXReturnException extends SAXException {
-            private String result;
+            private final String result;
 
             public SAXReturnException(String result) {