[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[cdt-patch] PR38047 fix move to cdt-11 branch
|
Bonjour,
at QNX request fix move to the branch.
==================================================
Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/ChangeLog,v
retrieving revision 1.135.2.1
diff -u -r1.135.2.1 ChangeLog
--- ChangeLog 29 Apr 2003 20:44:16 -0000 1.135.2.1
+++ ChangeLog 5 Jun 2003 18:17:17 -0000
@@ -1,3 +1,10 @@
+2003-05-23 Mikhail Khodjaiants
+ Fix for PR 38047: Unable to save changes in C/C++ debug editor.
+ * CDebugEditor.java
+ * EditorInputDelegate.java
+ * CDebugUIPlugin.java
+ * CDebugDocumentProvider.java: removed
+
2003-04-29 Alain Magloire
* src/org/eclipse/cdt/debug/internal/ui/editor/CDebugDocumentProvider.java (doSetInput):
Index: src/org/eclipse/cdt/debug/internal/ui/editors/CDebugDocumentProvider.java
===================================================================
RCS file: src/org/eclipse/cdt/debug/internal/ui/editors/CDebugDocumentProvider.java
diff -N src/org/eclipse/cdt/debug/internal/ui/editors/CDebugDocumentProvider.java
--- src/org/eclipse/cdt/debug/internal/ui/editors/CDebugDocumentProvider.java 29 Apr 2003 20:43:43 -0000 1.1.2.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,108 +0,0 @@
-/*
- *(c) Copyright QNX Software Systems Ltd. 2002.
- * All Rights Reserved.
- *
- */
-package org.eclipse.cdt.debug.internal.ui.editors;
-
-import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
-import org.eclipse.cdt.internal.core.model.IBufferFactory;
-import org.eclipse.cdt.internal.ui.editor.CDocumentProvider;
-import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.source.IAnnotationModel;
-
-/**
- *
- * Enter type comment.
- *
- * @since Mar 4, 2003
- */
-public class CDebugDocumentProvider extends CDocumentProvider
-{
- /**
- * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#createDocument(Object)
- */
- protected IDocument createDocument( Object element ) throws CoreException
- {
- if ( element instanceof EditorInputDelegate )
- {
- if ( ((EditorInputDelegate)element).getDelegate() != null )
- {
- return super.createDocument( ((EditorInputDelegate)element).getDelegate() );
- }
- else
- {
- IDocument document = null;
- IStorage storage = ((EditorInputDelegate)element).getStorage();
- if ( storage != null )
- {
- document = new CDocument();
- setDocumentContent( document, storage.getContents(), getDefaultEncoding() );
- }
- else
- {
- return null;
- }
- if ( document != null)
- {
- IDocumentPartitioner partitioner= CUIPlugin.getDefault().getTextTools().createDocumentPartitioner();
- partitioner.connect( document );
- document.setDocumentPartitioner( partitioner );
- }
- return document;
- }
- }
- return super.createDocument( element );
- }
-
- /**
- * @see org.eclipse.ui.texteditor.IDocumentProviderExtension#getStatus(Object)
- */
- public IStatus getStatus( Object element )
- {
- if ( element instanceof EditorInputDelegate )
- {
- if ( ((EditorInputDelegate)element).getDelegate() != null )
- {
- return super.getStatus( ((EditorInputDelegate)element).getDelegate() );
- }
- else
- {
- return createFileNotFoundStatus( ((EditorInputDelegate)element).getElement() );
- }
- }
- return super.getStatus( element );
- }
-
- private IStatus createFileNotFoundStatus( FileNotFoundElement element )
- {
- return new Status( IStatus.INFO, CDebugUIPlugin.getUniqueIdentifier(), 0, "", null );
- }
-
- protected IAnnotationModel createAnnotationModel( Object element ) throws CoreException
- {
- if ( element instanceof EditorInputDelegate && ((EditorInputDelegate)element).getDelegate() != null )
- return super.createAnnotationModel( ((EditorInputDelegate)element).getDelegate() );
- return super.createAnnotationModel( element );
- }
-
- /* (non-Javadoc)
- * This hack is important for the the outliner to work correctly.
- * The outliner looks at the working copy and it is maintain by
- * CUIPlugin.getDefault().getWorkingCopyManager()
- * CUIPlugin.getDefault().getDocumentProvider();
- * They are singletons.
- *
- * @see org.eclipse.cdt.internal.ui.editor.CDocumentProvider#getBufferFactory()
- */
- public IBufferFactory getBufferFactory() {
- return CUIPlugin.getDefault().getDocumentProvider().getBufferFactory();
- }
-
-}
Index: src/org/eclipse/cdt/debug/internal/ui/editors/CDebugEditor.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/CDebugEditor.java,v
retrieving revision 1.3.2.1
diff -u -r1.3.2.1 CDebugEditor.java
--- src/org/eclipse/cdt/debug/internal/ui/editors/CDebugEditor.java 29 Apr 2003 20:43:43 -0000 1.3.2.1
+++ src/org/eclipse/cdt/debug/internal/ui/editors/CDebugEditor.java 5 Jun 2003 18:17:17 -0000
@@ -369,7 +369,7 @@
public CDebugEditor()
{
super();
- setDocumentProvider( CDebugUIPlugin.getDefault().getDocumentProvider() );
+ setDocumentProvider( CUIPlugin.getDefault().getDocumentProvider() );
}
/* (non-Javadoc)
Index: src/org/eclipse/cdt/debug/internal/ui/editors/EditorInputDelegate.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/EditorInputDelegate.java,v
retrieving revision 1.1
diff -u -r1.1 EditorInputDelegate.java
--- src/org/eclipse/cdt/debug/internal/ui/editors/EditorInputDelegate.java 6 Mar 2003 00:13:36 -0000 1.1
+++ src/org/eclipse/cdt/debug/internal/ui/editors/EditorInputDelegate.java 5 Jun 2003 18:17:17 -0000
@@ -8,6 +8,7 @@
import java.io.ByteArrayInputStream;
import java.io.InputStream;
+import org.eclipse.cdt.ui.IEditorInputDelegate;
import org.eclipse.core.resources.IStorage;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
@@ -22,7 +23,7 @@
*
* @since Mar 4, 2003
*/
-public class EditorInputDelegate implements IEditorInput
+public class EditorInputDelegate implements IEditorInputDelegate
{
public static final int TYPE_ATTACH_SOURCE = 0;
public static final int TYPE_WORKSPACE_FILE = 1;
Index: src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java,v
retrieving revision 1.23
diff -u -r1.23 CDebugUIPlugin.java
--- src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java 7 Apr 2003 22:49:08 -0000 1.23
+++ src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java 5 Jun 2003 18:17:17 -0000
@@ -13,7 +13,6 @@
import org.eclipse.cdt.debug.internal.ui.CDTDebugModelPresentation;
import org.eclipse.cdt.debug.internal.ui.CDebugImageDescriptorRegistry;
import org.eclipse.cdt.debug.internal.ui.ColorManager;
-import org.eclipse.cdt.debug.internal.ui.editors.CDebugDocumentProvider;
import org.eclipse.cdt.debug.internal.ui.editors.DisassemblyDocumentProvider;
import org.eclipse.cdt.debug.internal.ui.editors.DisassemblyEditorInput;
import org.eclipse.cdt.debug.internal.ui.preferences.CDebugPreferencePage;
@@ -76,9 +75,6 @@
// Document provider for disassembly editor
private DisassemblyDocumentProvider fDisassemblyDocumentProvider = null;
- // Document provider for C/C++ debug editor
- private CDebugDocumentProvider fDocumentProvider;
-
/**
* The constructor.
*/
@@ -511,17 +507,5 @@
{
display.asyncExec( runnable );
}
- }
-
- /**
- * Returns the used document provider
- */
- public CDebugDocumentProvider getDocumentProvider()
- {
- if (fDocumentProvider == null)
- {
- fDocumentProvider = new CDebugDocumentProvider();
- }
- return fDocumentProvider;
}
}
