Changeset 10208 in josm

Timestamp:

2016-05-14T02:38:41+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11924 - Java 9 - JDK-6850612 deprecates Class.newInstance() ==> replace it by Class.getConstructor().newInstance()

Location:

trunk

Files:

• src/org/openstreetmap/josm/Main.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/Preferences.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/projection/proj/ClassProjFactory.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/validation/OsmValidator.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (modified) (4 diffs)
• src/org/openstreetmap/josm/io/session/SessionReader.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/XmlObjectParser.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -954 +954 @@
                 if (klass != null && LookAndFeel.class.isAssignableFrom(klass)) {
                     try {
-                        UIManager.setLookAndFeel((LookAndFeel) klass.newInstance());
-                    } catch (Exception ex) {
+                        UIManager.setLookAndFeel((LookAndFeel) klass.getConstructor().newInstance());
+                    } catch (ReflectiveOperationException ex) {
                         warn("Cannot set Look and Feel: " + laf + ": "+ex.getMessage());
                     }

trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java

@@ -65 +65 @@
         for (final Class<? extends FileImporter> importerClass : importerNames) {
             try {
-                FileImporter importer = importerClass.newInstance();
+                FileImporter importer = importerClass.getConstructor().newInstance();
                 importers.add(importer);
                 MapView.addLayerChangeListener(importer);
-            } catch (Exception e) {
+            } catch (ReflectiveOperationException e) {
                 if (Main.isDebugEnabled()) {
                     Main.debug(e.getMessage());
@@ -106 +106 @@
         for (final Class<? extends FileExporter> exporterClass : exporterClasses) {
             try {
-                FileExporter exporter = exporterClass.newInstance();
+                FileExporter exporter = exporterClass.getConstructor().newInstance();
                 exporters.add(exporter);
                 MapView.addLayerChangeListener(exporter);
-            } catch (Exception e) {
+            } catch (ReflectiveOperationException e) {
                 if (Main.isDebugEnabled()) {
                     Main.debug(e.getMessage());

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -1209 +1209 @@
         T structPrototype;
         try {
-            structPrototype = klass.newInstance();
-        } catch (InstantiationException | IllegalAccessException ex) {
+            structPrototype = klass.getConstructor().newInstance();
+        } catch (ReflectiveOperationException ex) {
             throw new RuntimeException(ex);
         }
@@ -1258 +1258 @@
         T struct = null;
         try {
-            struct = klass.newInstance();
-        } catch (InstantiationException | IllegalAccessException ex) {
+            struct = klass.getConstructor().newInstance();
+        } catch (ReflectiveOperationException ex) {
             throw new RuntimeException(ex);
         }
         for (Entry<String, String> key_value : hash.entrySet()) {
-            Object value = null;
+            Object value;
             Field f;
             try {

trunk/src/org/openstreetmap/josm/data/projection/proj/ClassProjFactory.java

@@ -9 +9 @@
     private final Class<? extends Proj> projClass;
 
+    /**
+     * Constructs a new {@code ClassProjFactory}.
+     * @param projClass projection class
+     */
     public ClassProjFactory(Class<? extends Proj> projClass) {
         this.projClass = projClass;
@@ -17 +21 @@
         Proj proj = null;
         try {
-            proj = projClass.newInstance();
-        } catch (InstantiationException | IllegalAccessException e) {
+            proj = projClass.getConstructor().newInstance();
+        } catch (ReflectiveOperationException e) {
             throw new RuntimeException(e);
         }

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -136 +136 @@
         for (Class<Test> testClass : allAvailableTests) {
             try {
-                allTestsMap.put(testClass.getName(), testClass.newInstance());
-            } catch (Exception e) {
+                allTestsMap.put(testClass.getName(), testClass.getConstructor().newInstance());
+            } catch (ReflectiveOperationException e) {
                 Main.error(e);
             }

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

@@ -220 +220 @@
             } else {
                 // create handler object
-                RequestHandler handler = handlerClass.newInstance();
+                RequestHandler handler = handlerClass.getConstructor().newInstance();
                 try {
                     handler.setCommand(command);
@@ -243 +243 @@
         } catch (IOException ioe) {
             Main.debug(Main.getErrorMessage(ioe));
-        } catch (Exception e) {
+        } catch (ReflectiveOperationException e) {
             Main.error(e);
             try {
@@ -391 +391 @@
     public static String getHandlerInfoAsJSON(String cmd) {
         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) {
+                handler = handlers.get(cmd).getConstructor().newInstance();
+            } catch (ReflectiveOperationException ex) {
                 Main.error(ex);
                 return null;
             }
 
+            PrintWriter r = new PrintWriter(w);
             printJsonInfo(cmd, r, handler);
             return w.toString();
@@ -459 +459 @@
      * Reports HTML message with the description of all available commands
      * @return HTML message with the description of all available commands
-     * @throws IllegalAccessException if one handler class or its nullary constructor is not accessible.
-     * @throws InstantiationException if one handler class represents an abstract class, an interface, an array class,
-     * a primitive type, or void; or if the class has no nullary constructor; or if the instantiation fails for some other reason.
-     */
-    public static String getUsageAsHtml() throws IllegalAccessException, InstantiationException {
+     * @throws ReflectiveOperationException if a reflective operation fails for one handler class
+     */
+    public static String getUsageAsHtml() throws ReflectiveOperationException {
         StringBuilder usage = new StringBuilder(1024);
         for (Entry<String, Class<? extends RequestHandler>> handler : handlers.entrySet()) {
-            RequestHandler sample = handler.getValue().newInstance();
+            RequestHandler sample = handler.getValue().getConstructor().newInstance();
             String[] mandatory = sample.getMandatoryParams();
             String[] optional = sample.getOptionalParams();

trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

@@ -99 +99 @@
         SessionLayerImporter importer = null;
         try {
-            importer = importerClass.newInstance();
-        } catch (InstantiationException | IllegalAccessException e) {
+            importer = importerClass.getConstructor().newInstance();
+        } catch (ReflectiveOperationException e) {
             throw new RuntimeException(e);
         }

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

@@ -83 +83 @@
                 Class<?> klass = mapping.get(qname).klass;
                 try {
-                    current.push(klass.newInstance());
-                } catch (Exception e) {
+                    current.push(klass.getConstructor().newInstance());
+                } catch (ReflectiveOperationException e) {
                     throwException(e);
                 }

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java

@@ -68 +68 @@
         TrustManager[] trustAllCerts = new TrustManager[] {
             new X509TrustManager() {
+                @Override
                 public X509Certificate[] getAcceptedIssuers() {
                     return null;
                 }
 
+                @Override
                 public void checkClientTrusted(X509Certificate[] certs, String authType) {
                 }
 
+                @Override
                 public void checkServerTrusted(X509Certificate[] certs, String authType) {
                 }
@@ -141 +144 @@
                 }
                 assert responseBody.toString().contains(RequestProcessor.getUsageAsHtml());
-            } catch (IllegalAccessException | InstantiationException e) {
+            } catch (ReflectiveOperationException e) {
                 e.printStackTrace();
                 fail(e.getMessage());