Attachment 189895 Details for Bug 303517 – UI IDE patch for fix + tests 5

[patch] UI IDE patch for fix + tests 5

refresh-out-of-syncui.patch (text/plain), 7.71 KB, created by James Blackburn

on 2011-02-27 12:32:08 EST

(hide)

Description:

Filename:

MIME Type:

Creator: James Blackburn

Created: 2011-02-27 12:32:08 EST

Size: 7.71 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.ide
>Index: src/org/eclipse/ui/internal/ide/IDEWorkbenchMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchMessages.java,v
>retrieving revision 1.93
>diff -u -r1.93 IDEWorkbenchMessages.java
>--- src/org/eclipse/ui/internal/ide/IDEWorkbenchMessages.java	2 Feb 2011 16:13:16 -0000	1.93
>+++ src/org/eclipse/ui/internal/ide/IDEWorkbenchMessages.java	27 Feb 2011 17:29:13 -0000
>@@ -13,6 +13,7 @@
>  * Dina Sayed, dsayed@eg.ibm.com, IBM -  bug 269844
>  * Serge Beauchamp (Freescale Semiconductor) - [252996] Resource filters
>  *     Markus Schorn (Wind River Systems) -  bug 284447
>+ *     James Blackburn (Broadcom Corp.)   -  bug 303517
>  *******************************************************************************/
> package org.eclipse.ui.internal.ide;
> 
>@@ -502,6 +503,8 @@
> 	public static String IDEWorkspacePreference_savePriorToBuildingToolTip;
> 	public static String IDEWorkspacePreference_RefreshButtonText;
> 	public static String IDEWorkspacePreference_RefreshButtonToolTip;
>+	public static String IDEWorkspacePreferencePage_RefreshOnAccessButtonText;
>+	public static String IDEWorkspacePreferencePage_RefreshOnAccessButtonToolTip;
> 	public static String IDEWorkspacePreference_fileLineDelimiter;
> 	public static String IDEWorkspacePreference_defaultLineDelim;
> 	public static String IDEWorkspacePreference_defaultLineDelimProj;
>Index: src/org/eclipse/ui/internal/ide/messages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/messages.properties,v
>retrieving revision 1.221
>diff -u -r1.221 messages.properties
>--- src/org/eclipse/ui/internal/ide/messages.properties	2 Feb 2011 16:13:16 -0000	1.221
>+++ src/org/eclipse/ui/internal/ide/messages.properties	27 Feb 2011 17:29:13 -0000
>@@ -16,6 +16,7 @@
> #     Serge Beauchamp (Freescale Semiconductor) - [252996] Resource filters
> #     Serge Beauchamp (Freescale Semiconductor) - [229633] Group Support
> #     Markus Schorn (Wind River Systems) -  bug 284447
>+#     James Blackburn (Broadcom Corp.)   - bug 303517
> ###############################################################################
> 
> # package: org.eclipse.ui.ide
>@@ -476,6 +477,8 @@
> IDEWorkspacePreference_savePriorToBuildingToolTip= Save modified resources automatically before manual build
> IDEWorkspacePreference_RefreshButtonText=&Refresh automatically
> IDEWorkspacePreference_RefreshButtonToolTip=Automatically refresh external workspace changes
>+IDEWorkspacePreferencePage_RefreshOnAccessButtonText=Refresh files on access
>+IDEWorkspacePreferencePage_RefreshOnAccessButtonToolTip=Automatically refresh out-of-sync files when they're read or otherwise discovered out-of-sync.
> IDEWorkspacePreference_fileLineDelimiter=New text &file line delimiter
> IDEWorkspacePreference_defaultLineDelim=D&efault
> IDEWorkspacePreference_defaultLineDelimProj=Inh&erited from container
>Index: src/org/eclipse/ui/internal/ide/dialogs/IDEWorkspacePreferencePage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/IDEWorkspacePreferencePage.java,v
>retrieving revision 1.10
>diff -u -r1.10 IDEWorkspacePreferencePage.java
>--- src/org/eclipse/ui/internal/ide/dialogs/IDEWorkspacePreferencePage.java	16 Feb 2010 18:10:42 -0000	1.10
>+++ src/org/eclipse/ui/internal/ide/dialogs/IDEWorkspacePreferencePage.java	27 Feb 2011 17:29:13 -0000
>@@ -1,5 +1,5 @@
>  /****************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 IBM Corporation and others.
>  * 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
>@@ -9,6 +9,7 @@
>  *     IBM Corporation - initial API and implementation
>  *     Dina Sayed, dsayed@eg.ibm.com, IBM -  bug 269844
>  *     Markus Schorn (Wind River Systems) -  bug 284447
>+ *     James Blackburn (Broadcom Corp.)   -  bug 303517
>  *******************************************************************************/
> package org.eclipse.ui.internal.ide.dialogs;
> 
>@@ -29,6 +30,8 @@
> import org.eclipse.jface.util.PropertyChangeEvent;
> import org.eclipse.osgi.util.NLS;
> import org.eclipse.swt.SWT;
>+import org.eclipse.swt.events.SelectionAdapter;
>+import org.eclipse.swt.events.SelectionEvent;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.layout.GridLayout;
> import org.eclipse.swt.widgets.Button;
>@@ -67,6 +70,7 @@
> 	private FieldEditor workspaceName;
> 
>     private Button autoRefreshButton;
>+    private Button refreshOnAccess;
>     
>     private Button closeUnrelatedProjectButton;
>     
>@@ -259,10 +263,32 @@
>         this.autoRefreshButton.setText(IDEWorkbenchMessages.IDEWorkspacePreference_RefreshButtonText);
>         this.autoRefreshButton.setToolTipText(IDEWorkbenchMessages.IDEWorkspacePreference_RefreshButtonToolTip);
> 
>+        this.refreshOnAccess = new Button(parent, SWT.CHECK);
>+        this.refreshOnAccess.setText(IDEWorkbenchMessages.IDEWorkspacePreferencePage_RefreshOnAccessButtonText);
>+        this.refreshOnAccess.setToolTipText(IDEWorkbenchMessages.IDEWorkspacePreferencePage_RefreshOnAccessButtonToolTip);
>+
>+        this.autoRefreshButton.addSelectionListener(new SelectionAdapter() {
>+        	/* (non-Javadoc)
>+        	 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
>+        	 */
>+        	public void widgetSelected(SelectionEvent e) {
>+        		if (autoRefreshButton.getSelection()) {
>+        			refreshOnAccess.setSelection(true);
>+        			refreshOnAccess.setEnabled(false);
>+        		} else
>+        			refreshOnAccess.setEnabled(true);
>+        	}
>+        });
>+
>         boolean autoRefresh = ResourcesPlugin.getPlugin()
>                 .getPluginPreferences().getBoolean(
>                         ResourcesPlugin.PREF_AUTO_REFRESH);
>+        boolean accessRefresh = ResourcesPlugin.getPlugin()
>+		        .getPluginPreferences().getBoolean(
>+		                ResourcesPlugin.PREF_REFRESH_ASYNC);
>         this.autoRefreshButton.setSelection(autoRefresh);
>+        this.refreshOnAccess.setSelection(accessRefresh);
>+        this.refreshOnAccess.setEnabled(!this.autoRefreshButton.getSelection());
>     }
> 
>     /**
>@@ -380,12 +406,16 @@
>         boolean closeUnrelatedProj = store.getDefaultBoolean(IDEInternalPreferences.CLOSE_UNRELATED_PROJECTS);
>         closeUnrelatedProjectButton.setSelection(closeUnrelatedProj);
> 
>-		
>+
>         boolean autoRefresh = ResourcesPlugin.getPlugin()
>                 .getPluginPreferences().getDefaultBoolean(
>                         ResourcesPlugin.PREF_AUTO_REFRESH);
>+        boolean accessRefresh = ResourcesPlugin.getPlugin()
>+		        .getPluginPreferences().getDefaultBoolean(
>+		                ResourcesPlugin.PREF_REFRESH_ASYNC);
>         autoRefreshButton.setSelection(autoRefresh);
>-        
>+        refreshOnAccess.setSelection(accessRefresh);
>+
>         clearUserSettings = true;
> 
> 		List encodings = WorkbenchEncoding.getDefinedEncodings();
>@@ -451,7 +481,9 @@
> 
>         boolean autoRefresh = autoRefreshButton.getSelection();
>         preferences.setValue(ResourcesPlugin.PREF_AUTO_REFRESH, autoRefresh);
>-        
>+        boolean accessRefresh = refreshOnAccess.getSelection();
>+        preferences.setValue(ResourcesPlugin.PREF_REFRESH_ASYNC, accessRefresh);
>+
>         boolean closeUnrelatedProj = closeUnrelatedProjectButton.getSelection();
>         getIDEPreferenceStore().setValue(IDEInternalPreferences.CLOSE_UNRELATED_PROJECTS, closeUnrelatedProj);
>

Actions: View | Diff

Attachments on bug 303517: 188377 | 189175 | 189549 | 189685 | 189686 | 189752 | 189780 | 189895 | 191362 | 191898 | 191906 | 191910 | 194837