View | Details | Raw Unified | Return to bug 303517 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/ui/internal/ide/IDEWorkbenchMessages.java (+3 lines)
Lines 13-18 Link Here
13
 * Dina Sayed, dsayed@eg.ibm.com, IBM -  bug 269844
13
 * Dina Sayed, dsayed@eg.ibm.com, IBM -  bug 269844
14
 * Serge Beauchamp (Freescale Semiconductor) - [252996] Resource filters
14
 * Serge Beauchamp (Freescale Semiconductor) - [252996] Resource filters
15
 *     Markus Schorn (Wind River Systems) -  bug 284447
15
 *     Markus Schorn (Wind River Systems) -  bug 284447
16
 *     James Blackburn (Broadcom Corp.)   -  bug 303517
16
 *******************************************************************************/
17
 *******************************************************************************/
17
package org.eclipse.ui.internal.ide;
18
package org.eclipse.ui.internal.ide;
18
19
Lines 502-507 Link Here
502
	public static String IDEWorkspacePreference_savePriorToBuildingToolTip;
503
	public static String IDEWorkspacePreference_savePriorToBuildingToolTip;
503
	public static String IDEWorkspacePreference_RefreshButtonText;
504
	public static String IDEWorkspacePreference_RefreshButtonText;
504
	public static String IDEWorkspacePreference_RefreshButtonToolTip;
505
	public static String IDEWorkspacePreference_RefreshButtonToolTip;
506
	public static String IDEWorkspacePreferencePage_RefreshOnAccessButtonText;
507
	public static String IDEWorkspacePreferencePage_RefreshOnAccessButtonToolTip;
505
	public static String IDEWorkspacePreference_fileLineDelimiter;
508
	public static String IDEWorkspacePreference_fileLineDelimiter;
506
	public static String IDEWorkspacePreference_defaultLineDelim;
509
	public static String IDEWorkspacePreference_defaultLineDelim;
507
	public static String IDEWorkspacePreference_defaultLineDelimProj;
510
	public static String IDEWorkspacePreference_defaultLineDelimProj;
(-)src/org/eclipse/ui/internal/ide/messages.properties (+3 lines)
Lines 16-21 Link Here
16
#     Serge Beauchamp (Freescale Semiconductor) - [252996] Resource filters
16
#     Serge Beauchamp (Freescale Semiconductor) - [252996] Resource filters
17
#     Serge Beauchamp (Freescale Semiconductor) - [229633] Group Support
17
#     Serge Beauchamp (Freescale Semiconductor) - [229633] Group Support
18
#     Markus Schorn (Wind River Systems) -  bug 284447
18
#     Markus Schorn (Wind River Systems) -  bug 284447
19
#     James Blackburn (Broadcom Corp.)   - bug 303517
19
###############################################################################
20
###############################################################################
20
21
21
# package: org.eclipse.ui.ide
22
# package: org.eclipse.ui.ide
Lines 476-481 Link Here
476
IDEWorkspacePreference_savePriorToBuildingToolTip= Save modified resources automatically before manual build
477
IDEWorkspacePreference_savePriorToBuildingToolTip= Save modified resources automatically before manual build
477
IDEWorkspacePreference_RefreshButtonText=&Refresh automatically
478
IDEWorkspacePreference_RefreshButtonText=&Refresh automatically
478
IDEWorkspacePreference_RefreshButtonToolTip=Automatically refresh external workspace changes
479
IDEWorkspacePreference_RefreshButtonToolTip=Automatically refresh external workspace changes
480
IDEWorkspacePreferencePage_RefreshOnAccessButtonText=Refresh files on access
481
IDEWorkspacePreferencePage_RefreshOnAccessButtonToolTip=Automatically refresh out-of-sync files when they're read or otherwise discovered out-of-sync.
479
IDEWorkspacePreference_fileLineDelimiter=New text &file line delimiter
482
IDEWorkspacePreference_fileLineDelimiter=New text &file line delimiter
480
IDEWorkspacePreference_defaultLineDelim=D&efault
483
IDEWorkspacePreference_defaultLineDelim=D&efault
481
IDEWorkspacePreference_defaultLineDelimProj=Inh&erited from container
484
IDEWorkspacePreference_defaultLineDelimProj=Inh&erited from container
(-)src/org/eclipse/ui/internal/ide/dialogs/IDEWorkspacePreferencePage.java (-4 / +36 lines)
Lines 1-5 Link Here
1
 /****************************************************************************
1
 /****************************************************************************
2
 * Copyright (c) 2000, 2010 IBM Corporation and others.
2
 * Copyright (c) 2000, 2011 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
Lines 9-14 Link Here
9
 *     IBM Corporation - initial API and implementation
9
 *     IBM Corporation - initial API and implementation
10
 *     Dina Sayed, dsayed@eg.ibm.com, IBM -  bug 269844
10
 *     Dina Sayed, dsayed@eg.ibm.com, IBM -  bug 269844
11
 *     Markus Schorn (Wind River Systems) -  bug 284447
11
 *     Markus Schorn (Wind River Systems) -  bug 284447
12
 *     James Blackburn (Broadcom Corp.)   -  bug 303517
12
 *******************************************************************************/
