From b90561954383ec01d0472b44b34ca6c5de344018 Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Mon, 25 Oct 2010 14:37:57 -0400
Subject: remove duplicate R methods; create a single class to handle
 translation

2010-10-25  Omair Majid  <omajid@redhat.com>

    * 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.
---
 netx/net/sourceforge/jnlp/JNLPFile.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'netx/net/sourceforge/jnlp/JNLPFile.java')

diff --git a/netx/net/sourceforge/jnlp/JNLPFile.java b/netx/net/sourceforge/jnlp/JNLPFile.java
index 48fa9e2..b0b8065 100644
--- a/netx/net/sourceforge/jnlp/JNLPFile.java
+++ b/netx/net/sourceforge/jnlp/JNLPFile.java
@@ -17,6 +17,8 @@
 
 package net.sourceforge.jnlp;
 
+import static net.sourceforge.jnlp.runtime.Translator.R;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
@@ -32,6 +34,7 @@ import net.sourceforge.jnlp.cache.ResourceTracker;
 import net.sourceforge.jnlp.cache.UpdatePolicy;
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
 
+
 /**
  * Provides methods to access the information in a Java Network
  * Launching Protocol (JNLP) file.  The Java Network Launching
@@ -60,8 +63,6 @@ public class JNLPFile {
     // todo: currently does not filter resources by jvm version.
     //
 
-    private static String R(String key) { return JNLPRuntime.getMessage(key); }
-
     /** the location this JNLP file was created from */
     protected URL sourceLocation = null;
 
-- 
cgit v1.2.3