diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ui/propertypages/DStorePreferencePage.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ui/propertypages/DStorePreferencePage.java index e106eaca82c..d0c56f3eceb 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ui/propertypages/DStorePreferencePage.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ui/propertypages/DStorePreferencePage.java @@ -237,39 +237,37 @@ public class DStorePreferencePage extends PreferencePage implements IWorkbenchPr protected void performApply() { super.performApply(); - IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore(); - - // timeout - String timeoutStr = _connectionTimeout.getText(); - int timeout = Integer.parseInt(timeoutStr); - store.setValue(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT, timeout); - - // do keepalive - boolean doKeepalive = _doKeepaliveButton.getSelection(); - store.setValue(IUniversalDStoreConstants.RESID_PREF_DO_KEEPALIVE, doKeepalive); - - // socket read timeout - String socketTimeoutStr = _socketReadTimeout.getText(); - int socketTimeout = Integer.parseInt(socketTimeoutStr); - store.setValue(IUniversalDStoreConstants.RESID_PREF_SOCKET_READ_TIMEOUT, socketTimeout); - - // keepalive response timeout - String keepaliveTimeoutStr = _keepaliveResponseTimeout.getText(); - int keepaliveTimeout = Integer.parseInt(keepaliveTimeoutStr); - store.setValue(IUniversalDStoreConstants.RESID_PREF_KEEPALIVE_RESPONSE_TIMEOUT, keepaliveTimeout); - - // cache remote classes - boolean cacheRemoteClasses = _cacheRemoteClassesButton.getSelection(); - store.setValue(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES, cacheRemoteClasses); - - // show mismatched server warning - boolean showMismatchedWarning = _showMismatchedServerWarningButton.getSelection(); - store.setValue(IUniversalDStoreConstants.ALERT_MISMATCHED_SERVER, showMismatchedWarning); + applyValues(); } protected void performDefaults() { super.performDefaults(); - applyValues(); + + int timeout = IUniversalDStoreConstants.DEFAULT_PREF_SOCKET_TIMEOUT; + _connectionTimeout.setText(""+timeout); //$NON-NLS-1$ + + // do keepalive + boolean doKeepalive = IUniversalDStoreConstants.DEFAULT_PREF_DO_KEEPALIVE; + _doKeepaliveButton.setSelection(doKeepalive); + + // socket read timeout + int socketTimeout = IUniversalDStoreConstants.DEFAULT_PREF_SOCKET_READ_TIMEOUT; + _socketReadTimeout.setText(""+socketTimeout); //$NON-NLS-1$ + _socketReadTimeout.setEnabled(doKeepalive); + + // keepalive response timeout + int keepaliveTimeout = IUniversalDStoreConstants.DEFAULT_PREF_KEEPALIVE_RESPONSE_TIMEOUT; + _keepaliveResponseTimeout.setText(""+keepaliveTimeout); //$NON-NLS-1$ + _keepaliveResponseTimeout.setEnabled(doKeepalive); + + + // show mismatched server warning + boolean showMismatchedWarning = IUniversalDStoreConstants.DEFAULT_ALERT_MISMATCHED_SERVER; + _showMismatchedServerWarningButton.setSelection(showMismatchedWarning); + + // cache remote classes + boolean cacheRemoteClasses = IUniversalDStoreConstants.DEFAULT_PREF_CACHE_REMOTE_CLASSES; + _cacheRemoteClassesButton.setSelection(cacheRemoteClasses); }