Attachment 21918 Details for Bug 93845 – Patch to be applied to org.eclipse.ui.workbench.texteditor

[patch] Patch to be applied to org.eclipse.ui.workbench.texteditor

AbstractTextEditor.patch (text/plain), 14.34 KB, created by Dani Megert

on 2005-05-28 06:24:03 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dani Megert

Created: 2005-05-28 06:24:03 EDT

Size: 14.34 KB

patch

obsolete

>Index: .settings/org.eclipse.jdt.core.prefs
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench.texteditor/.settings/org.eclipse.jdt.core.prefs,v
>retrieving revision 1.5
>diff -u -r1.5 org.eclipse.jdt.core.prefs
>--- .settings/org.eclipse.jdt.core.prefs	20 Jan 2005 15:43:52 -0000	1.5
>+++ .settings/org.eclipse.jdt.core.prefs	28 May 2005 10:23:09 -0000
>@@ -1,65 +1,76 @@
>-#Mon Jan 17 11:33:36 CET 2005
>-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
>-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
>-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
>-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
>-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
>-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
>-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
>-org.eclipse.jdt.core.compiler.problem.unusedImport=error
>-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
>-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
>+#Thu May 19 14:00:05 CEST 2005
>+eclipse.preferences.version=1
>+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
>+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
> org.eclipse.jdt.core.builder.invalidClasspath=abort
> org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
>-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
>-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
>-org.eclipse.jdt.core.compiler.debug.localVariable=generate
>-org.eclipse.jdt.core.compiler.problem.deprecation=warning
>-org.eclipse.jdt.core.compiler.source=1.3
>-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
>-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
>-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
>-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
>+org.eclipse.jdt.core.circularClasspath=error
>+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
>+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
>+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
>+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
> org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
>-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
> org.eclipse.jdt.core.compiler.compliance=1.4
>+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
>+org.eclipse.jdt.core.compiler.debug.localVariable=generate
>+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
>+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
>+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
>+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
>+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
>+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
>+org.eclipse.jdt.core.compiler.problem.deprecation=warning
>+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
>+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
>+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
> org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
>-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
>+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
>+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
>+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
>+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
> org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
>-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
> org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
>-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
>-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
>-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
>-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
>-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
>-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
>-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
>-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
>-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
>-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
>+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
>+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
>+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
> org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
> org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
>-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
>-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
>-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
>-eclipse.preferences.version=1
>-org.eclipse.jdt.core.circularClasspath=error
>-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
>-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
>-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
>+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
>+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
> org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
>+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
>+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
>+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
>+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
> org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
>-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
>-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
>-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
>-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
>-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
>+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
>+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
> org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
>-org.eclipse.jdt.core.incompleteClasspath=error
>-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
>-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
>-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
>+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
> org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
>-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
>+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
>+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
>+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
>+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
>+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
>+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
>+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
>+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
>+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
>+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
>+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
>+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
>+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
>+org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
>+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
>+org.eclipse.jdt.core.compiler.problem.unusedImport=error
>+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
>+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
> org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
>+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
>+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
>+org.eclipse.jdt.core.compiler.source=1.3
>+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
>+org.eclipse.jdt.core.incompleteClasspath=error
>Index: src/org/eclipse/ui/texteditor/AbstractTextEditor.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java,v
>retrieving revision 1.181
>diff -u -r1.181 AbstractTextEditor.java
>--- src/org/eclipse/ui/texteditor/AbstractTextEditor.java	26 May 2005 11:41:58 -0000	1.181
>+++ src/org/eclipse/ui/texteditor/AbstractTextEditor.java	28 May 2005 10:23:16 -0000
>@@ -57,6 +57,7 @@
> import org.eclipse.core.commands.operations.IOperationApprover;
> import org.eclipse.core.commands.operations.IOperationHistory;
> import org.eclipse.core.commands.operations.IUndoContext;
>+import org.eclipse.core.commands.operations.IUndoableOperation;
> import org.eclipse.core.commands.operations.OperationHistoryFactory;
> 
> import org.eclipse.core.runtime.CoreException;
>@@ -95,6 +96,7 @@
> 
> import org.eclipse.jface.text.Assert;
> import org.eclipse.jface.text.BadLocationException;
>+import org.eclipse.jface.text.DefaultUndoManager;
> import org.eclipse.jface.text.DocumentEvent;
> import org.eclipse.jface.text.IDocument;
> import org.eclipse.jface.text.IDocumentListener;
>@@ -379,18 +381,18 @@
> 				Runnable r= new Runnable() {
> 					public void run() {
> 						enableSanityChecking(true);
>-
>+						
> 						if (fSourceViewer == null)
> 							return;
>-
>+						
> 						if (!canHandleMove((IEditorInput) originalElement, (IEditorInput) movedElement)) {
> 							close(true);
> 							return;
> 						}
>-
>+						
> 						if (movedElement == null || movedElement instanceof IEditorInput) {
> 							rememberSelection();
>-
>+							
> 							final IDocumentProvider d= getDocumentProvider();
> 							final String previousContent;
> 							IDocument changed= null;
>@@ -402,9 +404,51 @@
> 									previousContent= null;
> 							} else
> 								previousContent= null;
>-
>+							
>+							IUndoContext oldUndoContext= getUndoContext();
>+							IOperationHistory globalHistory= OperationHistoryFactory.getOperationHistory();
>+							IUndoableOperation[] undoHistory= null;
>+							
>+							// Remember the undo history
>+							if (oldUndoContext != null) {
>+								undoHistory= globalHistory.getUndoHistory(oldUndoContext);
>+								if (fSourceViewer instanceof ITextViewerExtension6) {
>+									IUndoManager undoManager= ((ITextViewerExtension6)fSourceViewer).getUndoManager();
>+									if (undoManager instanceof DefaultUndoManager)
>+										((DefaultUndoManager)undoManager).fReuseTextCommands= true;
>+								}
>+								
>+							}
>+							
> 							setInput((IEditorInput) movedElement);
>-
>+							
>+							// Restore the undo history
>+							IUndoContext newUndoContext= getUndoContext();
>+							if (undoHistory != null) {
>+//								for (int i= 0; i < undoHistory.length; i++) {
>+//									IUndoableOperation undoHistoryEntry= undoHistory[i];
>+//									if (newUndoContext != null) {
>+//										
>+//										undoHistoryEntry.removeContext(oldUndoContext);
>+//										undoHistoryEntry.addContext(newUndoContext);
>+//										globalHistory.add(undoHistoryEntry);
>+//									} else {
>+//										undoHistoryEntry.dispose();
>+//									}
>+//								}
>+									
>+								if (newUndoContext != null) {
>+//									// Update the undo/redo action handlers
>+//									IAction undoAction= getAction(ITextEditorActionConstants.UNDO);
>+//									IAction redoAction= getAction(ITextEditorActionConstants.REDO);
>+//									if (undoAction instanceof OperationHistoryActionHandler)
>+//										((OperationHistoryActionHandler)undoAction).update();
>+//									if (redoAction instanceof OperationHistoryActionHandler)
>+//										((OperationHistoryActionHandler)redoAction).update();
>+								}
>+								
>+							}
>+							
> 							if (changed != null) {
> 								Runnable r2= new Runnable() {
> 									public void run() {
>@@ -417,7 +461,7 @@
> 								execute(r2, doValidationAsync);
> 							} else
> 								restoreSelection();
>-
>+							
> 						}
> 					}
> 				};
>@@ -2874,6 +2918,10 @@
> 	 */
> 	private void initializeSourceViewer(IEditorInput input) {
> 
>+		StyledText st= fSourceViewer.getTextWidget();
>+//		st.setRedraw(false);
>+//		st.setRedraw(true);
>+		
> 		IAnnotationModel model= getDocumentProvider().getAnnotationModel(input);
> 		IDocument document= getDocumentProvider().getDocument(input);
> 
>@@ -2894,6 +2942,12 @@
> 		if (fIsOverwriting)
> 			fSourceViewer.getTextWidget().invokeAction(ST.TOGGLE_OVERWRITE);
> 		handleInsertModeChanged();
>+		
>+		fRememberedSelection= (ITextSelection)input.getAdapter((ITextSelection.class));
>+		if (fRememberedSelection != null)
>+			restoreSelection();
>+		
>+//		st.setRedraw(true);
> 	}
> 
> 	/**
>Index: component.xml
>===================================================================
>RCS file: component.xml
>diff -N component.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ component.xml	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,28 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+
>+<component xmlns="http://eclipse.org/component"
>+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>+   xsi:schemaLocation="http://eclipse.org/component ../component.xsd "
>+   name="Eclipse Text Editor Framework">
>+ <plugin id="org.eclipse.ui.workbench.texteditor"/>
>+
>+ <package name="org.eclipse.ui.contentassist">
>+ </package>
>+
>+ <package name="org.eclipse.ui.texteditor">
>+ </package>
>+
>+ <package name="org.eclipse.ui.texteditor.link">
>+ </package>
>+
>+ <package name="org.eclipse.ui.texteditor.quickdiff">
>+ </package>
>+
>+ <package name="org.eclipse.ui.texteditor.spelling">
>+ </package>
>+
>+ <package name="org.eclipse.ui.texteditor.templates">
>+ </package>
>+
>+ <component-depends unrestricted="true"/>
>+</component>

Actions: View | Diff

Attachments on bug 93845: 21918 | 21919