X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPreferences.java;h=6972657d2ef9f5fe680ab16788917929400032e2;hb=023163e0fe8837c1ddb75eb30abc058f7747b5c2;hp=3cada85d5f1a208455a1e6f133ef703cbfaa57ba;hpb=419898b96abeb2f9cdc77b22b34d71fff5451fd9;p=jalview.git diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java index 3cada85..6972657 100755 --- a/src/jalview/gui/Preferences.java +++ b/src/jalview/gui/Preferences.java @@ -81,6 +81,10 @@ import jalview.ws.sifts.SiftsSettings; * @author $author$ * @version $Revision$ */ +/* + * for merge with Jalview-JS + public class Preferences extends GPreferences implements ApplicationSingletonI + */ public class Preferences extends GPreferences { public static final String ENABLE_SPLIT_FRAME = "ENABLE_SPLIT_FRAME"; @@ -129,6 +133,8 @@ public class Preferences extends GPreferences private String previousProxyType; + private static Preferences INSTANCE = null; // add "final" + /** * Holds name and link separated with | character. Sequence ID must be * $SEQUENCE_ID$ or $SEQUENCE_ID=/.possible | chars ./=$ @@ -188,17 +194,50 @@ public class Preferences extends GPreferences private OptionsParam textOpt = new OptionsParam( MessageManager.getString("action.text"), "Text"); - /** - * Creates a new Preferences object. - */ - public Preferences() + // get singleton Preferences instance + public static Preferences getInstance() + { + if (INSTANCE == null || INSTANCE.frame == null + || INSTANCE.frame.isClosed()) + { + INSTANCE = new Preferences(); + } + return INSTANCE; + + /* + * Replace code with the following for Jalvew-JS + Preferences INSTANCE = ApplicationSingletonProvider.getInstance(Preferences.class); + if (INSTANCE == null || INSTANCE.frame == null + || INSTANCE.frame.isClosed()) + { + ApplicationSingletonProvider.remove(Preferences.class); + INSTANCE = ApplicationSingletonProvider.getInstance(Preferences.class); + } + return INSTANCE; + */ + } + + public static void openPreferences() { - new Preferences(0); + openPreferences(0, null); } - public Preferences(int selectTab) + public static void openPreferences(int selectTab, String message) { - super(selectTab); + Preferences p = getInstance(); + p.selectTab(selectTab); + p.setMessage(message); + p.frame.show(); + p.frame.moveToFront(); + p.frame.grabFocus(); + } + + /** + * Creates a new Preferences object. + */ + private Preferences() + { + super(); frame = new JInternalFrame(); frame.setContentPane(this); if (!Platform.isJS()) @@ -335,12 +374,10 @@ public class Preferences extends GPreferences /* * Set overview panel defaults */ - gapColour.setBackground( - Cache.getDefaultColour(GAP_COLOUR, - jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_GAP)); - hiddenColour.setBackground( - Cache.getDefaultColour(HIDDEN_COLOUR, - jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_HIDDEN)); + gapColour.setBackground(Cache.getDefaultColour(GAP_COLOUR, + jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_GAP)); + hiddenColour.setBackground(Cache.getDefaultColour(HIDDEN_COLOUR, + jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_HIDDEN)); useLegacyGap.setSelected(Cache.getDefault(USE_LEGACY_GAP, false)); gapLabel.setEnabled(!useLegacyGap.isSelected()); gapColour.setEnabled(!useLegacyGap.isSelected()); @@ -363,7 +400,8 @@ public class Preferences extends GPreferences * set choice of structure viewer, and path if saved as a preference; * default to Jmol (first choice) if an unexpected value is found */ - String viewerType = Cache.getDefault(STRUCTURE_DISPLAY, ViewerType.JMOL.name()); + String viewerType = Cache.getDefault(STRUCTURE_DISPLAY, + ViewerType.JMOL.name()); structViewer.setSelectedItem(viewerType); String viewerPath = ""; ViewerType type = null; @@ -399,10 +437,11 @@ public class Preferences extends GPreferences { if (validateViewerPath()) { - Cache.setProperty(structViewer.getSelectedItem() - .equals(ViewerType.CHIMERAX.name()) - ? CHIMERAX_PATH - : CHIMERA_PATH, structureViewerPath.getText()); + Cache.setProperty( + structViewer.getSelectedItem().equals( + ViewerType.CHIMERAX.name()) ? CHIMERAX_PATH + : CHIMERA_PATH, + structureViewerPath.getText()); } } }); @@ -557,9 +596,9 @@ public class Preferences extends GPreferences proxyType.setSelected(customProxy.getModel(), true); break; default: - String message = "Incorrect PROXY_TYPE - should be 'none' (clear proxy properties), 'false' (system settings), 'true' (custom settings): " - + proxyTypeString; - Cache.log.warn(message); + Cache.log.warn( + "Incorrect PROXY_TYPE - should be 'none' (clear proxy properties), 'false' (system settings), 'true' (custom settings): " + + proxyTypeString); } proxyServerHttpTB.setText(Cache.getDefault("PROXY_SERVER", "")); proxyPortHttpTB.setText(Cache.getDefault("PROXY_PORT", "")); @@ -569,9 +608,10 @@ public class Preferences extends GPreferences proxyAuthUsernameTB .setText(Cache.getDefault("PROXY_AUTH_USERNAME", "")); // we are not storing or retrieving proxy password from .jalview_properties - proxyAuthPasswordTB.setText(Cache.proxyAuthPassword == null ? "" - : Cache.proxyAuthPassword.toString()); + proxyAuthPasswordPB.setText(Cache.proxyAuthPassword == null ? "" + : new String(Cache.proxyAuthPassword)); setCustomProxyEnabled(); + applyProxyButtonEnabled(false); defaultBrowser.setText(Cache.getDefault("DEFAULT_BROWSER", "")); @@ -615,8 +655,7 @@ public class Preferences extends GPreferences annotations_actionPerformed(null); // update the display of the annotation // settings - - + /* * Set Backups tab defaults */ @@ -636,7 +675,7 @@ public class Preferences extends GPreferences comboBox.addItem(promptEachTimeOpt); comboBox.addItem(lineArtOpt); comboBox.addItem(textOpt); - + /* * JalviewJS doesn't support Lineart so force it to Text */ @@ -670,6 +709,11 @@ public class Preferences extends GPreferences return; } + /* + * Set proxy settings first (to be before web services refresh) + */ + saveProxySettings(); + /* * Save Visual settings */ @@ -782,8 +826,7 @@ public class Preferences extends GPreferences Boolean.toString(structFromPdb.isSelected())); String viewer = structViewer.getSelectedItem().toString(); String viewerPath = structureViewerPath.getText(); - Cache.applicationProperties.setProperty(STRUCTURE_DISPLAY, - viewer); + Cache.applicationProperties.setProperty(STRUCTURE_DISPLAY, viewer); if (viewer.equals(ViewerType.CHIMERA.name())) { Cache.setOrRemove(CHIMERA_PATH, viewerPath); @@ -813,6 +856,8 @@ public class Preferences extends GPreferences /* * Save Connections settings */ + // Proxy settings set first (to catch web services) + Cache.setOrRemove("DEFAULT_BROWSER", defaultBrowser.getText()); jalview.util.BrowserLauncher.resetBrowser(); @@ -843,9 +888,6 @@ public class Preferences extends GPreferences Cache.applicationProperties.setProperty("DEFAULT_URL", sequenceUrlLinks.getPrimaryUrlId()); - // Proxy settings - saveProxySettings(); - Cache.setProperty("VERSION_CHECK", Boolean.toString(versioncheck.isSelected())); if (Cache.getProperty("USAGESTATS") != null || usagestats.isSelected()) @@ -915,16 +957,16 @@ public class Preferences extends GPreferences Cache.applicationProperties.setProperty(BackupFiles.ENABLED, Boolean.toString(enableBackupFiles.isSelected())); int preset = getComboIntStringKey(backupfilesPresetsCombo); - Cache.applicationProperties.setProperty(BackupFiles.NS + "_PRESET", Integer.toString(preset)); + Cache.applicationProperties.setProperty(BackupFiles.NS + "_PRESET", + Integer.toString(preset)); if (preset == BackupFilesPresetEntry.BACKUPFILESSCHEMECUSTOM) { BackupFilesPresetEntry customBFPE = getBackupfilesCurrentEntry(); BackupFilesPresetEntry.backupfilesPresetEntriesValues.put( BackupFilesPresetEntry.BACKUPFILESSCHEMECUSTOM, customBFPE); - Cache.applicationProperties - .setProperty(BackupFilesPresetEntry.CUSTOMCONFIG, - customBFPE.toString()); + Cache.applicationProperties.setProperty( + BackupFilesPresetEntry.CUSTOMCONFIG, customBFPE.toString()); } BackupFilesPresetEntry savedBFPE = BackupFilesPresetEntry.backupfilesPresetEntriesValues @@ -942,47 +984,12 @@ public class Preferences extends GPreferences } } - public void setProxyFromSettings() - { - String proxyType = Cache.getDefault("USE_PROXY", - Cache.PROXYTYPE_SYSTEM); - if (proxyType.equals(Cache.PROXYTYPE_NONE)) - { - if (!previousProxyType.equals(proxyType)) - Cache.log.info("Setting no proxy settings"); - Cache.setProxyProperties(null, null, null, null, null, null, null, - null, null); - } - else if (proxyType.equals(Cache.PROXYTYPE_CUSTOM)) - { - if (!previousProxyType.equals(proxyType)) - Cache.log.info("Setting custom proxy settings"); - boolean proxyAuthSet = Cache.getDefault("PROXY_AUTH", false); - Cache.setProxyProperties(Cache.getDefault("PROXY_SERVER", null), - Cache.getDefault("PROXY_PORT", null), - Cache.getDefault("PROXY_SERVER_HTTPS", null), - Cache.getDefault("PROXY_PORT_HTTPS", null), - proxyAuthSet ? Cache.getDefault("PROXY_AUTH_USERNAME", "") - : null, - proxyAuthSet ? Cache.proxyAuthPassword : null, - proxyAuthSet ? Cache.getDefault("PROXY_AUTH_USERNAME", "") - : null, - proxyAuthSet ? Cache.proxyAuthPassword : null, "localhost"); - } - else // systemProxy should be selected and is sensible default anyway - { - if (!previousProxyType.equals(proxyType)) - Cache.log.info("Setting system proxy settings"); - Cache.resetProxyProperties(); - } - } - public void saveProxySettings() { - Cache.applicationProperties.setProperty("USE_PROXY", - customProxy.isSelected() ? Cache.PROXYTYPE_CUSTOM - : noProxy.isSelected() ? Cache.PROXYTYPE_NONE - : Cache.PROXYTYPE_SYSTEM); + String newProxyType = customProxy.isSelected() ? Cache.PROXYTYPE_CUSTOM + : noProxy.isSelected() ? Cache.PROXYTYPE_NONE + : Cache.PROXYTYPE_SYSTEM; + Cache.applicationProperties.setProperty("USE_PROXY", newProxyType); Cache.setOrRemove("PROXY_SERVER", proxyServerHttpTB.getText()); Cache.setOrRemove("PROXY_PORT", proxyPortHttpTB.getText()); Cache.setOrRemove("PROXY_SERVER_HTTPS", proxyServerHttpsTB.getText()); @@ -990,8 +997,15 @@ public class Preferences extends GPreferences Cache.setOrRemove("PROXY_AUTH", Boolean.toString(proxyAuth.isSelected())); Cache.setOrRemove("PROXY_AUTH_USERNAME", proxyAuthUsernameTB.getText()); - Cache.proxyAuthPassword = proxyAuthPasswordTB.getPassword(); - setProxyFromSettings(); + Cache.proxyAuthPassword = proxyAuthPasswordPB.getPassword(); + Cache.setProxyPropertiesFromPreferences(previousProxyType); + if (newProxyType.equals(Cache.PROXYTYPE_CUSTOM) + || !newProxyType.equals(previousProxyType)) + { + // force a re-lookup of ws if proxytype is custom or has changed + wsPrefs.update++; + } + previousProxyType = newProxyType; } /** @@ -1262,8 +1276,7 @@ public class Preferences extends GPreferences if (!useLegacyGap.isSelected()) { JalviewColourChooser.showColourChooser(this, - MessageManager.getString("label.select_gap_colour"), - gap); + MessageManager.getString("label.select_gap_colour"), gap); } } @@ -1271,8 +1284,7 @@ public class Preferences extends GPreferences public void hiddenColour_actionPerformed(JPanel hidden) { JalviewColourChooser.showColourChooser(this, - MessageManager.getString("label.select_hidden_colour"), - hidden); + MessageManager.getString("label.select_hidden_colour"), hidden); } @Override