Mercurial > hg > release > icedtea-web-1.5

changeset 946:2d02a075cb1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor cache fixes
author Jiri Vanek <jvanek@redhat.com>
date Mon, 24 Mar 2014 16:46:09 +0100
parents 6bdbe6b2694b
children c0845e58bfba
files ChangeLog netx/net/sourceforge/jnlp/controlpanel/CachePane.java netx/net/sourceforge/jnlp/resources/Messages.properties
diffstat 3 files changed, 17 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Mar 24 09:20:18 2014 -0400
+++ b/ChangeLog	Mon Mar 24 16:46:09 2014 +0100
@@ -1,3 +1,10 @@
+2014-03-20  Jiri Vanek  <jvanek@redhat.com>
+
+	* netx/net/sourceforge/jnlp/controlpanel/CachePane.java: (visualCleanCache)
+	consider exception in cache operation as not-scuess.
+	* netx/net/sourceforge/jnlp/resources/Messages.properties: (CCannotClearCache)
+	(CFakedCache) (CVCPCleanCacheTip) improved by fix it tips.
+
 2014-03-24  Andrew Azores  <aazores@redhat.com>
 
 	* NEWS: added mention of Trusted-only manifest attribute
--- a/netx/net/sourceforge/jnlp/controlpanel/CachePane.java	Mon Mar 24 09:20:18 2014 -0400
+++ b/netx/net/sourceforge/jnlp/controlpanel/CachePane.java	Mon Mar 24 16:46:09 2014 +0100
@@ -481,12 +481,15 @@
         parent.getContentPane().setCursor(Cursor.getDefaultCursor());
     }
 
-    public static boolean visualCleanCache(Component parent) {
-        boolean success = CacheUtil.clearCache();
-        if (!success) {
+    public static void visualCleanCache(Component parent) {
+        try {
+            boolean success = CacheUtil.clearCache();
+            if (!success) {
+                JOptionPane.showMessageDialog(parent, Translator.R("CCannotClearCache"));
+            }
+        } catch (Exception ex) {
             JOptionPane.showMessageDialog(parent, Translator.R("CCannotClearCache"));
         }
-        return success;
     }
 }
 
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties	Mon Mar 24 09:20:18 2014 -0400
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties	Mon Mar 24 16:46:09 2014 +0100
@@ -265,9 +265,9 @@
 CChooseCache=Choose a cache directory...
 CChooseCacheInfo=NetX needs a location for storing cache files.
 CChooseCacheDir=Cache directory
-CCannotClearCache=Can not clear the cache at this time. Try later. If the problem persists, try closing your browser(s) & JNLP applications. At the end you can try to kill all java applications.
+CCannotClearCache=Can not clear the cache at this time. Try later. If the problem persists, try closing your browser(s) & JNLP applications. At the end you can try to kill all java applications. \\\n You can clear cache by javaws -Xclearcache or via itw-settings Cache -> View files -> Clean all
 CFakeCache=Cache is corrupt. Fixing.
-CFakedCache=Cache was corrupt and has been fixed. It is strongly recommended that you run 'javaws -Xclearcache' and rerun your application as soon as possible.
+CFakedCache=Cache was corrupt and has been fixed. It is strongly recommended that you run 'javaws -Xclearcache' and rerun your application as soon as possible. You can also use via itw-settings Cache -> View files -> Clean all
 
 # Security
 SFileReadAccess=The application has requested read access to {0}. Do you want to allow this action?
@@ -683,7 +683,7 @@
 CVCPButRefresh=Refresh
 CVCPButDelete=Delete
 CVCPCleanCache=Clean all cache
-CVCPCleanCacheTip=Some errors may be caused by old files in your cache. Before submitting the bug, you may clear cache and try to run application again. 
+CVCPCleanCacheTip=Some errors may be caused by old files in your cache. Before submitting the bug, you may clear cache and try to run application again. \\\n You can clear cache by javaws -Xclearcache or via itw-settings Cache -> View files -> Clean all
 CVCPColLastModified=Last Modified
 CVCPColSize=Size (Bytes)
 CVCPColDomain=Domain