From 8154839eadd99777d9c0bdbbc0dc3b68b9b83a87 Mon Sep 17 00:00:00 2001
From: Anton Leherbauer <anton.leherbauer@windriver.com>
Date: Fri, 12 Nov 2010 10:02:30 +0000
Subject: [PATCH] Bug 326636 - [disassembly] Enable disassembly view as
 "editor"

---
 dsf/org.eclipse.cdt.dsf.ui/plugin.xml                     | 2 +-
 .../debug/internal/ui/disassembly/DisassemblyPart.java    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dsf/org.eclipse.cdt.dsf.ui/plugin.xml b/dsf/org.eclipse.cdt.dsf.ui/plugin.xml
index ae9e6006203..59494256de4 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/plugin.xml
+++ b/dsf/org.eclipse.cdt.dsf.ui/plugin.xml
@@ -637,7 +637,7 @@
 	  </factory>
        <factory
             class="org.eclipse.cdt.dsf.debug.internal.ui.actions.RetargettableActionAdapterFactory"
-            adaptableType="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.DisassemblyView">
+            adaptableType="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IDisassemblyPart">
          <adapter type="org.eclipse.debug.ui.actions.IRunToLineTarget"/>
          <adapter type="org.eclipse.cdt.debug.internal.ui.actions.IResumeAtLineTarget"/>
          <adapter type="org.eclipse.cdt.debug.internal.ui.actions.IMoveToLineTarget"/>
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
index 0d610a4ae96..109912c5476 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
@@ -666,6 +666,10 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem
 		}
 
 		initializeViewerFont(fViewer);
+		fDocument = createDocument();
+		fViewer.setDocument(fDocument, new AnnotationModel());
+		JFaceResources.getFontRegistry().addListener(fPropertyChangeListener);
+
 		createActions();
 		hookRulerContextMenu();
 		hookContextMenu();
@@ -677,10 +681,6 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem
 			}
 		});
 
-		fDocument = createDocument();
-		fViewer.setDocument(fDocument, new AnnotationModel());
-		JFaceResources.getFontRegistry().addListener(fPropertyChangeListener);
-
 		fErrorColor = getSharedColors().getColor(new RGB(96, 0, 0));
 		fInstructionColor = getSharedColors().getColor(new RGB(0, 0, 96));
 		fSourceColor = getSharedColors().getColor(new RGB(64, 0, 80));