mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Patch from Mikhailk to remove dependencies on the

Browse source 
debug plugins.
This commit is contained in:
Alain Magloire 2004-04-15 19:17:32 +00:00
parent e75bafa4a4
commit cf45b52e3c
4 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/org.eclipse.cdt.ui/ChangeLog
View file

@ -1,3 +1,8 @@
2004-04-15 Mikhail Khodjaiants
Removed dependencies to 'org.eclipse.debug.core' and 'org.eclipse.debug.ui'.
* plugin.xml
* src/org/eclipse/cdt/internal/ui/editor/CMarkerAnnotation.java
2004-04-15 John Camelon 2004-04-15 John Camelon
Partial fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=57928 Partial fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=57928

2
core/org.eclipse.cdt.ui/plugin.xml
View file

@ -22,8 +22,6 @@
<import plugin="org.eclipse.core.resources"/> <import plugin="org.eclipse.core.resources"/>
<import plugin="org.eclipse.search"/> <import plugin="org.eclipse.search"/>
<import plugin="org.eclipse.compare"/> <import plugin="org.eclipse.compare"/>
<import plugin="org.eclipse.debug.ui"/>
<import plugin="org.eclipse.debug.core"/>
<import plugin="org.eclipse.cdt.core"/> <import plugin="org.eclipse.cdt.core"/>
<import plugin="org.eclipse.core.runtime.compatibility"/> <import plugin="org.eclipse.core.runtime.compatibility"/>
<import plugin="org.eclipse.ui.console"/> <import plugin="org.eclipse.ui.console"/>

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
View file

@ -725,7 +725,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IS
interface ITextConverter { interface ITextConverter {
void customizeDocumentCommand(IDocument document, DocumentCommand command); void customizeDocumentCommand(IDocument document, DocumentCommand command);
}; }
static class TabConverter implements ITextConverter { static class TabConverter implements ITextConverter {
@ -776,7 +776,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IS
} }
command.text = buffer.toString(); command.text = buffer.toString();
} }
}; }
/* Source code language to display */ /* Source code language to display */
public final static String LANGUAGE_CPP = "CEditor.language.cpp"; //$NON-NLS-1$ public final static String LANGUAGE_CPP = "CEditor.language.cpp"; //$NON-NLS-1$
@ -860,7 +860,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IS
public String getDisplayLanguage() { public String getDisplayLanguage() {
return fDisplayLanguage; return fDisplayLanguage;
} }
}; }
/* /*
* @see AbstractTextEditor#createSourceViewer(Composite, IVerticalRuler, int) * @see AbstractTextEditor#createSourceViewer(Composite, IVerticalRuler, int)

17
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CMarkerAnnotation.java
View file

@ -8,19 +8,15 @@ package org.eclipse.cdt.internal.ui.editor;
import java.util.Map; import java.util.Map;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.eclipse.cdt.core.model.ICModelMarker;
import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IMarker;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.model.IBreakpoint;
import org.eclipse.debug.ui.DebugUITools;
import org.eclipse.debug.ui.IDebugModelPresentation;
import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IDocument;
import org.eclipse.search.ui.SearchUI; import org.eclipse.search.ui.SearchUI;
import org.eclipse.ui.texteditor.MarkerAnnotation; import org.eclipse.ui.texteditor.MarkerAnnotation;
import org.eclipse.ui.texteditor.MarkerUtilities; import org.eclipse.ui.texteditor.MarkerUtilities;
import org.eclipse.cdt.core.model.ICModelMarker;
public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnotation { public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnotation {
@ -28,7 +24,6 @@ public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnot
private IDocument fDocument; private IDocument fDocument;
private int error_start = -1; private int error_start = -1;
private int error_length = 0; private int error_length = 0;
private IDebugModelPresentation fPresentation;
public CMarkerAnnotation(IMarker marker, IDocument document) { public CMarkerAnnotation(IMarker marker, IDocument document) {
super(marker); super(marker);
@ -148,16 +143,6 @@ public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnot
if (MarkerUtilities.isMarkerType(marker, SearchUI.SEARCH_MARKER)) { if (MarkerUtilities.isMarkerType(marker, SearchUI.SEARCH_MARKER)) {
setLayer(2); setLayer(2);
setImage(SearchUI.getSearchMarkerImage()); setImage(SearchUI.getSearchMarkerImage());
fIsProblemMarker= false;
return;
}
else if (MarkerUtilities.isMarkerType(marker, IBreakpoint.LINE_BREAKPOINT_MARKER)) {
if (fPresentation == null)
fPresentation= DebugUITools.newDebugModelPresentation();
setLayer(4);
setImage(fPresentation.getImage(marker));
fIsProblemMarker= false; fIsProblemMarker= false;
return; return;
} else if (MarkerUtilities.isMarkerType(getMarker(), ICModelMarker.C_MODEL_PROBLEM_MARKER)) { } else if (MarkerUtilities.isMarkerType(getMarker(), ICModelMarker.C_MODEL_PROBLEM_MARKER)) {