13
 *******************************************************************************/
13
package org.eclipse.ui.internal.ide.dialogs;
14
package org.eclipse.ui.internal.ide.dialogs;
14
15
Lines 29-34 Link Here
29
import org.eclipse.jface.util.PropertyChangeEvent;
30
import org.eclipse.jface.util.PropertyChangeEvent;
30
import org.eclipse.osgi.util.NLS;
31
import org.eclipse.osgi.util.NLS;
31
import org.eclipse.swt.SWT;
32
import org.eclipse.swt.SWT;
33
import org.eclipse.swt.events.SelectionAdapter;
34
import org.eclipse.swt.events.SelectionEvent;
32
import org.eclipse.swt.layout.GridData;
35
import org.eclipse.swt.layout.GridData;
33
import org.eclipse.swt.layout.GridLayout;
36
import org.eclipse.swt.layout.GridLayout;
34
import org.eclipse.swt.widgets.Button;
37
import org.eclipse.swt.widgets.Button;
Lines 67-72 Link Here
67
	private FieldEditor workspaceName;
70
	private FieldEditor workspaceName;
68
71
69
    private Button autoRefreshButton;
72
    private Button autoRefreshButton;
73
    private Button refreshOnAccess;
70
    
74
    
71
    private Button closeUnrelatedProjectButton;
75
    private Button closeUnrelatedProjectButton;
72
    
76
    
Lines 259-268 Link Here
259
        this.autoRefreshButton.setText(IDEWorkbenchMessages.IDEWorkspacePreference_RefreshButtonText);
263
        this.autoRefreshButton.setText(IDEWorkbenchMessages.IDEWorkspacePreference_RefreshButtonText);
260
        this.autoRefreshButton.setToolTipText(IDEWorkbenchMessages.IDEWorkspacePreference_RefreshButtonToolTip);
264
        this.autoRefreshButton.setToolTipText(IDEWorkbenchMessages.IDEWorkspacePreference_RefreshButtonToolTip);
261
265
266
        this.refreshOnAccess = new Button(parent, SWT.CHECK);
267
        this.refreshOnAccess.setText(IDEWorkbenchMessages.IDEWorkspacePreferencePage_RefreshOnAccessButtonText);
268
        this.refreshOnAccess.setToolTipText(IDEWorkbenchMessages.IDEWorkspacePreferencePage_RefreshOnAccessButtonToolTip);
269
270
        this.autoRefreshButton.addSelectionListener(new SelectionAdapter() {
271
        	/* (non-Javadoc)
272
        	 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
273
        	 */
274
        	public void widgetSelected(SelectionEvent e) {
275
        		if (autoRefreshButton.getSelection()) {
276
        			refreshOnAccess.setSelection(true);
277
        			refreshOnAccess.setEnabled(false);
278
        		} else
279
        			refreshOnAccess.setEnabled(true);
280
        	}
281
        });
