Changeset 17663 in josm

Timestamp:

2021-03-25T01:56:53+01:00 (4 years ago)

Author:

Don-vip

Message:

see #18737 - add JNLP robustness in order to be able to quit unsigned JAR with OpenWebStart and display about screen

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AboutAction.java (modified) (6 diffs)
• data/cache/JCSCacheManager.java (modified) (6 diffs)
• spi/lifecycle/Lifecycle.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AboutAction.java

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
+import static java.awt.GridBagConstraints.HORIZONTAL;
+import static javax.swing.SwingConstants.CENTER;
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -105 +107 @@
                 "<p style='font-size:50%'></p>" +
                 "</html>");
-        info.add(label, GBC.eol().fill(GBC.HORIZONTAL).insets(10, 0, 0, 10));
+        info.add(label, GBC.eol().fill(HORIZONTAL).insets(10, 0, 0, 10));
         info.add(new JLabel(tr("Homepage")), GBC.std().insets(10, 0, 10, 0));
         info.add(new UrlLabel(Config.getUrls().getJOSMWebsite(), 2), GBC.eol());
@@ -121 +123 @@
 
         JPanel inst = new JPanel(new GridBagLayout());
-        final String pathToPreferences = ShowStatusReportAction
-                .paramCleanup(Preferences.main().getPreferenceFile().getAbsolutePath());
-        inst.add(new JLabel(tr("Preferences are stored in {0}", pathToPreferences)), GBC.eol().insets(0, 0, 0, 10));
+        inst.add(new JLabel(tr("Preferences are stored in {0}", getPathToPreferences())), GBC.eol().insets(0, 0, 0, 10));
         inst.add(new JLabel(tr("Symbolic names for directories and the actual paths:")),
                 GBC.eol().insets(0, 0, 0, 10));
@@ -147 +147 @@
         JPanel panel = new JPanel(new GridBagLayout());
         panel.setPreferredSize(new Dimension(890, 300));
-        panel.add(new JLabel("", ImageProvider.get("logo.svg", ImageProvider.ImageSizes.ABOUT_LOGO),
-                JLabel.CENTER), GBC.std().insets(0, 5, 0, 0));
+        panel.add(new JLabel("", ImageProvider.get("logo.svg", ImageSizes.ABOUT_LOGO), CENTER), GBC.std().insets(0, 5, 0, 0));
         panel.add(about, GBC.std().fill());
         return panel;
+    }
+
+    private static String getPathToPreferences() {
+        File preferenceFile = Preferences.main().getPreferenceFile();
+        try {
+            return ShowStatusReportAction.paramCleanup(preferenceFile.getAbsolutePath());
+        } catch (SecurityException e) {
+            Logging.warn(e);
+            return ShowStatusReportAction.paramCleanup(preferenceFile.getPath());
+        }
     }
 
@@ -176 +185 @@
             putValue(Action.NAME, "...");
             this.dir = dir;
-            setEnabled(dir != null && new File(dir).isDirectory());
+            try {
+                setEnabled(dir != null && new File(dir).isDirectory());
+            } catch (SecurityException e) {
+                setEnabled(false);
+                Logging.warn(e);
+            }
         }
 
@@ -209 +223 @@
         dirLabel.setFont(GuiHelper.getMonospacedFont(dirLabel));
         dirLabel.setOpaque(false);
-        inst.add(dirLabel, GBC.std().fill(GBC.HORIZONTAL));
+        inst.add(dirLabel, GBC.std().fill(HORIZONTAL));
         JButton btn = new JButton(new OpenDirAction(dir));
         btn.setToolTipText(tr("Open directory"));

trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java

@@ -42 +42 @@
  */
 public final class JCSCacheManager {
-    private static final long maxObjectTTL = -1;
+    private static final long MAX_OBJECT_TTL = -1;
     private static final String PREFERENCE_PREFIX = "jcs.cache";
+
+    /**
+     * Property that determines the disk cache implementation
+     */
     public static final BooleanProperty USE_BLOCK_CACHE = new BooleanProperty(PREFERENCE_PREFIX + ".use_block_cache", true);
 
-    private static final AuxiliaryCacheFactory DISK_CACHE_FACTORY =
-            USE_BLOCK_CACHE.get() ? new BlockDiskCacheFactory() : new IndexedDiskCacheFactory();
+    private static final AuxiliaryCacheFactory DISK_CACHE_FACTORY = getDiskCacheFactory();
     private static FileLock cacheDirLock;
 
@@ -139 +142 @@
         props.setProperty("jcs.default.elementattributes",                    CacheEntryAttributes.class.getCanonicalName());
         props.setProperty("jcs.default.elementattributes.IsEternal",          "false");
-        props.setProperty("jcs.default.elementattributes.MaxLife",            Long.toString(maxObjectTTL));
-        props.setProperty("jcs.default.elementattributes.IdleTime",           Long.toString(maxObjectTTL));
+        props.setProperty("jcs.default.elementattributes.MaxLife",            Long.toString(MAX_OBJECT_TTL));
+        props.setProperty("jcs.default.elementattributes.IdleTime",           Long.toString(MAX_OBJECT_TTL));
         props.setProperty("jcs.default.elementattributes.IsSpool",            "true");
         // CHECKSTYLE.ON: SingleSpaceSeparator
@@ -148 +151 @@
             Logging.log(Logging.LEVEL_WARN, "Unable to initialize JCS", e);
         }
