Changeset 7030 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java

Timestamp:

2014-04-29T18:06:29+02:00 (12 years ago)

Author:

Don-vip

Message:

see #8465 - use of try-with-resource

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (modified) (2 diffs)

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

@@ -383 +383 @@
 
     public static String getHandlerInfoAsJSON(String cmd) {
-        StringWriter w = new StringWriter();
-        PrintWriter r = new PrintWriter(w);
-        RequestHandler handler = null;
-        try {
-            Class<?> c = handlers.get(cmd);
-            if (c==null) return null;
-            handler = handlers.get(cmd).newInstance();
-        } catch (Exception ex) {
-            Main.error(ex);
+        try (StringWriter w = new StringWriter()) {
+            PrintWriter r = new PrintWriter(w);
+            RequestHandler handler = null;
+            try {
+                Class<?> c = handlers.get(cmd);
+                if (c==null) return null;
+                handler = handlers.get(cmd).newInstance();
+            } catch (InstantiationException | IllegalAccessException ex) {
+                Main.error(ex);
+                return null;
+            }
+    
+            printJsonInfo(cmd, r, handler);
+            return w.toString();
+        } catch (IOException e) {
+            Main.error(e);
             return null;
         }
-
+    }
+
+    private static void printJsonInfo(String cmd, PrintWriter r, RequestHandler handler) {
         r.printf("{ \"request\" : \"%s\"", cmd);
         if (handler.getUsage() != null) {
@@ -438 +447 @@
         }
         r.append("]}");
-        try {
-            return w.toString();
-        } finally {
-            try {
-                w.close();
-            } catch (IOException ex) {
-                Main.warn(ex);
-            }
-        }
     }