remove duplicate R methods; create a single class to handle translation

2010-10-25  Omair Majid  <[email protected]>

    * net/sourceforge/jnlp/ExtensionDesc.java: Import Translator.R and use
    that.
    * net/sourceforge/jnlp/JNLPFile.java: Import Translator.R.
    (R): Remove.
    * net/sourceforge/jnlp/JREDesc.java: Import Translator.R.
    (checkHeapSize): Use R instead of JNLPRuntime.getMessage.
    * net/sourceforge/jnlp/Launcher.java: Import Translator.R.
    (R): Remove.
    * net/sourceforge/jnlp/Parser.java: Import Translator.R
    (R(String)): Remove.
    (R(String,Object)): Remove.
    (R(String,Object,Object)): Remove.
    (R(String,Object,Object,Object)): Remove.
    * net/sourceforge/jnlp/cache/CacheEntry.java: Import Translator.R
    (CacheEntry): Use R instead of JNLPRuntime.getMessage.
    * net/sourceforge/jnlp/cache/CacheUtil.java: Import Translator.R
    (R(String)): Remove.
    (R(String,Object)): Remove.
    * net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java: Import
    Translator.R and use that instead of JNLPRuntime.getMessage.
    * net/sourceforge/jnlp/runtime/Boot.java: Import Translator.R.
    (R(String)): Remove.
    (R(String, Object)): Remove.
    (run): Use R instead of JNLPRuntime.getMessage.
    * net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Import Translator.R.
    (R): Remove.
    * net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: Import
    Translator.R.  Use it instead of JNLPRuntime.getMeesage.
    (R): Remove.
    * net/sourceforge/jnlp/security/AccessWarningPane.java: Import
    Translator.R.
    * net/sourceforge/jnlp/security/CertWarningPane.java: Likewise.
    * net/sourceforge/jnlp/security/HttpsCertVerifier.java: Import
    Translator.R.
    (R(String)): Remove.
    (R(String,String,String)): Remove.
    * net/sourceforge/jnlp/security/MoreInfoPane.java: Import Translator.R.
    * net/sourceforge/jnlp/security/SecurityDialogPanel.java
    (R(String)): Remove.
    (R(String,Object)): Remove.
    * net/sourceforge/jnlp/services/ServiceUtil.java
    (R): Remove.
    * net/sourceforge/jnlp/services/SingleInstanceLock.java: Import
    Translator.R
    (R(String)): Remove.
    (R(String,Object)): Remove.
    * net/sourceforge/jnlp/tools/JarSigner.java: Import Translator.R.
    (R): Remove.
    * net/sourceforge/jnlp/runtime/Translator.java: New file
    (R(String,Object...)): New method.

1 files changed, 2 insertions, 9 deletions

diff --git a/netx/net/sourceforge/jnlp/security/HttpsCertVerifier.java b/netx/net/sourceforge/jnlp/security/HttpsCertVerifier.java
index ca2fc08..6cf7c9d 100644
--- a/netx/net/sourceforge/jnlp/security/HttpsCertVerifier.java
+++ b/netx/net/sourceforge/jnlp/security/HttpsCertVerifier.java
@@ -37,6 +37,8 @@ exception statement from your version.
 
 package net.sourceforge.jnlp.security;
 
+import static net.sourceforge.jnlp.runtime.Translator.R;
+
 import java.io.IOException;
 import java.security.cert.CertPath;
 import java.security.cert.Certificate;
@@ -50,7 +52,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import net.sourceforge.jnlp.runtime.JNLPRuntime;
 import net.sourceforge.jnlp.tools.KeyTool;
 import sun.security.util.DerValue;
 import sun.security.util.HostnameChecker;
@@ -198,14 +199,6 @@ public class HttpsCertVerifier implements CertVerifier {
         details.add(detail);
     }
 
-    private static String R(String key) {
-      return JNLPRuntime.getMessage(key);
-    }
-
-    private static String R(String key, String arg1, String arg2) {
-        return JNLPRuntime.getMessage(key, new Object[] { arg1, arg2 });
-    }
-
     public Certificate getPublisher() {
       if (chain.length > 0)
         return (Certificate)chain[0];