git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3103 Put jalview.jar first in getdown for .properties files. Remove now-not-neede...
[jalview.git]
/
src
/
jalview
/
gui
/
Preferences.java
diff --git
a/src/jalview/gui/Preferences.java
b/src/jalview/gui/Preferences.java
index
7a4dbc0
..
17f6af6
100755
(executable)
--- a/
src/jalview/gui/Preferences.java
+++ b/
src/jalview/gui/Preferences.java
@@
-641,7
+641,11
@@
public class Preferences extends GPreferences
setCustomProxyEnabled();
applyProxyButtonEnabled(false);
setCustomProxyEnabled();
applyProxyButtonEnabled(false);
- defaultBrowser.setText(Cache.getDefault("DEFAULT_BROWSER", ""));
+ String browserPref = Cache.getDefault("DEFAULT_BROWSER", "");
+ if (browserPref != null)
+ {
+ defaultBrowser.getModel().setSelectedItem(browserPref);
+ }
usagestats.setSelected(Cache.getDefault("USAGESTATS", false));
// note antisense here: default is true
usagestats.setSelected(Cache.getDefault("USAGESTATS", false));
// note antisense here: default is true
@@
-889,7
+893,8
@@
public class Preferences extends GPreferences
*/
// Proxy settings set first (to catch web services)
*/
// Proxy settings set first (to catch web services)
- Cache.setOrRemove("DEFAULT_BROWSER", defaultBrowser.getText());
+ Cache.setOrRemove("DEFAULT_BROWSER",
+ (String) defaultBrowser.getSelectedItem());
if (Cache.getProperty("DEFAULT_BROWSER") != null)
{
System.setProperty(IBrowserLaunching.BROWSER_SYSTEM_PROPERTY,
if (Cache.getProperty("DEFAULT_BROWSER") != null)
{
System.setProperty(IBrowserLaunching.BROWSER_SYSTEM_PROPERTY,
@@
-1284,7
+1289,8
@@
public class Preferences extends GPreferences
if (value == JFileChooser.APPROVE_OPTION)
{
if (value == JFileChooser.APPROVE_OPTION)
{
- defaultBrowser.setText(chooser.getSelectedFile().getAbsolutePath());
+ defaultBrowser.getModel().setSelectedItem(
+ chooser.getSelectedFile().getAbsolutePath());
}
}
}
}
}
}