From 8e7d35d22a6ce07421cd0abbee7fe09e40d69a6e Mon Sep 17 00:00:00 2001
From: David McKnight <dmcknigh@ca.ibm.com>
Date: Fri, 29 Feb 2008 19:49:22 +0000
Subject: [PATCH] [220123][dstore] Configurable timeout on irresponsiveness

---
 .../propertypages/DStorePreferencePage.java   | 35 +++++--------------
 1 file changed, 8 insertions(+), 27 deletions(-)

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 f2771c5af7d..e106eaca82c 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
@@ -269,32 +269,7 @@ public class DStorePreferencePage extends PreferencePage implements IWorkbenchPr
 	
 	protected void performDefaults() {
 		super.performDefaults();	
-		
-		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);
+		applyValues();
 		
 	}
 
@@ -312,7 +287,8 @@ public class DStorePreferencePage extends PreferencePage implements IWorkbenchPr
 		}
 	}
 
-	public boolean performOk() {
+	private void applyValues()
+	{
 		IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
 		
 		// timeout
@@ -343,6 +319,11 @@ public class DStorePreferencePage extends PreferencePage implements IWorkbenchPr
 		// show mismatched server warning
 		boolean showMismatchedWarning = _showMismatchedServerWarningButton.getSelection();
 		store.setValue(IUniversalDStoreConstants.ALERT_MISMATCHED_SERVER, showMismatchedWarning);
+
+	}
+	
+	public boolean performOk() {
+		applyValues();
 		return super.performOk();
 	}