From 60c014c4a4d3357f9135faa45606d17574d26069 Mon Sep 17 00:00:00 2001 From: Pawel Piech Date: Thu, 5 Jun 2008 03:28:40 +0000 Subject: [PATCH] [229201] - [disassembly] Get rid of 'com.windriver.ide' in comments and ids --- .../ui/disassembly/AddressRulerColumn.java | 6 ---- .../ui/disassembly/DisassemblyEditor.java | 6 ---- .../ui/disassembly/DisassemblyView.java | 12 ------- .../FunctionOffsetRulerColumn.java | 3 -- .../model/DisassemblyWithSourcePosition.java | 6 ---- .../DisassemblyPreferenceConstants.java | 32 +++++++++---------- .../CSourcePresentationCreator.java | 4 +-- .../presentation/CSourceTagProvider.java | 2 +- .../ui/disassembly/text/REDFileRider.java | 4 +-- 9 files changed, 21 insertions(+), 54 deletions(-) diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/AddressRulerColumn.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/AddressRulerColumn.java index df91c158d50..9365a92d20f 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/AddressRulerColumn.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/AddressRulerColumn.java @@ -46,9 +46,6 @@ public class AddressRulerColumn extends DisassemblyRulerColumn implements IVerti setRadix(16); } - /* - * @see com.windriver.ide.disassembly.views.DisassemblyRulerColumn#createDisplayString(int) - */ @Override protected String createDisplayString(int line) { DisassemblyDocument doc = (DisassemblyDocument)getParentRuler().getTextViewer().getDocument(); @@ -86,9 +83,6 @@ public class AddressRulerColumn extends DisassemblyRulerColumn implements IVerti return ""; //$NON-NLS-1$ } - /* - * @see com.windriver.ide.disassembly.views.DisassemblyRulerColumn#computeNumberOfCharacters() - */ @Override protected int computeNumberOfCharacters() { return fNumberOfDigits + (fRadixPrefix != null ? fRadixPrefix.length() : 0) + 1; diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/DisassemblyEditor.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/DisassemblyEditor.java index da0b111d2e9..689f5d211ed 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/DisassemblyEditor.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/DisassemblyEditor.java @@ -31,9 +31,6 @@ public class DisassemblyEditor extends DisassemblyPart implements IEditorPart { super(); } - /* - * @see com.windriver.ide.disassembly.views.DisassemblyPart#getActionBars() - */ @Override protected IActionBars getActionBars() { return getEditorSite().getActionBars(); @@ -106,9 +103,6 @@ public class DisassemblyEditor extends DisassemblyPart implements IEditorPart { // TLETODO [disassembly] initialization based on input } - /* - * @see com.windriver.ide.disassembly.views.DisassemblyPart#closePart() - */ @Override protected void closePart() { getEditorSite().getPage().closeEditor(this, false); diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/DisassemblyView.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/DisassemblyView.java index a85b6db47e1..fb1b98ea7ba 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/DisassemblyView.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/DisassemblyView.java @@ -36,9 +36,6 @@ public class DisassemblyView extends DisassemblyPart implements IViewPart { super(); } - /* - * @see com.windriver.ide.disassembly.views.DisassemblyPart#getActionBars() - */ @Override protected IActionBars getActionBars() { return getViewSite().getActionBars(); @@ -75,9 +72,6 @@ public class DisassemblyView extends DisassemblyPart implements IViewPart { public void saveState(IMemento memento) { } - /* - * @see com.windriver.ide.disassembly.views.DisassemblyPart#contributeToActionBars() - */ @Override protected void contributeToActionBars(IActionBars bars) { super.contributeToActionBars(bars); @@ -91,17 +85,11 @@ public class DisassemblyView extends DisassemblyPart implements IViewPart { manager.add(new Separator()); } - /* - * @see com.windriver.ide.disassembly.views.DisassemblyPart#closePart() - */ @Override protected void closePart() { getViewSite().getPage().hideView(this); } - /* - * @see com.windriver.ide.disassembly.views.DisassemblyPart#dispose() - */ @Override public void dispose() { getSite().getPage().removeSelectionListener(fDebugViewListener); diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/FunctionOffsetRulerColumn.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/FunctionOffsetRulerColumn.java index 0cc653eba03..594147eabf3 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/FunctionOffsetRulerColumn.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/FunctionOffsetRulerColumn.java @@ -49,9 +49,6 @@ public class FunctionOffsetRulerColumn extends DisassemblyRulerColumn { return ""; //$NON-NLS-1$ } - /* - * @see com.windriver.ide.disassembly.views.DisassemblyRulerColumn#computeNumberOfCharacters() - */ @Override protected int computeNumberOfCharacters() { DisassemblyDocument doc = (DisassemblyDocument)getParentRuler().getTextViewer().getDocument(); diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/model/DisassemblyWithSourcePosition.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/model/DisassemblyWithSourcePosition.java index 55e537e5935..8a2325dd55c 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/model/DisassemblyWithSourcePosition.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/model/DisassemblyWithSourcePosition.java @@ -33,17 +33,11 @@ public class DisassemblyWithSourcePosition extends DisassemblyPosition { fLine = lineNr; } - /* (non-Javadoc) - * @see com.windriver.ide.disassembly.model.DisassemblyPosition#getFile() - */ @Override public String getFile() { return fFile; } - /* (non-Javadoc) - * @see com.windriver.ide.disassembly.model.DisassemblyPosition#getLine() - */ @Override public int getLine() { return fLine; diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/preferences/DisassemblyPreferenceConstants.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/preferences/DisassemblyPreferenceConstants.java index 1b6415dc400..78c4c847ca2 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/preferences/DisassemblyPreferenceConstants.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/preferences/DisassemblyPreferenceConstants.java @@ -25,22 +25,22 @@ import org.eclipse.ui.editors.text.TextEditorPreferenceConstants; */ public class DisassemblyPreferenceConstants { - public static final String START_ADDRESS = "startAddress"; //$NON-NLS-1$ - public static final String END_ADDRESS = "endAddress"; //$NON-NLS-1$ - public static final String PC_HISTORY_SIZE = "pcHistorySize"; //$NON-NLS-1$ - public static final String SHOW_SOURCE = "showSource"; //$NON-NLS-1$ - public static final String SHOW_LABELS = "showLabels"; //$NON-NLS-1$ - public static final String SHOW_SYMBOLS = "showSymbols"; //$NON-NLS-1$ - public static final String SIMPLIFIED = "simplified"; //$NON-NLS-1$ - public static final String INSTRUCTION_RADIX = "instructionRadix"; //$NON-NLS-1$ - public static final String ADDRESS_RADIX = "addressRadix"; //$NON-NLS-1$ - public static final String SHOW_ADDRESS_RADIX = "showAddressRadix"; //$NON-NLS-1$ - public static final String SHOW_ADDRESS_RULER = "showAddressRuler"; //$NON-NLS-1$ - public static final String ADDRESS_COLOR = "addressColor"; //$NON-NLS-1$ - public static final String SHOW_FUNCTION_OFFSETS = "showOpcodeRuler"; //$NON-NLS-1$ - public static final String OPCODE_COLOR = "opcodeColor"; //$NON-NLS-1$ - public static final String USE_SOURCE_ONLY_MODE = "useSourceOnlyMode"; //$NON-NLS-1$ - public static final String AVOID_READ_BEFORE_PC = "avoidReadBeforePC"; //$NON-NLS-1$ + public static final String START_ADDRESS = "disassembly.startAddress"; //$NON-NLS-1$ + public static final String END_ADDRESS = "disassembly.endAddress"; //$NON-NLS-1$ + public static final String PC_HISTORY_SIZE = "disassembly.pcHistorySize"; //$NON-NLS-1$ + public static final String SHOW_SOURCE = "disassembly.showSource"; //$NON-NLS-1$ + public static final String SHOW_LABELS = "disassembly.showLabels"; //$NON-NLS-1$ + public static final String SHOW_SYMBOLS = "disassembly.showSymbols"; //$NON-NLS-1$ + public static final String SIMPLIFIED = "disassembly.simplified"; //$NON-NLS-1$ + public static final String INSTRUCTION_RADIX = "disassembly.instructionRadix"; //$NON-NLS-1$ + public static final String ADDRESS_RADIX = "disassembly.addressRadix"; //$NON-NLS-1$ + public static final String SHOW_ADDRESS_RADIX = "disassembly.showAddressRadix"; //$NON-NLS-1$ + public static final String SHOW_ADDRESS_RULER = "disassembly.showAddressRuler"; //$NON-NLS-1$ + public static final String ADDRESS_COLOR = "disassembly.addressColor"; //$NON-NLS-1$ + public static final String SHOW_FUNCTION_OFFSETS = "disassembly.showFunctionOffsetRuler"; //$NON-NLS-1$ + public static final String OPCODE_COLOR = "disassembly.opcodeColor"; //$NON-NLS-1$ + public static final String USE_SOURCE_ONLY_MODE = "disassembly.useSourceOnlyMode"; //$NON-NLS-1$ + public static final String AVOID_READ_BEFORE_PC = "disassembly.avoidReadBeforePC"; //$NON-NLS-1$ /** * diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/presentation/CSourcePresentationCreator.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/presentation/CSourcePresentationCreator.java index 04afd5f39c9..be58ba19252 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/presentation/CSourcePresentationCreator.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/presentation/CSourcePresentationCreator.java @@ -240,7 +240,7 @@ public class CSourcePresentationCreator extends PresentationReconciler implement } /* - * @see com.windriver.ide.disassembly.model.ISourcePresentationCreator#dispose() + * @see org.eclipse.dd.dsf.debug.internal.ui.disassembly.presentation.ISourcePresentationCreator#dispose() */ public void dispose() { fViewer= null; @@ -263,7 +263,7 @@ public class CSourcePresentationCreator extends PresentationReconciler implement } /* - * @see com.windriver.ide.disassembly.model.ISourcePresentationCreator#getPresentation(org.eclipse.jface.text.IRegion, org.eclipse.jface.text.IDocument) + * @see org.eclipse.dd.dsf.debug.internal.ui.disassembly.presentation.ISourcePresentationCreator#getPresentation(org.eclipse.jface.text.IRegion, org.eclipse.jface.text.IDocument) */ public TextPresentation getPresentation(IRegion region, IDocument document) { assert fViewer != null; diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/presentation/CSourceTagProvider.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/presentation/CSourceTagProvider.java index 2ed98801302..3f86f41a36a 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/presentation/CSourceTagProvider.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/presentation/CSourceTagProvider.java @@ -86,7 +86,7 @@ public class CSourceTagProvider implements ISourceTagProvider { } /* - * @see com.windriver.ide.editor.IWrsSourceTagProvider#removeSourceTagListener(com.windriver.ide.editor.IWrsSourceTagListener) + * @see org.eclipse.dd.dsf.debug.internal.ui.disassembly.presentation.ISourceTagProvider#removeSourceTagListener(org.eclipse.dd.dsf.debug.internal.ui.disassembly.presentation.ISourceTagListener) */ public void removeSourceTagListener(ISourceTagListener listener) { fListenerList.remove(listener); diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/text/REDFileRider.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/text/REDFileRider.java index 3867aa85fc7..7cc78c9175b 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/text/REDFileRider.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/text/REDFileRider.java @@ -32,8 +32,8 @@ public final class REDFileRider implements IFileRider { set(f, 0); } - /* (non-Javadoc) - * @see com.windriver.ide.editor.model.IFileRider#seek(int) + /* + * @see org.eclipse.dd.dsf.debug.internal.ui.disassembly.text.IFileRider#seek(int) */ public void seek(int pos) throws IOException { fFile.seek(pos);