282
262
        boolean autoRefresh = ResourcesPlugin.getPlugin()
283
        boolean autoRefresh = ResourcesPlugin.getPlugin()
263
                .getPluginPreferences().getBoolean(
284
                .getPluginPreferences().getBoolean(
264
                        ResourcesPlugin.PREF_AUTO_REFRESH);
285
                        ResourcesPlugin.PREF_AUTO_REFRESH);
286
        boolean accessRefresh = ResourcesPlugin.getPlugin()
287
		        .getPluginPreferences().getBoolean(
288
		                ResourcesPlugin.PREF_REFRESH_ASYNC);
265
        this.autoRefreshButton.setSelection(autoRefresh);
289
        this.autoRefreshButton.setSelection(autoRefresh);
290
        this.refreshOnAccess.setSelection(accessRefresh);
291
        this.refreshOnAccess.setEnabled(!this.autoRefreshButton.getSelection());
266
    }
292
    }
267
293
268
    /**
294
    /**
Lines 380-391 Link Here
380
        boolean closeUnrelatedProj = store.getDefaultBoolean(IDEInternalPreferences.CLOSE_UNRELATED_PROJECTS);
406
        boolean closeUnrelatedProj = store.getDefaultBoolean(IDEInternalPreferences.CLOSE_UNRELATED_PROJECTS);
381
        closeUnrelatedProjectButton.setSelection(closeUnrelatedProj);
407
        closeUnrelatedProjectButton.setSelection(closeUnrelatedProj);
382
408
383
		
409
384
        boolean autoRefresh = ResourcesPlugin.getPlugin()
410
        boolean autoRefresh = ResourcesPlugin.getPlugin()
385
                .getPluginPreferences().getDefaultBoolean(
411
                .getPluginPreferences().getDefaultBoolean(
386
                        ResourcesPlugin.PREF_AUTO_REFRESH);
412
                        ResourcesPlugin.PREF_AUTO_REFRESH);
413
        boolean accessRefresh = ResourcesPlugin.getPlugin()
414
		        .getPluginPreferences().getDefaultBoolean(
415
		                ResourcesPlugin.PREF_REFRESH_ASYNC);
387
        autoRefreshButton.setSelection(autoRefresh);
416
        autoRefreshButton.setSelection(autoRefresh);
388
        
417
        refreshOnAccess.setSelection(accessRefresh);
418
389
        clearUserSettings = true;
419
        clearUserSettings = true;
390
420
391
		List encodings = WorkbenchEncoding.getDefinedEncodings();
421
		List encodings = WorkbenchEncoding.getDefinedEncodings();
Lines 451-457 Link Here
451
481
452
        boolean autoRefresh = autoRefreshButton.getSelection();
482
        boolean autoRefresh = autoRefreshButton.getSelection();
453
        preferences.setValue(ResourcesPlugin.PREF_AUTO_REFRESH, autoRefresh);
483
        preferences.setValue(ResourcesPlugin.PREF_AUTO_REFRESH, autoRefresh);
454
        
484
        boolean accessRefresh = refreshOnAccess.getSelection();
485
        preferences.setValue(ResourcesPlugin.PREF_REFRESH_ASYNC, accessRefresh);
486
455
        boolean closeUnrelatedProj = closeUnrelatedProjectButton.getSelection();
487
        boolean closeUnrelatedProj = closeUnrelatedProjectButton.getSelection();
456
        getIDEPreferenceStore().setValue(IDEInternalPreferences.CLOSE_UNRELATED_PROJECTS, closeUnrelatedProj);
488
        getIDEPreferenceStore().setValue(IDEInternalPreferences.CLOSE_UNRELATED_PROJECTS, closeUnrelatedProj);
457
        
489
        

Return to bug 303517