3 files changed, 9 insertions, 11 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"));
     }
 
     /**
diff --git a/netx/net/sourceforge/jnlp/cache/CacheUtil.java b/netx/net/sourceforge/jnlp/cache/CacheUtil.java
index 451e04a..3edc31e 100644
--- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java
+++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.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.nio.channels.FileChannel;
@@ -38,14 +40,6 @@ import net.sourceforge.jnlp.util.FileUtils;
  */
 public class CacheUtil {
 
-    private static String R(String key) {
-        return JNLPRuntime.getMessage(key);
-    }
-
-    private static String R(String key, Object param) {
-        return JNLPRuntime.getMessage(key, new Object[] {param});
-    }
-
     /**
      * Compares a URL using string compare of its protocol, host,
      * port, path, query, and anchor.  This method avoids the host
diff --git a/netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java b/netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java
index 407d6f4..f7c382e 100644
--- a/netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java
+++ b/netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java
@@ -17,6 +17,8 @@
 
 package net.sourceforge.jnlp.cache;
 
+import static net.sourceforge.jnlp.runtime.Translator.R;
+
 import java.awt.*;
 import java.awt.event.*;
 import java.net.*;
@@ -49,8 +51,8 @@ public class DefaultDownloadIndicator implements DownloadIndicator {
     // todo: this should be synchronized at some point but conflicts
     // aren't very likely.
 
-    private static String downloading = JNLPRuntime.getMessage("CDownloading");
-    private static String complete = JNLPRuntime.getMessage("CComplete");
+    private static String downloading = R("CDownloading");
+    private static String complete = R("CComplete");
 
     /** time to wait after completing but before window closes */
     private static final int CLOSE_DELAY = 750;