Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 245918 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/rse/internal/connectorservice/dstore/Activator.java (-2 / +10 lines)
Lines 18-23 Link Here
18
 * David McKnight   (IBM)        - [227406] [dstore] DStoreFileService must listen to buffer size preference changes
18
 * David McKnight   (IBM)        - [227406] [dstore] DStoreFileService must listen to buffer size preference changes
19
 * David McKnight   (IBM)        - [228334][api][breaking][dstore] Default DataStore connection timeout is too short
19
 * David McKnight   (IBM)        - [228334][api][breaking][dstore] Default DataStore connection timeout is too short
20
 * David McKnight   (IBM)        - [233160] [dstore] SSL/non-SSL alert are not appropriate
20
 * David McKnight   (IBM)        - [233160] [dstore] SSL/non-SSL alert are not appropriate
21
 * David McKnight   (IBM)        - [245918] [dstore] Customization of connection timeout does not work
21
 *******************************************************************************/
22
 *******************************************************************************/
22
23
23
package org.eclipse.rse.internal.connectorservice.dstore;
24
package org.eclipse.rse.internal.connectorservice.dstore;
Lines 52-64 Link Here
52
	public void start(BundleContext context) throws Exception 
53
	public void start(BundleContext context) throws Exception 
53
	{
54
	{
54
		super.start(context);
55
		super.start(context);
55
56
		
56
		initializeDefaultPreferences();
57
		// for dummy preference store - to activate the pref initializer for dstore that uses RSEUIPlugin prefs
58
		IPreferenceStore store = getDefault().getPreferenceStore();
59
		
60
		// this is just a token attempt at getting a pref (that doesn't exist to trigger the init
61
		store.getDefaultInt(IUniversalDStoreConstants.RESID_PREF_DO_KEEPALIVE);
57
	}
62
	}
58
	
63
	
59
	
64
	
65
	
66
60
	public void initializeDefaultPreferences() {
67
	public void initializeDefaultPreferences() {
61
		IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
68
		IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
69
		//IPreferenceStore store = getDefault().getPreferenceStore();
62
		//Preferences store = RSECorePlugin.getDefault().getPluginPreferences();
70
		//Preferences store = RSECorePlugin.getDefault().getPluginPreferences();
63
71
64
		store.setDefault(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT, IDStoreDefaultPreferenceConstants.DEFAULT_PREF_SOCKET_TIMEOUT);	
72
		store.setDefault(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT, IDStoreDefaultPreferenceConstants.DEFAULT_PREF_SOCKET_TIMEOUT);	
(-)plugin.xml (+7 lines)
Lines 10-15 Link Here
10
that contains this file: David McKnight
10
that contains this file: David McKnight
11
11
12
Contributors:
12
Contributors:
13
David McKnight   (IBM)        - [245918] [dstore] Customization of connection timeout does not work
13
-->
14
-->
14
<?eclipse version="3.0"?>
15
<?eclipse version="3.0"?>
15
<plugin>
16
<plugin>
Lines 22-25 Link Here
22
            id="org.eclipse.rse.connectorservice.DStorePreferences">
23
            id="org.eclipse.rse.connectorservice.DStorePreferences">
23
      </page>
24
      </page>
24
    </extension>
25
    </extension>
26
    
27
    <extension
28
         point="org.eclipse.core.runtime.preferences">
29
          <initializer class="org.eclipse.rse.internal.connectorservice.dstore.DStorePreferenceInitializer"/>   
30
   </extension>
31
   
25
</plugin>
32
</plugin>
(-)src/org/eclipse/rse/internal/connectorservice/dstore/DStorePreferenceInitializer.java (+33 lines)
Added Link Here
1
/********************************************************************************
2
 * Copyright (c) 2008 IBM Corporation. All rights reserved.
3
 * This program and the accompanying materials are made available under the terms
4
 * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
5
 * available at http://www.eclipse.org/legal/epl-v10.html
6
 * 
7
 * Initial Contributors:
8
 * The following IBM employees contributed to the Remote System Explorer
9
 * component that contains this file: David McKnight.
10
 * 
11
 * Contributors:
12
 * David McKnight   (IBM)        - [245918] [dstore] Customization of connection timeout does not work
13
 ********************************************************************************/
14
package org.eclipse.rse.internal.connectorservice.dstore;
15
16
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
17
18
public class DStorePreferenceInitializer extends AbstractPreferenceInitializer {
19
20
    /**
21
     * Constructor.
22
     */
23
    public DStorePreferenceInitializer() {
24
        super();
25
    }
26
27
    /**
28
     * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
29
     */
30
    public void initializeDefaultPreferences() {
31
        Activator.getDefault().initializeDefaultPreferences();
32
    }
33
}

Return to bug 245918