+    }
+
+    private static AuxiliaryCacheFactory getDiskCacheFactory() {
+        try {
+            return useBlockCache() ? new BlockDiskCacheFactory() : new IndexedDiskCacheFactory();
+        } catch (SecurityException | LinkageError e) {
+            Logging.error(e);
+            return null;
+        }
+    }
+
+    private static boolean useBlockCache() {
+        return USE_BLOCK_CACHE.get() == Boolean.TRUE;
     }
 
@@ -173 +189 @@
     @SuppressWarnings("unchecked")
     public static <K, V> CacheAccess<K, V> getCache(String cacheName, int maxMemoryObjects, int maxDiskObjects, String cachePath) {
-        CacheAccess<K, V> cacheAccess = JCS.getInstance(cacheName, getCacheAttributes(maxMemoryObjects));
-        CompositeCache<K, V> cc = cacheAccess.getCacheControl();
-
-        if (cachePath != null && cacheDirLock != null) {
-            IDiskCacheAttributes diskAttributes = getDiskCacheAttributes(maxDiskObjects, cachePath, cacheName);
+        CacheAccess<K, V> cacheAccess = getCacheAccess(cacheName, getCacheAttributes(maxMemoryObjects));
+
+        if (cachePath != null && cacheDirLock != null && cacheAccess != null && DISK_CACHE_FACTORY != null) {
+            CompositeCache<K, V> cc = cacheAccess.getCacheControl();
             try {
+                IDiskCacheAttributes diskAttributes = getDiskCacheAttributes(maxDiskObjects, cachePath, cacheName);
                 if (cc.getAuxCaches().length == 0) {
                     cc.setAuxCaches(new AuxiliaryCache[]{DISK_CACHE_FACTORY.createCache(
@@ -192 +208 @@
     }
 
+    private static <K, V> CacheAccess<K, V> getCacheAccess(String cacheName, CompositeCacheAttributes cacheAttributes) {
+        try {
+            return JCS.getInstance(cacheName, cacheAttributes);
+        } catch (SecurityException | LinkageError e) {
+            Logging.error(e);
+            return null;
+        }
+    }
+
     /**
      * Close all files to ensure, that all indexes and data are properly written
@@ -201 +226 @@
     private static IDiskCacheAttributes getDiskCacheAttributes(int maxDiskObjects, String cachePath, String cacheName) {
         IDiskCacheAttributes ret;
-        removeStaleFiles(cachePath + File.separator + cacheName, USE_BLOCK_CACHE.get() ? "_INDEX_v2" : "_BLOCK_v2");
-        String newCacheName = cacheName + (USE_BLOCK_CACHE.get() ? "_BLOCK_v2" : "_INDEX_v2");
-
-        if (USE_BLOCK_CACHE.get()) {
+        removeStaleFiles(cachePath + File.separator + cacheName, useBlockCache() ? "_INDEX_v2" : "_BLOCK_v2");
+        String newCacheName = cacheName + (useBlockCache() ? "_BLOCK_v2" : "_INDEX_v2");
+
+        if (useBlockCache()) {
             BlockDiskCacheAttributes blockAttr = new BlockDiskCacheAttributes();
             /*

trunk/src/org/openstreetmap/josm/spi/lifecycle/Lifecycle.java

@@ -79 +79 @@
             }
             // asynchronous initializations to be completed eventually
-            initSequence.asynchronousRunnableTasks().forEach(service::submit);
-            initSequence.asynchronousCallableTasks().forEach(service::submit);
+            initSequence.asynchronousRunnableTasks().forEach(x -> {
+                if (x != null) service.submit(x);
+            });
+            initSequence.asynchronousCallableTasks().forEach(x -> {
+                if (x != null) service.submit(x);
+            });
             try {
                 service.shutdown();