/hg/icedtea-web: All reading from file properties repalced by ge...
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Thu Apr 2 18:49:09 UTC 2015
changeset 1dc3e6bdf364 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=1dc3e6bdf364
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Apr 02 20:48:51 2015 +0200
All reading from file properties repalced by getter from PathsAndFiles
diffstat:
ChangeLog | 48 ++++++
netx/net/sourceforge/jnlp/cache/CacheUtil.java | 3 +-
netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java | 6 +-
netx/net/sourceforge/jnlp/config/PathsAndFiles.java | 77 ++++++++-
netx/net/sourceforge/jnlp/controlpanel/CachePane.java | 10 +-
netx/net/sourceforge/jnlp/controlpanel/CacheViewer.java | 2 +-
netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java | 3 +-
netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java | 8 +-
netx/net/sourceforge/jnlp/controlpanel/PolicyPanel.java | 10 +-
netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java | 11 +-
netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java | 23 +-
netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 8 +-
netx/net/sourceforge/jnlp/security/KeyStores.java | 56 +-----
netx/net/sourceforge/jnlp/security/SecurityUtil.java | 2 +-
netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java | 2 +-
netx/net/sourceforge/jnlp/security/dialogs/TemporaryPermissionsButton.java | 5 +-
netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java | 6 +-
netx/net/sourceforge/jnlp/services/SingleInstanceLock.java | 6 +-
netx/net/sourceforge/jnlp/services/XPersistenceService.java | 5 +-
netx/net/sourceforge/jnlp/util/XDesktopEntry.java | 3 +-
netx/net/sourceforge/jnlp/util/docprovider/TextsProvider.java | 14 +-
netx/net/sourceforge/jnlp/util/logging/LogConfig.java | 5 +-
tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java | 5 +-
tests/netx/unit/net/sourceforge/jnlp/cache/ResourceDownloaderTest.java | 3 +-
tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java | 3 +-
tests/netx/unit/net/sourceforge/jnlp/security/KeyStoresTest.java | 54 +++---
26 files changed, 228 insertions(+), 150 deletions(-)
diffs (truncated from 1002 to 500 lines):
diff -r 149d36336ed5 -r 1dc3e6bdf364 ChangeLog
--- a/ChangeLog Thu Apr 02 20:09:00 2015 +0200
+++ b/ChangeLog Thu Apr 02 20:48:51 2015 +0200
@@ -1,3 +1,51 @@
+2015-04-02 Jiri Vanek <jvanek at redhat.com>
+
+ All reading from file properties repalced by getter from PathsAndFiles
+ *netx/net/sourceforge/jnlp/cache/CacheUtil.java: read from KEY_USER_NETX_RUNNING_FILE
+ property replaced by get from MAIN_LOCK.
+ *netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java: similarly for
+ KEY_USER_PERSISTENCE_CACHE_DIR -> PCACHE_DIR and KEY_USER_LOG_DIR -> LOG_DIR
+ and KEY_USER_TMP_DIR -> TMP_DIR
+ *netx/net/sourceforge/jnlp/config/PathsAndFiles.java: added overrides of getFullPath
+ to RECENTLY_USED_FILE, SYS_CER and all USER keystores. All fields in InfrastructureFileDescriptor
+ made private final, and reasonable ones got protected setters.
+ *netx/net/sourceforge/jnlp/controlpanel/CachePane.java: KEY_USER_CACHE_DIR ->
+ CACHE_DIR, KEY_USER_NETX_RUNNING_FILE -> MAIN_LOCK. Config param removed.
+ *netx/net/sourceforge/jnlp/controlpanel/CacheViewer.java: adapted to
+ configless constructor
+ *netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java: same
+ *netx/net/sourceforge/jnlp/controlpanel/PolicyPanel.java: same
+ *netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java: KEY_USER_LOG_DIR
+ -> LOG_DIR, config made final.
+ *netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java:
+ removed redundant boxing, KEY_USER_CACHE_DIR -> CACHE_DIR
+ *netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java: KEY_USER_SECURITY_POLICY
+ -> JAVA_POLICY. getPolicyFromConfig splited into getPolicyFromConfig and
+ getPolicyFromUrl
+ *netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: read from KEY_USER_NETX_RUNNING_FILE
+ property replaced by get from MAIN_LOCK.
+ *netx/net/sourceforge/jnlp/security/KeyStores.java: removed config field and its filling.
+ (getKeyStoreLocation) all keystores properties replaced by correct PahtsAndFiles.
+ *netx/net/sourceforge/jnlp/security/SecurityUtil.java: adapted to getKeyStoreLocation
+ changed return type
+ *netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java: same
+ *netx/net/sourceforge/jnlp/security/dialogs/TemporaryPermissionsButton.java: same
+ *netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java: same
+ *netx/net/sourceforge/jnlp/services/SingleInstanceLock.java: KEY_USER_LOCKS_DIR
+ -> LOCKS_DIR
+ *netx/net/sourceforge/jnlp/services/XPersistenceService.java:
+ KEY_USER_PERSISTENCE_CACHE_DIR -> PCACHE_DIR
+ *netx/net/sourceforge/jnlp/util/XDesktopEntry.java: KEY_USER_TMP_DIR -> TMP_DIR
+ *netx/net/sourceforge/jnlp/util/docprovider/TextsProvider.java: adapted
+ to existence of file protocol by new method removeFileProtocol
+ *netx/net/sourceforge/jnlp/util/logging/LogConfig.java: KEY_USER_LOG_DIR -> LOG_DIR
+ *tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java: KEY_USER_CACHE_DIR ->
+ CACHE_DIR
+ *tests/netx/unit/net/sourceforge/jnlp/cache/ResourceDownloaderTest.java: same
+ *tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java: same
+ *tests/netx/unit/net/sourceforge/jnlp/security/KeyStoresTest.java: adapted to
+ getKeyStoreLocation
+
2015-04-02 Jiri Vanek <jvanek at redhat.com>
* tests/netx/unit/net/sourceforge/jnlp/security/KeyStoresTest.java: new file,
diff -r 149d36336ed5 -r 1dc3e6bdf364 netx/net/sourceforge/jnlp/cache/CacheUtil.java
--- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java Thu Apr 02 20:09:00 2015 +0200
+++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java Thu Apr 02 20:48:51 2015 +0200
@@ -40,6 +40,7 @@
import net.sourceforge.jnlp.Version;
import net.sourceforge.jnlp.config.DeploymentConfiguration;
+import net.sourceforge.jnlp.config.PathsAndFiles;
import net.sourceforge.jnlp.runtime.ApplicationInstance;
import net.sourceforge.jnlp.runtime.JNLPRuntime;
import static net.sourceforge.jnlp.runtime.Translator.R;
@@ -170,7 +171,7 @@
* @return true if the cache can be cleared at this time without problems
*/
private static boolean okToClearCache() {
- File otherJavawsRunning = new File(JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_USER_NETX_RUNNING_FILE));
+ File otherJavawsRunning = PathsAndFiles.MAIN_LOCK.getFile();
FileLock locking = null;
try {
if (otherJavawsRunning.isFile()) {
diff -r 149d36336ed5 -r 1dc3e6bdf364 netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java
--- a/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Thu Apr 02 20:09:00 2015 +0200
+++ b/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Thu Apr 02 20:48:51 2015 +0200
@@ -766,11 +766,11 @@
}
String legacyPcahceDir = LEGACY_USER_HOME + File.separator + "pcache";
- String currentPcacheDir = Defaults.getDefaults().get(DeploymentConfiguration.KEY_USER_PERSISTENCE_CACHE_DIR).getDefaultValue();
+ String currentPcacheDir = PathsAndFiles.PCACHE_DIR.getDefaultFullPath();
errors += moveLegacyToCurrent(legacyPcahceDir, currentPcacheDir);
String legacyLogDir = LEGACY_USER_HOME + File.separator + "log";
- String currentLogDir = Defaults.getDefaults().get(DeploymentConfiguration.KEY_USER_LOG_DIR).getDefaultValue();
+ String currentLogDir = PathsAndFiles.LOG_DIR.getDefaultFullPath();
errors += moveLegacyToCurrent(legacyLogDir, currentLogDir);
String legacyProperties = LEGACY_USER_HOME + File.separator + DEPLOYMENT_PROPERTIES;
@@ -787,7 +787,7 @@
errors += moveLegacyToCurrent(legacyAppletTrust, currentAppletTrust);
String legacyTmp = LEGACY_USER_HOME + File.separator + "tmp";
- String currentTmp = Defaults.getDefaults().get(DeploymentConfiguration.KEY_USER_TMP_DIR).getDefaultValue();
+ String currentTmp = PathsAndFiles.TMP_DIR.getDefaultFullPath();
errors += moveLegacyToCurrent(legacyTmp, currentTmp);
OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, "Removing now empty " + LEGACY_USER_HOME);
diff -r 149d36336ed5 -r 1dc3e6bdf364 netx/net/sourceforge/jnlp/config/PathsAndFiles.java
--- a/netx/net/sourceforge/jnlp/config/PathsAndFiles.java Thu Apr 02 20:09:00 2015 +0200
+++ b/netx/net/sourceforge/jnlp/config/PathsAndFiles.java Thu Apr 02 20:48:51 2015 +0200
@@ -131,7 +131,14 @@
}
private static class RECENTLY_USED_FILE_HOLDER {
- static final InfrastructureFileDescriptor RECENTLY_USED_FILE = new ItwCacheFileDescriptor(CACHE_INDEX_FILE_NAME, CACHE_DIR.getFile().getName(), "FILErecentlyUsed", Target.JAVAWS, Target.ITWEB_SETTINGS);
+ static final InfrastructureFileDescriptor RECENTLY_USED_FILE = new ItwCacheFileDescriptor(CACHE_INDEX_FILE_NAME, CACHE_DIR.getFile().getName(), "FILErecentlyUsed", Target.JAVAWS, Target.ITWEB_SETTINGS){
+
+ @Override
+ public String getFullPath() {
+ return clean(CACHE_DIR.getFullPath()+File.separator+this.getFileName());
+ }
+
+ };
}
public static final InfrastructureFileDescriptor PCACHE_DIR = new ItwCacheFileDescriptor("pcache", "FILEappdata", Target.JAVAWS, Target.ITWEB_SETTINGS){
@@ -200,12 +207,41 @@
}
};
- public static final InfrastructureFileDescriptor USER_CACERTS = new UserCacertsFileDescriptor("trusted.cacerts");
- public static final InfrastructureFileDescriptor USER_JSSECAC = new UserCacertsFileDescriptor("trusted.jssecacerts");
- public static final InfrastructureFileDescriptor USER_CERTS = new UserCacertsFileDescriptor("trusted.certs");
- public static final InfrastructureFileDescriptor USER_JSSECER = new UserCacertsFileDescriptor("trusted.jssecerts");
- public static final InfrastructureFileDescriptor USER_CLIENTCERT = new UserCacertsFileDescriptor("trusted.clientcerts");
+ public static final InfrastructureFileDescriptor USER_CACERTS = new UserCacertsFileDescriptor("trusted.cacerts") {
+ @Override
+ public String getFullPath() {
+ return gcpd(DeploymentConfiguration.KEY_USER_TRUSTED_CA_CERTS);
+ }
+ };
+ public static final InfrastructureFileDescriptor USER_JSSECAC = new UserCacertsFileDescriptor("trusted.jssecacerts") {
+ @Override
+ public String getFullPath() {
+ return gcpd(DeploymentConfiguration.KEY_USER_TRUSTED_JSSE_CA_CERTS);
+ }
+
+ };
+ public static final InfrastructureFileDescriptor USER_CERTS = new UserCacertsFileDescriptor("trusted.certs") {
+ @Override
+ public String getFullPath() {
+ return gcpd(DeploymentConfiguration.KEY_USER_TRUSTED_CERTS);
+ }
+
+ };
+ public static final InfrastructureFileDescriptor USER_JSSECER = new UserCacertsFileDescriptor("trusted.jssecerts") {
+ @Override
+ public String getFullPath() {
+ return gcpd(DeploymentConfiguration.KEY_USER_TRUSTED_JSSE_CERTS);
+ }
+
+ };
+ public static final InfrastructureFileDescriptor USER_CLIENTCERT = new UserCacertsFileDescriptor("trusted.clientcerts") {
+ @Override
+ public String getFullPath() {
+ return gcpd(DeploymentConfiguration.KEY_USER_TRUSTED_CLIENT_CERTS);
+ }
+
+ };
public static final InfrastructureFileDescriptor SYS_CACERT = new SystemJavaSecurityFileDescriptor("cacerts") {
@Override
@@ -222,7 +258,12 @@
}
};
- public static final InfrastructureFileDescriptor SYS_CERT = new SystemJavaSecurityFileDescriptor("trusted.certs");
+ public static final InfrastructureFileDescriptor SYS_CERT = new SystemJavaSecurityFileDescriptor("trusted.certs"){
+ @Override
+ public String getFullPath() {
+ return gcpd(DeploymentConfiguration.KEY_SYSTEM_TRUSTED_CERTS);
+ }
+ };
public static final InfrastructureFileDescriptor SYS_JSSECERT = new SystemJavaSecurityFileDescriptor("trusted.jssecerts") {
@Override
@@ -243,7 +284,7 @@
@Override
public String getDescription() {
- return Translator.R(descriptionKey, DeploymentConfiguration.KEY_JRE_DIR);
+ return Translator.R(getDescriptionKey(), DeploymentConfiguration.KEY_JRE_DIR);
}
};
@@ -299,10 +340,10 @@
public static class InfrastructureFileDescriptor {
- public final String fileName;
- public final String pathStub;
- public final String systemPathStub;
- protected final String descriptionKey;
+ private final String fileName;
+ private final String pathStub;
+ private final String systemPathStub;
+ private final String descriptionKey;
private final Target[] target;
private InfrastructureFileDescriptor(String fileName, String pathStub, String systemPathStub, String descriptionKey, Target... target) {
@@ -343,6 +384,16 @@
return systemPathStub;
}
+ protected String getFileName() {
+ return fileName;
+ }
+
+ protected String getDescriptionKey() {
+ return descriptionKey;
+ }
+
+
+
/**
* This remaining part of file declaration, when acronym is removed.
* See getDirViaAcronym.
@@ -380,7 +431,7 @@
* @param s string to be cleaned
* @return cleaned string
*/
- private String clean(String s) {
+ protected String clean(String s) {
while (s.contains(File.separator + File.separator)) {
s = s.replace(File.separator + File.separator, File.separator);
diff -r 149d36336ed5 -r 1dc3e6bdf364 netx/net/sourceforge/jnlp/controlpanel/CachePane.java
--- a/netx/net/sourceforge/jnlp/controlpanel/CachePane.java Thu Apr 02 20:09:00 2015 +0200
+++ b/netx/net/sourceforge/jnlp/controlpanel/CachePane.java Thu Apr 02 20:48:51 2015 +0200
@@ -60,7 +60,6 @@
import net.sourceforge.jnlp.cache.CacheDirectory;
import net.sourceforge.jnlp.cache.CacheUtil;
import net.sourceforge.jnlp.cache.DirectoryNode;
-import net.sourceforge.jnlp.config.DeploymentConfiguration;
import net.sourceforge.jnlp.config.PathsAndFiles;
import net.sourceforge.jnlp.runtime.Translator;
import net.sourceforge.jnlp.util.FileUtils;
@@ -70,7 +69,6 @@
public class CachePane extends JPanel {
JDialog parent;
- DeploymentConfiguration config;
private final String location;
private JComponent defaultFocusComponent;
DirectoryNode root;
@@ -88,13 +86,11 @@
* Creates a new instance of the CachePane.
*
* @param parent The parent dialog that uses this pane.
- * @param config The DeploymentConfiguration file.
*/
- public CachePane(JDialog parent, DeploymentConfiguration config) {
+ public CachePane(JDialog parent) {
super(new BorderLayout());
this.parent = parent;
- this.config = config;
- location = config.getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR);
+ location = PathsAndFiles.CACHE_DIR.getFullPath();
addComponents();
}
@@ -272,7 +268,7 @@
public void run() {
try {
FileLock fl = null;
- File netxRunningFile = new File(config.getProperty(DeploymentConfiguration.KEY_USER_NETX_RUNNING_FILE));
+ File netxRunningFile = PathsAndFiles.MAIN_LOCK.getFile();
if (!netxRunningFile.exists()) {
try {
FileUtils.createParentDir(netxRunningFile);
diff -r 149d36336ed5 -r 1dc3e6bdf364 netx/net/sourceforge/jnlp/controlpanel/CacheViewer.java
--- a/netx/net/sourceforge/jnlp/controlpanel/CacheViewer.java Thu Apr 02 20:09:00 2015 +0200
+++ b/netx/net/sourceforge/jnlp/controlpanel/CacheViewer.java Thu Apr 02 20:48:51 2015 +0200
@@ -72,7 +72,7 @@
c.weighty = 1;
c.gridx = 0;
c.gridy = 0;
- topPanel = new CachePane(this, this.config);
+ topPanel = new CachePane(this);
contentPane.add(topPanel, c);
pack();
diff -r 149d36336ed5 -r 1dc3e6bdf364 netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java Thu Apr 02 20:09:00 2015 +0200
+++ b/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java Thu Apr 02 20:48:51 2015 +0200
@@ -360,7 +360,7 @@
}
private JPanel createPolicySettingsPanel() {
- return new PolicyPanel(this, this.config);
+ return new PolicyPanel(this);
}
private JPanel createJVMSettingsPanel() {
@@ -429,7 +429,6 @@
// ignore; not a big deal
}
- KeyStores.setConfiguration(config);
SwingUtilities.invokeLater(new Runnable() {
@Override
diff -r 149d36336ed5 -r 1dc3e6bdf364 netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java Thu Apr 02 20:09:00 2015 +0200
+++ b/netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java Thu Apr 02 20:48:51 2015 +0200
@@ -38,8 +38,8 @@
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
-import net.sourceforge.jnlp.config.Defaults;
import net.sourceforge.jnlp.config.DeploymentConfiguration;
+import net.sourceforge.jnlp.config.PathsAndFiles;
import net.sourceforge.jnlp.runtime.Translator;
import net.sourceforge.jnlp.util.logging.LogConfig;
@@ -61,7 +61,7 @@
};
- private DeploymentConfiguration config;
+ private final DeploymentConfiguration config;
/**
* Create a new instance of the debugging panel.
@@ -86,7 +86,7 @@
final JLabel debuggingDescription = new JLabel("<html>" + Translator.R("CPDebuggingDescription") + "<hr /><br /></html>");
final JLabel logsDestinationTitle = new JLabel(Translator.R("CPFilesLogsDestDir")+": ");
- final JTextField logsDestination = new JTextField(config.getProperty(DeploymentConfiguration.KEY_USER_LOG_DIR));
+ final JTextField logsDestination = new JTextField(PathsAndFiles.LOG_DIR.getFullPath());
logsDestination.getDocument().addDocumentListener(new DocumentListener() {
@@ -115,7 +115,7 @@
@Override
public void actionPerformed(ActionEvent e) {
- logsDestination.setText(Defaults.getDefaults().get(DeploymentConfiguration.KEY_USER_LOG_DIR).getDefaultValue());
+ logsDestination.setText(PathsAndFiles.LOG_DIR.getDefaultFullPath());
}
});
diff -r 149d36336ed5 -r 1dc3e6bdf364 netx/net/sourceforge/jnlp/controlpanel/PolicyPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/PolicyPanel.java Thu Apr 02 20:09:00 2015 +0200
+++ b/netx/net/sourceforge/jnlp/controlpanel/PolicyPanel.java Thu Apr 02 20:48:51 2015 +0200
@@ -57,7 +57,7 @@
import javax.swing.JTextField;
import javax.swing.SwingUtilities;
-import net.sourceforge.jnlp.config.DeploymentConfiguration;
+import net.sourceforge.jnlp.config.PathsAndFiles;
import net.sourceforge.jnlp.security.policyeditor.PolicyEditor;
import net.sourceforge.jnlp.security.policyeditor.PolicyEditor.PolicyEditorWindow;
import net.sourceforge.jnlp.util.FileUtils;
@@ -74,15 +74,15 @@
private PolicyEditorWindow policyEditor = null;
- public PolicyPanel(final JFrame frame, final DeploymentConfiguration config) {
+ public PolicyPanel(final JFrame frame) {
super(R("CPHeadPolicy"), new GridBagLayout());
- addComponents(frame, config);
+ addComponents(frame);
}
- private void addComponents(final JFrame frame, final DeploymentConfiguration config) {
+ private void addComponents(final JFrame frame) {
JLabel aboutLabel = new JLabel("<html>" + R("CPPolicyDetail") + "</html>");
- final String fileUrlString = config.getProperty(DeploymentConfiguration.KEY_USER_SECURITY_POLICY);
+ final String fileUrlString = PathsAndFiles.JAVA_POLICY.getFullPath();
final JButton simpleEditorButton = new JButton(R("CPButSimpleEditor"));
simpleEditorButton.addActionListener(new LaunchSimplePolicyEditorAction(frame, fileUrlString));
diff -r 149d36336ed5 -r 1dc3e6bdf364 netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java Thu Apr 02 20:09:00 2015 +0200
+++ b/netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java Thu Apr 02 20:48:51 2015 +0200
@@ -48,6 +48,7 @@
import javax.swing.event.ChangeListener;
import net.sourceforge.jnlp.config.DeploymentConfiguration;
+import net.sourceforge.jnlp.config.PathsAndFiles;
import net.sourceforge.jnlp.runtime.Translator;
/**
@@ -62,10 +63,10 @@
@SuppressWarnings("serial")
public class TemporaryInternetFilesPanel extends NamedBorderPanel {
- private static final Long CACHE_UNLIMITED_SIZE = Long.valueOf(-1l);
- private static final Long CACHE_MIN_SIZE = Long.valueOf(0l);
+ private static final Long CACHE_UNLIMITED_SIZE = -1l;
+ private static final Long CACHE_MIN_SIZE = 0l;
private static final Long CACHE_MAX_SIZE = (long) Integer.MAX_VALUE;
- private static final Long SPINNER_STEP_SIZE = Long.valueOf(10l);
+ private static final Long SPINNER_STEP_SIZE = 10l;
private final JSpinner cacheSizeSpinner;
private static final long BYTES_TO_MEGABYTES = 1024l * 1024l;
@@ -107,14 +108,14 @@
lCompression = new JLabel(Translator.R("TIFPCompressionLevel") + ":"); // Sets compression level for jar files.
bLocation = new JButton(Translator.R("TIFPChange") + "...");
- location = new JTextField(this.config.getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR));
+ location = new JTextField(PathsAndFiles.CACHE_DIR.getFullPath());
locationDescription = new JLabel(Translator.R("TIFPLocationLabel") + ":");
bViewFiles = new JButton(Translator.R("TIFPViewFiles"));
diskSpacePanel = new JPanel();
diskSpacePanel.setLayout(new GridBagLayout());
- cacheDir = new File(this.config.getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR));
+ cacheDir = PathsAndFiles.CACHE_DIR.getFile();
usableDiskSpace = cacheDir.getUsableSpace() / BYTES_TO_MEGABYTES; // getUsableSpace returns bytes
addComponents();
diff -r 149d36336ed5 -r 1dc3e6bdf364 netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java Thu Apr 02 20:09:00 2015 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java Thu Apr 02 20:48:51 2015 +0200
@@ -23,6 +23,7 @@
import java.util.Enumeration;
import net.sourceforge.jnlp.config.DeploymentConfiguration;
+import net.sourceforge.jnlp.config.PathsAndFiles;
import net.sourceforge.jnlp.util.logging.OutputController;
/**
@@ -60,7 +61,7 @@
systemPolicy = Policy.getPolicy();
systemJnlpPolicy = getPolicyFromConfig(DeploymentConfiguration.KEY_SYSTEM_SECURITY_POLICY);
- userJnlpPolicy = getPolicyFromConfig(DeploymentConfiguration.KEY_USER_SECURITY_POLICY);
+ userJnlpPolicy = getPolicyFromUrl(PathsAndFiles.JAVA_POLICY.getFullPath());
String jre = System.getProperty("java.home");
jreExtDir = jre + File.separator + "lib" + File.separator + "ext";
@@ -170,19 +171,23 @@
* @return a policy based on the configuration set by the user
*/
private Policy getPolicyFromConfig(String key) {
+ DeploymentConfiguration config = JNLPRuntime.getConfiguration();
+ String policyLocation = config.getProperty(key);
+ return getPolicyFromUrl(policyLocation);
+ }
+
+ /**
+ * Constructs a delegate policy based on a config setting
+ * @param key a KEY_* in DeploymentConfiguration
+ * @return a policy based on the configuration set by the user
+ */
+ private Policy getPolicyFromUrl(String policyLocation) {
Policy policy = null;
- String policyLocation = null;
- DeploymentConfiguration config = JNLPRuntime.getConfiguration();
- policyLocation = config.getProperty(key);
if (policyLocation != null) {
try {
URI policyUri = new URI(policyLocation);
policy = getInstance("JavaPolicy", new URIParameter(policyUri));
- } catch (IllegalArgumentException e) {
- OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e);
- } catch (NoSuchAlgorithmException e) {
- OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e);
- } catch (URISyntaxException e) {
+ } catch (IllegalArgumentException | NoSuchAlgorithmException | URISyntaxException e) {
OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e);
}
}
diff -r 149d36336ed5 -r 1dc3e6bdf364 netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Thu Apr 02 20:09:00 2015 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Thu Apr 02 20:48:51 2015 +0200
@@ -61,6 +61,7 @@
import net.sourceforge.jnlp.cache.DownloadIndicator;
import net.sourceforge.jnlp.cache.UpdatePolicy;
import net.sourceforge.jnlp.config.DeploymentConfiguration;
+import net.sourceforge.jnlp.config.PathsAndFiles;
import net.sourceforge.jnlp.security.JNLPAuthenticator;
import net.sourceforge.jnlp.security.KeyStores;
import net.sourceforge.jnlp.security.SecurityDialogMessageHandler;
@@ -226,7 +227,6 @@
}
OutputController.getLogger().log(OutputController.Level.WARNING_ALL, R("RConfigurationError")+": "+getConfiguration().getLoadingException().getMessage());
}
- KeyStores.setConfiguration(getConfiguration());
isWebstartApplication = isApplication;
@@ -762,8 +762,7 @@
try {
String message = "This file is used to check if netx is running";
- File netxRunningFile = new File(JNLPRuntime.getConfiguration()
- .getProperty(DeploymentConfiguration.KEY_USER_NETX_RUNNING_FILE));
+ File netxRunningFile = PathsAndFiles.MAIN_LOCK.getFile();
if (!netxRunningFile.exists()) {
More information about the distro-pkg-dev
mailing list