Attachment 112910 Details for Bug 245918 – updated patch with hack to trigger intializer

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] updated patch with hack to trigger intializer

patch.txt (text/plain), 4.88 KB, created by David McKnight

on 2008-09-18 11:28:19 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2008-09-18 11:28:19 EDT

Size: 4.88 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.connectorservice.dstore
>Index: src/org/eclipse/rse/internal/connectorservice/dstore/Activator.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/Activator.java,v
>retrieving revision 1.10
>diff -u -r1.10 Activator.java
>--- src/org/eclipse/rse/internal/connectorservice/dstore/Activator.java	21 May 2008 14:45:17 -0000	1.10
>+++ src/org/eclipse/rse/internal/connectorservice/dstore/Activator.java	18 Sep 2008 15:27:50 -0000
>@@ -18,6 +18,7 @@
>  * David McKnight   (IBM)        - [227406] [dstore] DStoreFileService must listen to buffer size preference changes
>  * David McKnight   (IBM)        - [228334][api][breaking][dstore] Default DataStore connection timeout is too short
>  * David McKnight   (IBM)        - [233160] [dstore] SSL/non-SSL alert are not appropriate
>+ * David McKnight   (IBM)        - [245918] [dstore] Customization of connection timeout does not work
>  *******************************************************************************/
> 
> package org.eclipse.rse.internal.connectorservice.dstore;
>@@ -52,13 +53,20 @@
> 	public void start(BundleContext context) throws Exception 
> 	{
> 		super.start(context);
>-
>-		initializeDefaultPreferences();
>+		
>+		// for dummy preference store - to activate the pref initializer for dstore that uses RSEUIPlugin prefs
>+		IPreferenceStore store = getDefault().getPreferenceStore();
>+		
>+		// this is just a token attempt at getting a pref (that doesn't exist to trigger the init
>+		store.getDefaultInt(IUniversalDStoreConstants.RESID_PREF_DO_KEEPALIVE);
> 	}
> 	
> 	
>+	
>+
> 	public void initializeDefaultPreferences() {
> 		IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
>+		//IPreferenceStore store = getDefault().getPreferenceStore();
> 		//Preferences store = RSECorePlugin.getDefault().getPluginPreferences();
> 
> 		store.setDefault(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT, IDStoreDefaultPreferenceConstants.DEFAULT_PREF_SOCKET_TIMEOUT);	
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.dstore/plugin.xml,v
>retrieving revision 1.1
>diff -u -r1.1 plugin.xml
>--- plugin.xml	29 Jan 2008 15:25:19 -0000	1.1
>+++ plugin.xml	18 Sep 2008 15:27:50 -0000
>@@ -10,6 +10,7 @@
> that contains this file: David McKnight
> 
> Contributors:
>+David McKnight   (IBM)        - [245918] [dstore] Customization of connection timeout does not work
> -->
> <?eclipse version="3.0"?>
> <plugin>
>@@ -22,4 +23,10 @@
>             id="org.eclipse.rse.connectorservice.DStorePreferences">
>       </page>
>     </extension>
>+    
>+    <extension
>+         point="org.eclipse.core.runtime.preferences">
>+          <initializer class="org.eclipse.rse.internal.connectorservice.dstore.DStorePreferenceInitializer"/>   
>+   </extension>
>+   
> </plugin>
>Index: src/org/eclipse/rse/internal/connectorservice/dstore/DStorePreferenceInitializer.java
>===================================================================
>RCS file: src/org/eclipse/rse/internal/connectorservice/dstore/DStorePreferenceInitializer.java
>diff -N src/org/eclipse/rse/internal/connectorservice/dstore/DStorePreferenceInitializer.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/rse/internal/connectorservice/dstore/DStorePreferenceInitializer.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,33 @@
>+/********************************************************************************
>+ * Copyright (c) 2008 IBM Corporation. All rights reserved.
>+ * This program and the accompanying materials are made available under the terms
>+ * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
>+ * available at http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Initial Contributors:
>+ * The following IBM employees contributed to the Remote System Explorer
>+ * component that contains this file: David McKnight.
>+ * 
>+ * Contributors:
>+ * David McKnight   (IBM)        - [245918] [dstore] Customization of connection timeout does not work
>+ ********************************************************************************/
>+package org.eclipse.rse.internal.connectorservice.dstore;
>+
>+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
>+
>+public class DStorePreferenceInitializer extends AbstractPreferenceInitializer {
>+
>+    /**
>+     * Constructor.
>+     */
>+    public DStorePreferenceInitializer() {
>+        super();
>+    }
>+
>+    /**
>+     * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
>+     */
>+    public void initializeDefaultPreferences() {
>+        Activator.getDefault().initializeDefaultPreferences();
>+    }
>+}

Actions: View | Diff

Attachments on bug 245918: 112903 | 112910 | 112920 | 112928