Changeset 12253 in josm for trunk

Timestamp:

2017-05-25T03:01:03+02:00 (7 years ago)

Author:

Don-vip

Message:

findbugs - NM_SAME_SIMPLE_NAME_AS_SUPERCLASS

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/remotecontrol/DNSNameFix.java (moved) (moved from trunk/src/org/openstreetmap/josm/io/remotecontrol/DNSName.java ) (2 diffs)
• src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/remotecontrol/DNSNameFixTest.java (moved) (moved from trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/DNSNameTest.java ) (1 diff)

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

@@ -57 +57 @@
  * @since 7347
  */
-public final class DNSName extends sun.security.x509.DNSName {
+public final class DNSNameFix extends sun.security.x509.DNSName {
 
     private static final String alpha = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
@@ -69 +69 @@
      * @throws IOException if the name is not a valid DNSName subjectAltName
      */
-    public DNSName(String name) throws IOException {
+    public DNSNameFix(String name) throws IOException {
         super("fake");
         if (name == null || name.isEmpty())

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

@@ -119 +119 @@
         switch (t.toLowerCase(Locale.ENGLISH)) {
             case "uri": gn = new URIName(v); break;
-            case "dns": gn = new DNSName(v); break;
+            case "dns": gn = new DNSNameFix(v); break;
             case "ip": gn = new IPAddressName(v); break;
             default: gn = new OIDName(v);

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

@@ -9 +9 @@
 
 /**
- * Unit tests of {@link DNSName} class.
+ * Unit tests of {@link DNSNameFix} class.
  */
-public class DNSNameTest {
+public class DNSNameFixTest {
 
     /**
-     * Unit test of {@link DNSName#DNSName} - null check.
+     * Unit test of {@link DNSNameFix#DNSNameFix} - null check.
      * @throws IOException always (expected with null name)
      */
     @Test(expected = IOException.class)
     public void testDNSNameNull() throws IOException {
-        new DNSName(null);
+        new DNSNameFix(null);
     }
 
     /**
-     * Unit test of {@link DNSName#DNSName} - nominal cases.
+     * Unit test of {@link DNSNameFix#DNSNameFix} - nominal cases.
      * @throws IOException never
      */
     @Test
     public void testDNSNameNominal() throws IOException {
-        assertEquals("localhost", new DNSName("localhost").getName());
-        assertEquals("127.0.0.1", new DNSName("127.0.0.1").getName());
+        assertEquals("localhost", new DNSNameFix("localhost").getName());
+        assertEquals("127.0.0.1", new DNSNameFix("127.0.0.1").getName());
     }
 }