From c458fc2918db12f99bb73125935c29aba12bdaab Mon Sep 17 00:00:00 2001
From: Ken Ryall <ken.ryall@nokia.com>
Date: Thu, 11 Mar 2010 22:43:38 +0000
Subject: [PATCH] Bug 305533, Step One, remove the old Disassembly view and
 rename the DSF one.

---
 debug/org.eclipse.cdt.debug.ui/plugin.xml    | 16 ----------------
 dsf/org.eclipse.cdt.dsf.ui/plugin.properties |  2 +-
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index 96e49400b1a..81473483b54 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -144,13 +144,6 @@
             class="org.eclipse.cdt.debug.internal.ui.views.signals.SignalsView"
             id="org.eclipse.cdt.debug.ui.SignalsView">
       </view>
-      <view
-            name="%DisassemblyView.name"
-            icon="icons/view16/disassembly_view.gif"
-            category="org.eclipse.debug.ui"
-            class="org.eclipse.cdt.debug.internal.ui.views.disassembly.DisassemblyView"
-            id="org.eclipse.cdt.debug.ui.DisassemblyView">
-      </view>
    </extension>
    <extension
          point="org.eclipse.ui.perspectiveExtensions">
@@ -180,15 +173,6 @@
          <viewShortcut
                id="org.eclipse.debug.ui.MemoryView">
          </viewShortcut>
-         <view
-               relative="org.eclipse.ui.views.ContentOutline"
-               visible="false"
-               relationship="stack"
-               id="org.eclipse.cdt.debug.ui.DisassemblyView">
-         </view>
-         <viewShortcut
-               id="org.eclipse.cdt.debug.ui.DisassemblyView">
-         </viewShortcut>
          <view
                visible="false"
                relative="org.eclipse.debug.ui.VariableView"
diff --git a/dsf/org.eclipse.cdt.dsf.ui/plugin.properties b/dsf/org.eclipse.cdt.dsf.ui/plugin.properties
index 43a550e2b7a..ec8dddd372b 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/plugin.properties
+++ b/dsf/org.eclipse.cdt.dsf.ui/plugin.properties
@@ -15,7 +15,7 @@ providerName=Eclipse CDT
 
 # disassembly
 disassemblyPreferencePage.name = Disassembly
-disassemblyView.name= DSF Disassembly
+disassemblyView.name= Disassembly
 
 command.gotoPC.name=Go to Program Counter
 command.gotoPC.description=Navigate to current program counter