Attachment 62948 Details for Bug 44295 – General-Editors preference v01

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

[patch] General-Editors preference v01

general-editors-v01.txt (text/plain), 12.11 KB, created by Paul Webster

on 2007-04-04 11:57:40 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Webster

Created: 2007-04-04 11:57:40 EDT

Size: 12.11 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/EditorReference.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorReference.java,v
>retrieving revision 1.26
>diff -u -r1.26 EditorReference.java
>--- Eclipse UI/org/eclipse/ui/internal/EditorReference.java	16 Mar 2007 18:00:31 -0000	1.26
>+++ Eclipse UI/org/eclipse/ui/internal/EditorReference.java	4 Apr 2007 15:54:39 -0000
>@@ -645,7 +645,8 @@
>             site = manager.createSite(this, part, desc, editorInput);
>             
>             // if there is saved state that's appropriate, pass it on
>-            if (part instanceof IPersistableEditor && editorState != null) {
>+            if (part instanceof IPersistableEditor && editorState != null
>+            		&& EditorManager.useIPersistableEditor()) {
> 				((IPersistableEditor) part).restoreState(editorState);
> 			}
>             
>Index: Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java,v
>retrieving revision 1.84
>diff -u -r1.84 WorkbenchMessages.java
>--- Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java	27 Mar 2007 14:21:13 -0000	1.84
>+++ Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java	4 Apr 2007 15:54:39 -0000
>@@ -387,6 +387,7 @@
> 
> 	// --- Workbench ---
> 	public static String WorkbenchPreference_showMultipleEditorTabsButton;
>+	public static String WorkbenchPreference_useIPersistableEditorButton;
> 	public static String WorkbenchPreference_showTextOnPerspectiveBar;
> 	public static String WorkbenchPreference_stickyCycleButton;
> 	public static String WorkbenchPreference_RunInBackgroundButton;
>Index: Eclipse UI/org/eclipse/ui/internal/IPreferenceConstants.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/IPreferenceConstants.java,v
>retrieving revision 1.60
>diff -u -r1.60 IPreferenceConstants.java
>--- Eclipse UI/org/eclipse/ui/internal/IPreferenceConstants.java	16 Mar 2007 18:00:31 -0000	1.60
>+++ Eclipse UI/org/eclipse/ui/internal/IPreferenceConstants.java	4 Apr 2007 15:54:39 -0000
>@@ -197,6 +197,14 @@
>     public static String SHOW_MULTIPLE_EDITOR_TABS = "SHOW_MULTIPLE_EDITOR_TABS"; //$NON-NLS-1$	
> 
>     /**
>+     * Workbench preference to use the new IPersistableEditor interface
>+     * throughout the workbench new editor/open editor calls.
>+     * 
>+     * @since 3.3
>+     */
>+    public static String USE_IPERSISTABLE_EDITORS = "USE_IPERSISTABLE_EDITORS"; //$NON-NLS-1$
>+    
>+    /**
>      * Preference to show user jobs in a dialog.
>      */
>     public static String RUN_IN_BACKGROUND = "RUN_IN_BACKGROUND"; //$NON-NLS-1$
>Index: Eclipse UI/org/eclipse/ui/internal/EditorManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorManager.java,v
>retrieving revision 1.131
>diff -u -r1.131 EditorManager.java
>--- Eclipse UI/org/eclipse/ui/internal/EditorManager.java	16 Mar 2007 18:00:32 -0000	1.131
>+++ Eclipse UI/org/eclipse/ui/internal/EditorManager.java	4 Apr 2007 15:54:39 -0000
>@@ -1558,7 +1558,8 @@
> 				persistable.saveState(inputMem);
> 				
> 				// any editors that want to persist state
>-				if (editor instanceof IPersistableEditor) {
>+				if (editor instanceof IPersistableEditor
>+						&& EditorManager.useIPersistableEditor()) {
> 					IMemento editorState = editorMem
> 							.createChild(IWorkbenchConstants.TAG_EDITOR_STATE);
> 					((IPersistableEditor) editor).saveState(editorState);
>@@ -1634,4 +1635,10 @@
> 		}
> 		return null;
> 	}
>+	
>+	public static boolean useIPersistableEditor() {
>+		IPreferenceStore store = WorkbenchPlugin.getDefault()
>+				.getPreferenceStore();
>+		return store.getBoolean(IPreferenceConstants.USE_IPERSISTABLE_EDITORS);
>+	}
> }
>Index: Eclipse UI/org/eclipse/ui/internal/messages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties,v
>retrieving revision 1.342
>diff -u -r1.342 messages.properties
>--- Eclipse UI/org/eclipse/ui/internal/messages.properties	27 Mar 2007 14:21:13 -0000	1.342
>+++ Eclipse UI/org/eclipse/ui/internal/messages.properties	4 Apr 2007 15:54:39 -0000
>@@ -345,6 +345,7 @@
> 
> # --- Workbench ---
> WorkbenchPreference_showMultipleEditorTabsButton = Show &multiple editor tabs
>+WorkbenchPreference_useIPersistableEditorButton = &Use editor state persistance
> WorkbenchPreference_showTextOnPerspectiveBar = S&how text on the perspective bar
> WorkbenchPreference_stickyCycleButton = Keep &next/previous editor, view and perspectives dialog open
> WorkbenchPreference_RunInBackgroundButton=Always r&un in background
>Index: Eclipse UI/org/eclipse/ui/internal/WorkbenchPreferenceInitializer.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPreferenceInitializer.java,v
>retrieving revision 1.33
>diff -u -r1.33 WorkbenchPreferenceInitializer.java
>--- Eclipse UI/org/eclipse/ui/internal/WorkbenchPreferenceInitializer.java	8 May 2006 20:55:37 -0000	1.33
>+++ Eclipse UI/org/eclipse/ui/internal/WorkbenchPreferenceInitializer.java	4 Apr 2007 15:54:39 -0000
>@@ -62,6 +62,7 @@
> 		node.putInt(IPreferenceConstants.EDITOR_TAB_POSITION, SWT.TOP);
> 
> 		node.putBoolean(IPreferenceConstants.SHOW_MULTIPLE_EDITOR_TABS, true);
>+		node.putBoolean(IPreferenceConstants.USE_IPERSISTABLE_EDITORS, true);
> 
> 		node.putInt(IPreferenceConstants.EDITOR_TAB_WIDTH, 3); // high
> 		node.putInt(IPreferenceConstants.OPEN_VIEW_MODE,
>Index: Eclipse UI/org/eclipse/ui/internal/actions/NewEditorAction.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/actions/NewEditorAction.java,v
>retrieving revision 1.6
>diff -u -r1.6 NewEditorAction.java
>--- Eclipse UI/org/eclipse/ui/internal/actions/NewEditorAction.java	16 Mar 2007 18:00:41 -0000	1.6
>+++ Eclipse UI/org/eclipse/ui/internal/actions/NewEditorAction.java	4 Apr 2007 15:54:39 -0000
>@@ -18,6 +18,7 @@
> import org.eclipse.ui.PartInitException;
> import org.eclipse.ui.XMLMemento;
> import org.eclipse.ui.internal.ActiveEditorAction;
>+import org.eclipse.ui.internal.EditorManager;
> import org.eclipse.ui.internal.IWorkbenchConstants;
> import org.eclipse.ui.internal.WorkbenchMessages;
> import org.eclipse.ui.internal.WorkbenchPage;
>@@ -56,7 +57,8 @@
> 			return;
> 		}
> 		try {
>-			if (editor instanceof IPersistableEditor) {
>+			if (editor instanceof IPersistableEditor 
>+					&& EditorManager.useIPersistableEditor()) {
> 				XMLMemento editorState = XMLMemento
> 						.createWriteRoot(IWorkbenchConstants.TAG_EDITOR_STATE);
> 				((IPersistableEditor) editor).saveState(editorState);
>Index: Eclipse UI/org/eclipse/ui/internal/presentations/SystemMenuNewEditor.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/presentations/SystemMenuNewEditor.java,v
>retrieving revision 1.5
>diff -u -r1.5 SystemMenuNewEditor.java
>--- Eclipse UI/org/eclipse/ui/internal/presentations/SystemMenuNewEditor.java	16 Mar 2007 18:00:35 -0000	1.5
>+++ Eclipse UI/org/eclipse/ui/internal/presentations/SystemMenuNewEditor.java	4 Apr 2007 15:54:39 -0000
>@@ -18,6 +18,7 @@
> import org.eclipse.ui.PartInitException;
> import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.XMLMemento;
>+import org.eclipse.ui.internal.EditorManager;
> import org.eclipse.ui.internal.IWorkbenchConstants;
> import org.eclipse.ui.internal.WorkbenchMessages;
> import org.eclipse.ui.internal.WorkbenchPage;
>@@ -69,7 +70,8 @@
> 						String editorId = editor.getSite().getId();
> 						if (editorId != null) {
> 							try {
>-								if (editor instanceof IPersistableEditor) {
>+								if (editor instanceof IPersistableEditor
>+										&& EditorManager.useIPersistableEditor()) {
> 									XMLMemento editorState = XMLMemento
> 											.createWriteRoot(IWorkbenchConstants.TAG_EDITOR_STATE);
> 									((IPersistableEditor) editor)
>Index: Eclipse UI/org/eclipse/ui/internal/dialogs/EditorsPreferencePage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/EditorsPreferencePage.java,v
>retrieving revision 1.42
>diff -u -r1.42 EditorsPreferencePage.java
>--- Eclipse UI/org/eclipse/ui/internal/dialogs/EditorsPreferencePage.java	16 Mar 2007 18:00:32 -0000	1.42
>+++ Eclipse UI/org/eclipse/ui/internal/dialogs/EditorsPreferencePage.java	4 Apr 2007 15:54:39 -0000
>@@ -54,6 +54,8 @@
> 
>     protected Button showMultipleEditorTabs;
> 
>+    protected Button useIPersistableEditor;
>+
>     private Composite editorReuseIndentGroup;
> 
>     private Composite editorReuseThresholdGroup;
>@@ -82,6 +84,7 @@
>         createEditorHistoryGroup(composite);
> 
>         createSpace(composite);
>+        createUseIPersistablePref(composite);
>         createShowMultipleEditorTabsPref(composite);
> 		createEditorReuseGroup(composite);
> 		((TabBehaviour)Tweaklets.get(TabBehaviour.class)).setPreferenceVisibility(editorReuseGroup, showMultipleEditorTabs);
>@@ -112,6 +115,15 @@
>         setButtonLayoutData(showMultipleEditorTabs);
>     }
> 
>+    protected void createUseIPersistablePref(Composite composite) {
>+        useIPersistableEditor = new Button(composite, SWT.CHECK);
>+        useIPersistableEditor.setText(WorkbenchMessages.WorkbenchPreference_useIPersistableEditorButton);
>+        useIPersistableEditor.setFont(composite.getFont());
>+        useIPersistableEditor.setSelection(getPreferenceStore().getBoolean(
>+                IPreferenceConstants.USE_IPERSISTABLE_EDITORS));
>+        setButtonLayoutData(useIPersistableEditor);
>+    }
>+    
>     protected Composite createComposite(Composite parent) {
>         Composite composite = new Composite(parent, SWT.NULL);
>         GridLayout layout = new GridLayout();
>@@ -131,8 +143,11 @@
>     protected void performDefaults() {
>         IPreferenceStore store = getPreferenceStore();
>         showMultipleEditorTabs
>-                .setSelection(store
>-                        .getDefaultBoolean(IPreferenceConstants.SHOW_MULTIPLE_EDITOR_TABS));
>+				.setSelection(store
>+						.getDefaultBoolean(IPreferenceConstants.SHOW_MULTIPLE_EDITOR_TABS));
>+		useIPersistableEditor
>+				.setSelection(store
>+						.getDefaultBoolean(IPreferenceConstants.USE_IPERSISTABLE_EDITORS));
>         reuseEditors.setSelection(store
>                 .getDefaultBoolean(IPreferenceConstants.REUSE_EDITORS_BOOLEAN));
>         dirtyEditorReuseGroup.setEnabled(reuseEditors.getSelection());
>@@ -154,6 +169,8 @@
>         IPreferenceStore store = getPreferenceStore();
>         store.setValue(IPreferenceConstants.SHOW_MULTIPLE_EDITOR_TABS,
>                 showMultipleEditorTabs.getSelection());
>+        store.setValue(IPreferenceConstants.USE_IPERSISTABLE_EDITORS,
>+                useIPersistableEditor.getSelection());
>         
>         // store the reuse editors setting
>         store.setValue(IPreferenceConstants.REUSE_EDITORS_BOOLEAN, reuseEditors
>#P org.eclipse.ui.ide
>Index: src/org/eclipse/ui/internal/ide/dialogs/IDEEditorsPreferencePage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/IDEEditorsPreferencePage.java,v
>retrieving revision 1.33
>diff -u -r1.33 IDEEditorsPreferencePage.java
>--- src/org/eclipse/ui/internal/ide/dialogs/IDEEditorsPreferencePage.java	16 Mar 2007 18:00:48 -0000	1.33
>+++ src/org/eclipse/ui/internal/ide/dialogs/IDEEditorsPreferencePage.java	4 Apr 2007 15:54:39 -0000
>@@ -56,6 +56,7 @@
> 		createEditorHistoryGroup(composite);
> 
> 		createSpace(composite);
>+		createUseIPersistablePref(composite);
> 		createShowMultipleEditorTabsPref(composite);
> 		createEditorReuseGroup(composite);
> 		((TabBehaviour)Tweaklets.get(TabBehaviour.class)).setPreferenceVisibility(editorReuseGroup, showMultipleEditorTabs);

Actions: View | Diff

Attachments on bug 44295: 53564 | 53629 | 55588 | 62948