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, 3 insertions, 1 deletions

diff --git a/netx/net/sourceforge/jnlp/cache/CacheEntry.java b/netx/net/sourceforge/jnlp/cache/CacheEntry.java
index 7906e0c..d442a90 100644
--- a/netx/net/sourceforge/jnlp/cache/CacheEntry.java
+++ b/netx/net/sourceforge/jnlp/cache/CacheEntry.java
@@ -17,6 +17,8 @@
 
 package net.sourceforge.jnlp.cache;
 
+import static net.sourceforge.jnlp.runtime.Translator.R;
+
 import java.io.*;
 import java.net.*;
 import java.util.*;
@@ -60,7 +62,7 @@ public class CacheEntry {
         File infoFile = CacheUtil.getCacheFile(location, version);
         infoFile = new File(infoFile.getPath()+".info"); // replace with something that can't be clobbered
 
-        properties = new PropertiesFile(infoFile, JNLPRuntime.getMessage("CAutoGen"));
+        properties = new PropertiesFile(infoFile, R("CAutoGen"));
     }
 
     /**