mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-23 14:42:11 +02:00
Fix deprecation warnings and get rid of obsolete HTMLTextPresenter
This commit is contained in:
Anton Leherbauer
parent
c14f495a34
commit
9aed58bb4e
14 changed files with 30 additions and 1224 deletions
|
|
@ -1,5 +1,5 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (c) 2000, 2007 IBM Corporation and others.
|
||||
* Copyright (c) 2000, 2008 IBM Corporation and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
|
|
@ -28,7 +28,6 @@ import org.eclipse.jface.text.presentation.IPresentationReconciler;
|
|||
import org.eclipse.jface.text.source.ISourceViewer;
|
||||
import org.eclipse.jface.text.templates.TemplateContextType;
|
||||
import org.eclipse.jface.text.templates.TemplateVariableResolver;
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
import org.eclipse.ui.texteditor.ITextEditor;
|
||||
|
||||
|
|
@ -38,7 +37,6 @@ import org.eclipse.cdt.ui.text.ICPartitions;
|
|||
import org.eclipse.cdt.internal.corext.template.c.CodeTemplateContextType;
|
||||
|
||||
import org.eclipse.cdt.internal.ui.text.CWordFinder;
|
||||
import org.eclipse.cdt.internal.ui.text.HTMLTextPresenter;
|
||||
import org.eclipse.cdt.internal.ui.text.IColorManager;
|
||||
import org.eclipse.cdt.internal.ui.text.SimpleCSourceViewerConfiguration;
|
||||
import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference;
|
||||
|
|
@ -126,7 +124,7 @@ public class CodeTemplateSourceViewerConfiguration extends SimpleCSourceViewerCo
|
|||
assistant.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_ABOVE);
|
||||
assistant.setInformationControlCreator(new IInformationControlCreator() {
|
||||
public IInformationControl createInformationControl(Shell parent) {
|
||||
return new DefaultInformationControl(parent, SWT.NONE, new HTMLTextPresenter(true));
|
||||
return new DefaultInformationControl(parent, false);
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ public abstract class AbstractCompareViewerInformationControl extends PopupDialo
|
|||
* @param persistBounds flag indicating whether control size and location should be persisted
|
||||
*/
|
||||
public AbstractCompareViewerInformationControl(Shell parent, int shellStyle, int textStyle, boolean takeFocus, boolean showViewMenu, boolean persistBounds) {
|
||||
super(parent, shellStyle | SWT.ON_TOP, takeFocus, persistBounds, showViewMenu, false, null, null);
|
||||
super(parent, shellStyle | SWT.ON_TOP, takeFocus, persistBounds, persistBounds, showViewMenu, false, null, null);
|
||||
fStyle= textStyle & ~(SWT.V_SCROLL | SWT.H_SCROLL);
|
||||
// Title and status text must be set to get the title label created, so force empty values here.
|
||||
if (hasHeader())
|
||||
|
|
@ -467,16 +467,14 @@ public abstract class AbstractCompareViewerInformationControl extends PopupDialo
|
|||
* @see org.eclipse.jface.text.IInformationControlExtension3#restoresLocation()
|
||||
*/
|
||||
public boolean restoresLocation() {
|
||||
// return getPersistLocation();
|
||||
return getPersistBounds();
|
||||
return getPersistLocation();
|
||||
}
|
||||
|
||||
/*
|
||||
* @see org.eclipse.jface.text.IInformationControlExtension3#restoresSize()
|
||||
*/
|
||||
public boolean restoresSize() {
|
||||
// return getPersistSize();
|
||||
return getPersistBounds();
|
||||
return getPersistSize();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ public abstract class AbstractInformationControl extends PopupDialog implements
|
|||
* @param showStatusField <code>true</code> iff the control has a status field at the bottom
|
||||
*/
|
||||
public AbstractInformationControl(Shell parent, int shellStyle, int treeStyle, String invokingCommandId, boolean showStatusField) {
|
||||
super(parent, shellStyle, true, true, true, true, null, null);
|
||||
super(parent, shellStyle, true, true, true, true, true, null, null);
|
||||
fTreeStyle= treeStyle;
|
||||
// Title and status text must be set to get the title label created, so force empty values here.
|
||||
if (hasHeader())
|
||||
|
|
@ -543,7 +543,7 @@ public abstract class AbstractInformationControl extends PopupDialog implements
|
|||
* the call to constrainShellSize in PopupDialog.open will still ensure that the shell is
|
||||
* entirely visible.
|
||||
*/
|
||||
if (!getPersistBounds() || getDialogSettings() == null)
|
||||
if (!getPersistLocation() || getDialogSettings() == null)
|
||||
getShell().setLocation(location);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ public abstract class AbstractSourceViewerInformationControl extends PopupDialog
|
|||
* @param persistBounds flag indicating whether control size and location should be persisted
|
||||
*/
|
||||
public AbstractSourceViewerInformationControl(Shell parent, int shellStyle, int textStyle, boolean takeFocus, boolean showViewMenu, boolean persistBounds) {
|
||||
super(parent, shellStyle, takeFocus, persistBounds, showViewMenu, false, null, null);
|
||||
super(parent, shellStyle, takeFocus, persistBounds, persistBounds, showViewMenu, false, null, null);
|
||||
fTextStyle= textStyle;
|
||||
// Title and status text must be set to get the title label created, so force empty values here.
|
||||
if (hasHeader())
|
||||
|
|
@ -495,16 +495,14 @@ public abstract class AbstractSourceViewerInformationControl extends PopupDialog
|
|||
* @see org.eclipse.jface.text.IInformationControlExtension3#restoresLocation()
|
||||
*/
|
||||
public boolean restoresLocation() {
|
||||
// return getPersistLocation();
|
||||
return getPersistBounds();
|
||||
return getPersistLocation();
|
||||
}
|
||||
|
||||
/*
|
||||
* @see org.eclipse.jface.text.IInformationControlExtension3#restoresSize()
|
||||
*/
|
||||
public boolean restoresSize() {
|
||||
// return getPersistSize();
|
||||
return getPersistBounds();
|
||||
return getPersistSize();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -211,12 +211,9 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration {
|
|||
presenter.setDocumentPartitioning(getConfiguredDocumentPartitioning(sourceViewer));
|
||||
presenter.setAnchor(AbstractInformationControlManager.ANCHOR_GLOBAL);
|
||||
final IInformationProvider provider = new CElementContentProvider(getEditor());
|
||||
presenter.setInformationProvider(provider, IDocument.DEFAULT_CONTENT_TYPE);
|
||||
presenter.setInformationProvider(provider, ICPartitions.C_MULTI_LINE_COMMENT);
|
||||
presenter.setInformationProvider(provider, ICPartitions.C_SINGLE_LINE_COMMENT);
|
||||
presenter.setInformationProvider(provider, ICPartitions.C_STRING);
|
||||
presenter.setInformationProvider(provider, ICPartitions.C_CHARACTER);
|
||||
presenter.setInformationProvider(provider, ICPartitions.C_PREPROCESSOR);
|
||||
String[] contentTypes= getConfiguredContentTypes(sourceViewer);
|
||||
for (int i= 0; i < contentTypes.length; i++)
|
||||
presenter.setInformationProvider(provider, contentTypes[i]);
|
||||
presenter.setSizeConstraints(50, 20, true, false);
|
||||
return presenter;
|
||||
}
|
||||
|
|
@ -231,12 +228,9 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration {
|
|||
presenter.setDocumentPartitioning(getConfiguredDocumentPartitioning(sourceViewer));
|
||||
presenter.setAnchor(AbstractInformationControlManager.ANCHOR_GLOBAL);
|
||||
final IInformationProvider provider = new THInformationProvider(getEditor());
|
||||
presenter.setInformationProvider(provider, IDocument.DEFAULT_CONTENT_TYPE);
|
||||
presenter.setInformationProvider(provider, ICPartitions.C_MULTI_LINE_COMMENT);
|
||||
presenter.setInformationProvider(provider, ICPartitions.C_SINGLE_LINE_COMMENT);
|
||||
presenter.setInformationProvider(provider, ICPartitions.C_STRING);
|
||||
presenter.setInformationProvider(provider, ICPartitions.C_CHARACTER);
|
||||
presenter.setInformationProvider(provider, ICPartitions.C_PREPROCESSOR);
|
||||
String[] contentTypes= getConfiguredContentTypes(sourceViewer);
|
||||
for (int i= 0; i < contentTypes.length; i++)
|
||||
presenter.setInformationProvider(provider, contentTypes[i]);
|
||||
presenter.setSizeConstraints(50, 20, true, false);
|
||||
return presenter;
|
||||
}
|
||||
|
|
@ -741,15 +735,9 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration {
|
|||
*/
|
||||
@Override
|
||||
public IInformationControlCreator getInformationControlCreator(ISourceViewer sourceViewer) {
|
||||
return getInformationControlCreator(sourceViewer, true);
|
||||
}
|
||||
|
||||
public IInformationControlCreator getInformationControlCreator(ISourceViewer sourceViewer, final boolean cutDown) {
|
||||
return new IInformationControlCreator() {
|
||||
return new IInformationControlCreator() {
|
||||
public IInformationControl createInformationControl(Shell parent) {
|
||||
int style = cutDown ? SWT.NONE : (SWT.V_SCROLL | SWT.H_SCROLL);
|
||||
return new DefaultInformationControl(parent, style, new HTMLTextPresenter(cutDown));
|
||||
// return new HoverBrowserControl(parent);
|
||||
return new DefaultInformationControl(parent, false);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -766,9 +754,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration {
|
|||
private IInformationControlCreator getInformationPresenterControlCreator(ISourceViewer sourceViewer) {
|
||||
return new IInformationControlCreator() {
|
||||
public IInformationControl createInformationControl(Shell parent) {
|
||||
int shellStyle= SWT.RESIZE | SWT.TOOL;
|
||||
int style= SWT.V_SCROLL | SWT.H_SCROLL;
|
||||
return new DefaultInformationControl(parent, shellStyle, style, new HTMLTextPresenter(false));
|
||||
return new DefaultInformationControl(parent, true);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -932,12 +918,9 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration {
|
|||
presenter.setDocumentPartitioning(getConfiguredDocumentPartitioning(sourceViewer));
|
||||
presenter.setAnchor(AbstractInformationControlManager.ANCHOR_GLOBAL);
|
||||
final IInformationProvider provider = new CMacroExpansionInformationProvider(getEditor());
|
||||
presenter.setInformationProvider(provider, IDocument.DEFAULT_CONTENT_TYPE);
|
||||
presenter.setInformationProvider(provider, ICPartitions.C_MULTI_LINE_COMMENT);
|
||||
presenter.setInformationProvider(provider, ICPartitions.C_SINGLE_LINE_COMMENT);
|
||||
presenter.setInformationProvider(provider, ICPartitions.C_STRING);
|
||||
presenter.setInformationProvider(provider, ICPartitions.C_CHARACTER);
|
||||
presenter.setInformationProvider(provider, ICPartitions.C_PREPROCESSOR);
|
||||
String[] contentTypes= getConfiguredContentTypes(sourceViewer);
|
||||
for (int i= 0; i < contentTypes.length; i++)
|
||||
presenter.setInformationProvider(provider, contentTypes[i]);
|
||||
presenter.setSizeConstraints(50, 20, true, false);
|
||||
return presenter;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,260 +0,0 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (c) 2000, 2007 IBM Corporation and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.eclipse.org/legal/epl-v10.html
|
||||
*
|
||||
* Contributors:
|
||||
* IBM Corporation - initial API and implementation
|
||||
* QNX Software System
|
||||
* Markus Schorn (Wind River Systems)
|
||||
*******************************************************************************/
|
||||
package org.eclipse.cdt.internal.ui.text;
|
||||
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.PushbackReader;
|
||||
import java.io.Reader;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eclipse.jface.text.TextPresentation;
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.custom.StyleRange;
|
||||
|
||||
|
||||
/**
|
||||
* Reads the text contents from a reader of HTML contents and translates
|
||||
* the tags or cut them out.
|
||||
*/
|
||||
public class HTML2TextReader extends SubstitutionTextReader {
|
||||
private static final Map<String, String> fgEntityLookup;
|
||||
private static final Set<String> fgTags;
|
||||
|
||||
static {
|
||||
|
||||
fgTags= new HashSet<String>();
|
||||
fgTags.add("b"); //$NON-NLS-1$
|
||||
fgTags.add("br"); //$NON-NLS-1$
|
||||
fgTags.add("h5"); //$NON-NLS-1$
|
||||
fgTags.add("p"); //$NON-NLS-1$
|
||||
fgTags.add("dl"); //$NON-NLS-1$
|
||||
fgTags.add("dt"); //$NON-NLS-1$
|
||||
fgTags.add("dd"); //$NON-NLS-1$
|
||||
fgTags.add("li"); //$NON-NLS-1$
|
||||
fgTags.add("ul"); //$NON-NLS-1$
|
||||
|
||||
fgEntityLookup= new HashMap<String, String>(7);
|
||||
fgEntityLookup.put("lt", "<"); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
fgEntityLookup.put("gt", ">"); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
fgEntityLookup.put("nbsp", " "); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
fgEntityLookup.put("amp", "&"); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
fgEntityLookup.put("circ", "^"); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
fgEntityLookup.put("tilde", "~"); //$NON-NLS-2$ //$NON-NLS-1$
|
||||
fgEntityLookup.put("quot", "\""); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
}
|
||||
|
||||
private int fCounter= 0;
|
||||
private TextPresentation fTextPresentation;
|
||||
private int fBold= 0;
|
||||
private int fStartOffset= -1;
|
||||
private boolean fInParagraph= false;
|
||||
|
||||
/**
|
||||
* Transforms the html text from the reader to formatted text.
|
||||
* @param presentation If not <code>null</code>, formattings will be applied to
|
||||
* the presentation.
|
||||
*/
|
||||
public HTML2TextReader(Reader reader, TextPresentation presentation) {
|
||||
super(new PushbackReader(reader));
|
||||
fTextPresentation= presentation;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int read() throws IOException {
|
||||
int c= super.read();
|
||||
if (c != -1)
|
||||
++ fCounter;
|
||||
return c;
|
||||
}
|
||||
|
||||
protected void startBold() {
|
||||
if (fBold == 0)
|
||||
fStartOffset= fCounter;
|
||||
++ fBold;
|
||||
}
|
||||
|
||||
protected void stopBold() {
|
||||
-- fBold;
|
||||
if (fBold == 0) {
|
||||
if (fTextPresentation != null) {
|
||||
fTextPresentation.addStyleRange(new StyleRange(fStartOffset, fCounter - fStartOffset, null, null, SWT.BOLD));
|
||||
}
|
||||
fStartOffset= -1;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @see SubstitutionTextReader#computeSubstitution(int)
|
||||
*/
|
||||
@Override
|
||||
protected String computeSubstitution(int c) throws IOException {
|
||||
if (c == '<')
|
||||
return processHTMLTag();
|
||||
else if (c == '&')
|
||||
return processEntity();
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private String html2Text(String html) {
|
||||
|
||||
String tag= html;
|
||||
if (tag.length() > 0 && '/' == tag.charAt(0))
|
||||
tag= tag.substring(1);
|
||||
|
||||
if (!fgTags.contains(tag))
|
||||
return ""; //$NON-NLS-1$
|
||||
|
||||
if ("b".equals(html)) { //$NON-NLS-1$
|
||||
startBold();
|
||||
return ""; //$NON-NLS-1$
|
||||
}
|
||||
|
||||
if ("h5".equals(html) || "dt".equals(html)) { //$NON-NLS-1$ //$NON-NLS-2$
|
||||
startBold();
|
||||
return ""; //$NON-NLS-1$
|
||||
}
|
||||
|
||||
if ("dl".equals(html)) //$NON-NLS-1$
|
||||
return LINE_DELIM;
|
||||
|
||||
if ("dd".equals(html)) //$NON-NLS-1$
|
||||
return "\t"; //$NON-NLS-1$
|
||||
|
||||
if ("li".equals(html)) //$NON-NLS-1$
|
||||
return LINE_DELIM + "\t" + "-"; //$NON-NLS-1$ //$NON-NLS-2$
|
||||
|
||||
if ("/b".equals(html)) { //$NON-NLS-1$
|
||||
stopBold();
|
||||
return ""; //$NON-NLS-1$
|
||||
}
|
||||
|
||||
if ("p".equals(html)) { //$NON-NLS-1$
|
||||
fInParagraph= true;
|
||||
return LINE_DELIM;
|
||||
}
|
||||
|
||||
if ("br".equals(html)) //$NON-NLS-1$
|
||||
return LINE_DELIM;
|
||||
|
||||
if ("/p".equals(html)) { //$NON-NLS-1$
|
||||
boolean inParagraph= fInParagraph;
|
||||
fInParagraph= false;
|
||||
return inParagraph ? "" : LINE_DELIM; //$NON-NLS-1$
|
||||
}
|
||||
|
||||
if ("/h5".equals(html) || "/dt".equals(html)) { //$NON-NLS-1$ //$NON-NLS-2$
|
||||
stopBold();
|
||||
return LINE_DELIM;
|
||||
}
|
||||
|
||||
if ("/dd".equals(html)) //$NON-NLS-1$
|
||||
return LINE_DELIM;
|
||||
|
||||
return ""; //$NON-NLS-1$
|
||||
}
|
||||
|
||||
/*
|
||||
* A '<' has been read. Process a html tag
|
||||
*/
|
||||
private String processHTMLTag() throws IOException {
|
||||
|
||||
StringBuffer buf= new StringBuffer();
|
||||
int ch;
|
||||
do {
|
||||
|
||||
ch= nextChar();
|
||||
|
||||
while (ch != -1 && ch != '>') {
|
||||
buf.append(Character.toLowerCase((char) ch));
|
||||
ch= nextChar();
|
||||
if (ch == '"'){
|
||||
buf.append(Character.toLowerCase((char) ch));
|
||||
ch= nextChar();
|
||||
while (ch != -1 && ch != '"'){
|
||||
buf.append(Character.toLowerCase((char) ch));
|
||||
ch= nextChar();
|
||||
}
|
||||
}
|
||||
if (ch == '<'){
|
||||
unread(ch);
|
||||
return '<' + buf.toString();
|
||||
}
|
||||
}
|
||||
|
||||
if (ch == -1)
|
||||
return null;
|
||||
|
||||
int tagLen= buf.length();
|
||||
// needs special treatment for comments
|
||||
if ((tagLen >= 3 && "!--".equals(buf.substring(0, 3))) //$NON-NLS-1$
|
||||
&& !(tagLen >= 5 && "--!".equals(buf.substring(tagLen - 3)))) { //$NON-NLS-1$
|
||||
// unfinished comment
|
||||
buf.append(ch);
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
} while (true);
|
||||
|
||||
return html2Text(buf.toString());
|
||||
}
|
||||
|
||||
private void unread(int ch) throws IOException {
|
||||
((PushbackReader) getReader()).unread(ch);
|
||||
}
|
||||
|
||||
protected String entity2Text(String symbol) {
|
||||
if (symbol.length() > 1 && symbol.charAt(0) == '#') {
|
||||
int ch;
|
||||
try {
|
||||
if (symbol.charAt(1) == 'x') {
|
||||
ch= Integer.parseInt(symbol.substring(2), 16);
|
||||
} else {
|
||||
ch= Integer.parseInt(symbol.substring(1), 10);
|
||||
}
|
||||
return "" + (char)ch; //$NON-NLS-1$
|
||||
} catch (NumberFormatException e) {
|
||||
}
|
||||
} else {
|
||||
String str= fgEntityLookup.get(symbol);
|
||||
if (str != null) {
|
||||
return str;
|
||||
}
|
||||
}
|
||||
return "&" + symbol; // not found //$NON-NLS-1$
|
||||
}
|
||||
|
||||
/*
|
||||
* A '&' has been read. Process a entity
|
||||
*/
|
||||
private String processEntity() throws IOException {
|
||||
StringBuffer buf= new StringBuffer();
|
||||
int ch= nextChar();
|
||||
while (Character.isLetterOrDigit((char)ch) || ch == '#') {
|
||||
buf.append((char) ch);
|
||||
ch= nextChar();
|
||||
}
|
||||
|
||||
if (ch == ';')
|
||||
return entity2Text(buf.toString());
|
||||
|
||||
buf.insert(0, '&');
|
||||
if (ch != -1)
|
||||
buf.append((char) ch);
|
||||
return buf.toString();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,191 +0,0 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (c) 2000 2005 IBM Corporation and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.eclipse.org/legal/epl-v10.html
|
||||
*
|
||||
* Contributors:
|
||||
* IBM Corporation - initial API and implementation
|
||||
* QNX Software System
|
||||
*******************************************************************************/
|
||||
package org.eclipse.cdt.internal.ui.text;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.Reader;
|
||||
import java.io.StringReader;
|
||||
import java.util.Iterator;
|
||||
|
||||
import org.eclipse.jface.text.DefaultInformationControl;
|
||||
import org.eclipse.jface.text.Region;
|
||||
import org.eclipse.jface.text.TextPresentation;
|
||||
import org.eclipse.swt.custom.StyleRange;
|
||||
import org.eclipse.swt.graphics.GC;
|
||||
import org.eclipse.swt.widgets.Display;
|
||||
|
||||
import org.eclipse.cdt.ui.CUIPlugin;
|
||||
|
||||
|
||||
public class HTMLTextPresenter implements DefaultInformationControl.IInformationPresenter {
|
||||
|
||||
private static final String LINE_DELIM= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
|
||||
private int fCounter;
|
||||
private boolean fEnforceUpperLineLimit;
|
||||
|
||||
public HTMLTextPresenter(boolean enforceUpperLineLimit) {
|
||||
super();
|
||||
fEnforceUpperLineLimit= enforceUpperLineLimit;
|
||||
}
|
||||
|
||||
public HTMLTextPresenter() {
|
||||
this(true);
|
||||
}
|
||||
|
||||
protected Reader createReader(String hoverInfo, TextPresentation presentation) {
|
||||
return new HTML2TextReader(new StringReader(hoverInfo), presentation);
|
||||
}
|
||||
|
||||
protected void adaptTextPresentation(TextPresentation presentation, int offset, int insertLength) {
|
||||
|
||||
int yoursStart= offset;
|
||||
int yoursEnd= offset + insertLength -1;
|
||||
yoursEnd= Math.max(yoursStart, yoursEnd);
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
Iterator<StyleRange> e= presentation.getAllStyleRangeIterator();
|
||||
while (e.hasNext()) {
|
||||
|
||||
StyleRange range= e.next();
|
||||
|
||||
int myStart= range.start;
|
||||
int myEnd= range.start + range.length -1;
|
||||
myEnd= Math.max(myStart, myEnd);
|
||||
|
||||
if (myEnd < yoursStart)
|
||||
continue;
|
||||
|
||||
if (myStart < yoursStart)
|
||||
range.length += insertLength;
|
||||
else
|
||||
range.start += insertLength;
|
||||
}
|
||||
}
|
||||
|
||||
private void append(StringBuffer buffer, String string, TextPresentation presentation) {
|
||||
|
||||
int length= string.length();
|
||||
buffer.append(string);
|
||||
|
||||
if (presentation != null)
|
||||
adaptTextPresentation(presentation, fCounter, length);
|
||||
|
||||
fCounter += length;
|
||||
}
|
||||
|
||||
private String getIndent(String line) {
|
||||
int length= line.length();
|
||||
|
||||
int i= 0;
|
||||
while (i < length && Character.isWhitespace(line.charAt(i))) ++i;
|
||||
|
||||
return (i == length ? line : line.substring(0, i)) + " "; //$NON-NLS-1$
|
||||
}
|
||||
|
||||
/*
|
||||
* @see IHoverInformationPresenter#updatePresentation(Display display, String, TextPresentation, int, int)
|
||||
*/
|
||||
public String updatePresentation(Display display, String hoverInfo, TextPresentation presentation, int maxWidth, int maxHeight) {
|
||||
|
||||
if (hoverInfo == null)
|
||||
return null;
|
||||
|
||||
GC gc= new GC(display);
|
||||
try {
|
||||
|
||||
StringBuffer buffer= new StringBuffer();
|
||||
int maxNumberOfLines= Math.round(maxHeight / gc.getFontMetrics().getHeight());
|
||||
|
||||
fCounter= 0;
|
||||
LineBreakingReader reader= new LineBreakingReader(createReader(hoverInfo, presentation), gc, maxWidth);
|
||||
|
||||
boolean lastLineFormatted= false;
|
||||
String lastLineIndent= null;
|
||||
|
||||
String line=reader.readLine();
|
||||
boolean lineFormatted= reader.isFormattedLine();
|
||||
boolean firstLineProcessed= false;
|
||||
|
||||
while (line != null) {
|
||||
|
||||
if (fEnforceUpperLineLimit && maxNumberOfLines <= 0)
|
||||
break;
|
||||
|
||||
if (firstLineProcessed) {
|
||||
if (!lastLineFormatted)
|
||||
append(buffer, LINE_DELIM, null);
|
||||
else {
|
||||
append(buffer, LINE_DELIM, presentation);
|
||||
if (lastLineIndent != null)
|
||||
append(buffer, lastLineIndent, presentation);
|
||||
}
|
||||
}
|
||||
|
||||
append(buffer, line, null);
|
||||
firstLineProcessed= true;
|
||||
|
||||
lastLineFormatted= lineFormatted;
|
||||
if (!lineFormatted)
|
||||
lastLineIndent= null;
|
||||
else if (lastLineIndent == null)
|
||||
lastLineIndent= getIndent(line);
|
||||
|
||||
line= reader.readLine();
|
||||
lineFormatted= reader.isFormattedLine();
|
||||
|
||||
maxNumberOfLines--;
|
||||
}
|
||||
|
||||
if (line != null) {
|
||||
append(buffer, LINE_DELIM, lineFormatted ? presentation : null);
|
||||
append(buffer, (""), presentation); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
return trim(buffer, presentation);
|
||||
|
||||
} catch (IOException e) {
|
||||
|
||||
CUIPlugin.log(e);
|
||||
return null;
|
||||
|
||||
} finally {
|
||||
gc.dispose();
|
||||
}
|
||||
}
|
||||
|
||||
private String trim(StringBuffer buffer, TextPresentation presentation) {
|
||||
|
||||
int length= buffer.length();
|
||||
|
||||
int end= length -1;
|
||||
while (end >= 0 && Character.isWhitespace(buffer.charAt(end)))
|
||||
-- end;
|
||||
|
||||
if (end == -1)
|
||||
return ""; //$NON-NLS-1$
|
||||
|
||||
if (end < length -1)
|
||||
buffer.delete(end + 1, length);
|
||||
else
|
||||
end= length;
|
||||
|
||||
int start= 0;
|
||||
while (start < end && Character.isWhitespace(buffer.charAt(start)))
|
||||
++ start;
|
||||
|
||||
buffer.delete(0, start);
|
||||
presentation.setResultWindow(new Region(start, buffer.length()));
|
||||
return buffer.toString();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1,111 +0,0 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (c) 2000 2005 IBM Corporation and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.eclipse.org/legal/epl-v10.html
|
||||
*
|
||||
* Contributors:
|
||||
* IBM Corporation - initial API and implementation
|
||||
* QNX Software System
|
||||
*******************************************************************************/
|
||||
package org.eclipse.cdt.internal.ui.text;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
import java.io.Reader;
|
||||
|
||||
import java.text.BreakIterator;
|
||||
import org.eclipse.swt.graphics.GC;
|
||||
|
||||
/*
|
||||
* Not a real reader. Could change if requested
|
||||
*/
|
||||
public class LineBreakingReader {
|
||||
|
||||
private BufferedReader fReader;
|
||||
private GC fGC;
|
||||
private int fMaxWidth;
|
||||
|
||||
private String fLine;
|
||||
private int fOffset;
|
||||
|
||||
private BreakIterator fLineBreakIterator;
|
||||
private int findNextBreakOffset(int currOffset) {
|
||||
int currWidth= 0;
|
||||
int nextOffset= fLineBreakIterator.following(currOffset);
|
||||
while (nextOffset != BreakIterator.DONE) {
|
||||
String word= fLine.substring(currOffset, nextOffset);
|
||||
int wordWidth= fGC.textExtent(word).x;
|
||||
int nextWidth= wordWidth + currWidth;
|
||||
if (nextWidth > fMaxWidth) {
|
||||
if (currWidth > 0) {
|
||||
return currOffset;
|
||||
}
|
||||
return nextOffset;
|
||||
}
|
||||
currWidth= nextWidth;
|
||||
currOffset= nextOffset;
|
||||
nextOffset= fLineBreakIterator.next();
|
||||
}
|
||||
return nextOffset;
|
||||
}
|
||||
private int findWordBegin(int idx) {
|
||||
while (idx < fLine.length() && Character.isWhitespace(fLine.charAt(idx))) {
|
||||
idx++;
|
||||
}
|
||||
return idx;
|
||||
}
|
||||
/**
|
||||
* Creates a reader that breaks an input text to fit in a given width.
|
||||
* @param reader Reader of the input text
|
||||
* @param gc The graphic context that defines the currently used font sizes
|
||||
* @param maxLineWidth The max width (pixes) where the text has to fit in
|
||||
*/
|
||||
public LineBreakingReader(Reader reader, GC gc, int maxLineWidth) {
|
||||
fReader= new BufferedReader(reader);
|
||||
fGC= gc;
|
||||
fMaxWidth= maxLineWidth;
|
||||
fOffset= 0;
|
||||
fLine= null;
|
||||
fLineBreakIterator= BreakIterator.getLineInstance();
|
||||
}
|
||||
|
||||
public boolean isFormattedLine() {
|
||||
return fLine != null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads the next line. The lengths of the line will not exceed the gived maximum
|
||||
* width.
|
||||
*/
|
||||
public String readLine() throws IOException {
|
||||
if (fLine == null) {
|
||||
String line= fReader.readLine();
|
||||
if (line == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
int lineLen= fGC.textExtent(line).x;
|
||||
if (lineLen < fMaxWidth) {
|
||||
return line;
|
||||
}
|
||||
fLine= line;
|
||||
fLineBreakIterator.setText(line);
|
||||
fOffset= 0;
|
||||
}
|
||||
int breakOffset= findNextBreakOffset(fOffset);
|
||||
String res;
|
||||
if (breakOffset != BreakIterator.DONE) {
|
||||
res= fLine.substring(fOffset, breakOffset);
|
||||
fOffset= findWordBegin(breakOffset);
|
||||
if (fOffset == fLine.length()) {
|
||||
fLine= null;
|
||||
}
|
||||
} else {
|
||||
res= fLine.substring(fOffset);
|
||||
fLine= null;
|
||||
}
|
||||
return res;
|
||||
}
|
||||
}
|
||||
|
|
@ -22,7 +22,6 @@ import org.eclipse.jface.text.ITextHoverExtension2;
|
|||
import org.eclipse.jface.text.ITextViewer;
|
||||
import org.eclipse.jface.text.Region;
|
||||
import org.eclipse.jface.text.information.IInformationProviderExtension2;
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.graphics.Point;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
import org.eclipse.ui.IEditorPart;
|
||||
|
|
@ -31,7 +30,6 @@ import org.eclipse.ui.editors.text.EditorsUI;
|
|||
import org.eclipse.cdt.ui.text.c.hover.ICEditorTextHover;
|
||||
|
||||
import org.eclipse.cdt.internal.ui.text.CWordFinder;
|
||||
import org.eclipse.cdt.internal.ui.text.HTMLTextPresenter;
|
||||
|
||||
/**
|
||||
* Abstract class for providing hover information for C
|
||||
|
|
@ -92,9 +90,7 @@ public abstract class AbstractCEditorTextHover implements ICEditorTextHover, ITe
|
|||
public IInformationControlCreator getHoverControlCreator() {
|
||||
return new IInformationControlCreator() {
|
||||
public IInformationControl createInformationControl(Shell parent) {
|
||||
return new DefaultInformationControl(parent, SWT.NONE,
|
||||
new HTMLTextPresenter(true),
|
||||
getTooltipAffordanceString());
|
||||
return new DefaultInformationControl(parent, getTooltipAffordanceString());
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -106,8 +102,7 @@ public abstract class AbstractCEditorTextHover implements ICEditorTextHover, ITe
|
|||
public IInformationControlCreator getInformationPresenterControlCreator() {
|
||||
return new IInformationControlCreator() {
|
||||
public IInformationControl createInformationControl(Shell shell) {
|
||||
int style= SWT.V_SCROLL | SWT.H_SCROLL;
|
||||
return new DefaultInformationControl(shell, SWT.RESIZE | SWT.TOOL, style, new HTMLTextPresenter(false));
|
||||
return new DefaultInformationControl(shell, true);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
* Contributors:
|
||||
* IBM Corporation - initial API and implementation
|
||||
* Sergey Prigogin (Google)
|
||||
* Anton Leherbauer (Wind River Systems)
|
||||
*******************************************************************************/
|
||||
|
||||
package org.eclipse.cdt.internal.ui.text.correction;
|
||||
|
|
@ -52,7 +53,6 @@ import org.eclipse.cdt.internal.core.model.ASTCache;
|
|||
|
||||
import org.eclipse.cdt.internal.ui.editor.ASTProvider;
|
||||
import org.eclipse.cdt.internal.ui.text.CTextTools;
|
||||
import org.eclipse.cdt.internal.ui.text.HTMLTextPresenter;
|
||||
import org.eclipse.cdt.internal.ui.text.IColorManager;
|
||||
|
||||
public class CCorrectionAssistant extends QuickAssistAssistant {
|
||||
|
|
@ -97,7 +97,7 @@ public class CCorrectionAssistant extends QuickAssistAssistant {
|
|||
private IInformationControlCreator getInformationControlCreator() {
|
||||
return new IInformationControlCreator() {
|
||||
public IInformationControl createInformationControl(Shell parent) {
|
||||
return new DefaultInformationControl(parent, new HTMLTextPresenter());
|
||||
return new DefaultInformationControl(parent, false);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,297 +0,0 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (c) 2000, 2006 IBM Corporation and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.eclipse.org/legal/epl-v10.html
|
||||
*
|
||||
* Contributors:
|
||||
* IBM Corporation - initial API and implementation
|
||||
*******************************************************************************/
|
||||
package org.eclipse.cdt.debug.internal.ui;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.PushbackReader;
|
||||
import java.io.Reader;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.custom.StyleRange;
|
||||
|
||||
import org.eclipse.cdt.debug.internal.ui.views.disassembly.DisassemblyMessages;
|
||||
import org.eclipse.jface.text.TextPresentation;
|
||||
|
||||
/**
|
||||
* Reads the text contents from a reader of HTML contents and translates
|
||||
* the tags or cut them out.
|
||||
*/
|
||||
public class HTML2TextReader extends SubstitutionTextReader {
|
||||
|
||||
private static final String EMPTY_STRING= ""; //$NON-NLS-1$
|
||||
private static final Map fgEntityLookup;
|
||||
private static final Set fgTags;
|
||||
|
||||
static {
|
||||
|
||||
fgTags= new HashSet();
|
||||
fgTags.add("b"); //$NON-NLS-1$
|
||||
fgTags.add("br"); //$NON-NLS-1$
|
||||
fgTags.add("h5"); //$NON-NLS-1$
|
||||
fgTags.add("p"); //$NON-NLS-1$
|
||||
fgTags.add("dl"); //$NON-NLS-1$
|
||||
fgTags.add("dt"); //$NON-NLS-1$
|
||||
fgTags.add("dd"); //$NON-NLS-1$
|
||||
fgTags.add("li"); //$NON-NLS-1$
|
||||
fgTags.add("ul"); //$NON-NLS-1$
|
||||
fgTags.add("pre"); //$NON-NLS-1$
|
||||
|
||||
fgEntityLookup= new HashMap(7);
|
||||
fgEntityLookup.put("lt", "<"); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
fgEntityLookup.put("gt", ">"); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
fgEntityLookup.put("nbsp", " "); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
fgEntityLookup.put("amp", "&"); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
fgEntityLookup.put("circ", "^"); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
fgEntityLookup.put("tilde", "~"); //$NON-NLS-2$ //$NON-NLS-1$
|
||||
fgEntityLookup.put("quot", "\""); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
}
|
||||
|
||||
private int fCounter= 0;
|
||||
private TextPresentation fTextPresentation;
|
||||
private int fBold= 0;
|
||||
private int fStartOffset= -1;
|
||||
private boolean fInParagraph= false;
|
||||
private boolean fIsPreformattedText= false;
|
||||
|
||||
/**
|
||||
* Transforms the html text from the reader to formatted text.
|
||||
* @param presentation If not <code>null</code>, formattings will be applied to
|
||||
* the presentation.
|
||||
*/
|
||||
public HTML2TextReader(Reader reader, TextPresentation presentation) {
|
||||
super(new PushbackReader(reader));
|
||||
fTextPresentation= presentation;
|
||||
}
|
||||
|
||||
public int read() throws IOException {
|
||||
int c= super.read();
|
||||
if (c != -1)
|
||||
++ fCounter;
|
||||
return c;
|
||||
}
|
||||
|
||||
protected void startBold() {
|
||||
if (fBold == 0)
|
||||
fStartOffset= fCounter;
|
||||
++ fBold;
|
||||
}
|
||||
|
||||
protected void startPreformattedText() {
|
||||
fIsPreformattedText= true;
|
||||
setSkipWhitespace(false);
|
||||
}
|
||||
|
||||
protected void stopPreformattedText() {
|
||||
fIsPreformattedText= false;
|
||||
setSkipWhitespace(true);
|
||||
}
|
||||
|
||||
protected void stopBold() {
|
||||
-- fBold;
|
||||
if (fBold == 0) {
|
||||
if (fTextPresentation != null) {
|
||||
fTextPresentation.addStyleRange(new StyleRange(fStartOffset, fCounter - fStartOffset, null, null, SWT.BOLD));
|
||||
}
|
||||
fStartOffset= -1;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* @see org.eclipse.jdt.internal.ui.text.SubstitutionTextReader#computeSubstitution(int)
|
||||
*/
|
||||
protected String computeSubstitution(int c) throws IOException {
|
||||
|
||||
if (c == '<')
|
||||
return processHTMLTag();
|
||||
else if (c == '&')
|
||||
return processEntity();
|
||||
else if (fIsPreformattedText)
|
||||
return processPreformattedText(c);
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private String html2Text(String html) {
|
||||
|
||||
if (html == null || html.length() == 0)
|
||||
return EMPTY_STRING;
|
||||
|
||||
String tag= html;
|
||||
if ('/' == tag.charAt(0))
|
||||
tag= tag.substring(1);
|
||||
|
||||
if (!fgTags.contains(tag))
|
||||
return EMPTY_STRING;
|
||||
|
||||
|
||||
if ("pre".equals(html)) { //$NON-NLS-1$
|
||||
startPreformattedText();
|
||||
return EMPTY_STRING;
|
||||
}
|
||||
|
||||
if ("/pre".equals(html)) { //$NON-NLS-1$
|
||||
stopPreformattedText();
|
||||
return EMPTY_STRING;
|
||||
}
|
||||
|
||||
if (fIsPreformattedText)
|
||||
return EMPTY_STRING;
|
||||
|
||||
if ("b".equals(html)) { //$NON-NLS-1$
|
||||
startBold();
|
||||
return EMPTY_STRING;
|
||||
}
|
||||
|
||||
if ("h5".equals(html) || "dt".equals(html)) { //$NON-NLS-1$ //$NON-NLS-2$
|
||||
startBold();
|
||||
return EMPTY_STRING;
|
||||
}
|
||||
|
||||
if ("dl".equals(html)) //$NON-NLS-1$
|
||||
return LINE_DELIM;
|
||||
|
||||
if ("dd".equals(html)) //$NON-NLS-1$
|
||||
return "\t"; //$NON-NLS-1$
|
||||
|
||||
if ("li".equals(html)) //$NON-NLS-1$
|
||||
return LINE_DELIM + "\t" + DisassemblyMessages.getString( "HTML2TextReader.dash" ); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
|
||||
if ("/b".equals(html)) { //$NON-NLS-1$
|
||||
stopBold();
|
||||
return EMPTY_STRING;
|
||||
}
|
||||
|
||||
if ("p".equals(html)) { //$NON-NLS-1$
|
||||
fInParagraph= true;
|
||||
return LINE_DELIM;
|
||||
}
|
||||
|
||||
if ("br".equals(html)) //$NON-NLS-1$
|
||||
return LINE_DELIM;
|
||||
|
||||
if ("/p".equals(html)) { //$NON-NLS-1$
|
||||
boolean inParagraph= fInParagraph;
|
||||
fInParagraph= false;
|
||||
return inParagraph ? EMPTY_STRING : LINE_DELIM;
|
||||
}
|
||||
|
||||
if ("/h5".equals(html) || "/dt".equals(html)) { //$NON-NLS-1$ //$NON-NLS-2$
|
||||
stopBold();
|
||||
return LINE_DELIM;
|
||||
}
|
||||
|
||||
if ("/dd".equals(html)) //$NON-NLS-1$
|
||||
return LINE_DELIM;
|
||||
|
||||
return EMPTY_STRING;
|
||||
}
|
||||
|
||||
/*
|
||||
* A '<' has been read. Process a html tag
|
||||
*/
|
||||
private String processHTMLTag() throws IOException {
|
||||
|
||||
StringBuffer buf= new StringBuffer();
|
||||
int ch;
|
||||
do {
|
||||
|
||||
ch= nextChar();
|
||||
|
||||
while (ch != -1 && ch != '>') {
|
||||
buf.append(Character.toLowerCase((char) ch));
|
||||
ch= nextChar();
|
||||
if (ch == '"'){
|
||||
buf.append(Character.toLowerCase((char) ch));
|
||||
ch= nextChar();
|
||||
while (ch != -1 && ch != '"'){
|
||||
buf.append(Character.toLowerCase((char) ch));
|
||||
ch= nextChar();
|
||||
}
|
||||
}
|
||||
if (ch == '<'){
|
||||
unread(ch);
|
||||
return '<' + buf.toString();
|
||||
}
|
||||
}
|
||||
|
||||
if (ch == -1)
|
||||
return null;
|
||||
|
||||
int tagLen= buf.length();
|
||||
// needs special treatment for comments
|
||||
if ((tagLen >= 3 && "!--".equals(buf.substring(0, 3))) //$NON-NLS-1$
|
||||
&& !(tagLen >= 5 && "--!".equals(buf.substring(tagLen - 3)))) { //$NON-NLS-1$
|
||||
// unfinished comment
|
||||
buf.append(ch);
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
} while (true);
|
||||
|
||||
return html2Text(buf.toString());
|
||||
}
|
||||
|
||||
private String processPreformattedText(int c) {
|
||||
if (c == '\r' || c == '\n')
|
||||
fCounter++;
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
private void unread(int ch) throws IOException {
|
||||
((PushbackReader) getReader()).unread(ch);
|
||||
}
|
||||
|
||||
protected String entity2Text(String symbol) {
|
||||
if (symbol.length() > 1 && symbol.charAt(0) == '#') {
|
||||
int ch;
|
||||
try {
|
||||
if (symbol.charAt(1) == 'x') {
|
||||
ch= Integer.parseInt(symbol.substring(2), 16);
|
||||
} else {
|
||||
ch= Integer.parseInt(symbol.substring(1), 10);
|
||||
}
|
||||
return EMPTY_STRING + (char)ch;
|
||||
} catch (NumberFormatException e) {
|
||||
}
|
||||
} else {
|
||||
String str= (String) fgEntityLookup.get(symbol);
|
||||
if (str != null) {
|
||||
return str;
|
||||
}
|
||||
}
|
||||
return "&" + symbol; // not found //$NON-NLS-1$
|
||||
}
|
||||
|
||||
/*
|
||||
* A '&' has been read. Process a entity
|
||||
*/
|
||||
private String processEntity() throws IOException {
|
||||
StringBuffer buf= new StringBuffer();
|
||||
int ch= nextChar();
|
||||
while (Character.isLetterOrDigit((char)ch) || ch == '#') {
|
||||
buf.append((char) ch);
|
||||
ch= nextChar();
|
||||
}
|
||||
|
||||
if (ch == ';')
|
||||
return entity2Text(buf.toString());
|
||||
|
||||
buf.insert(0, '&');
|
||||
if (ch != -1)
|
||||
buf.append((char) ch);
|
||||
return buf.toString();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,194 +0,0 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (c) 2000, 2006 IBM Corporation and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.eclipse.org/legal/epl-v10.html
|
||||
*
|
||||
* Contributors:
|
||||
* IBM Corporation - initial API and implementation
|
||||
*******************************************************************************/
|
||||
package org.eclipse.cdt.debug.internal.ui;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.Reader;
|
||||
import java.io.StringReader;
|
||||
import java.util.Iterator;
|
||||
import org.eclipse.cdt.debug.internal.ui.views.disassembly.DisassemblyMessages;
|
||||
import org.eclipse.debug.core.DebugPlugin;
|
||||
import org.eclipse.jface.text.DefaultInformationControl;
|
||||
import org.eclipse.jface.text.Region;
|
||||
import org.eclipse.jface.text.TextPresentation;
|
||||
import org.eclipse.swt.custom.StyleRange;
|
||||
import org.eclipse.swt.graphics.Drawable;
|
||||
import org.eclipse.swt.graphics.GC;
|
||||
import org.eclipse.swt.widgets.Display;
|
||||
|
||||
public class HTMLTextPresenter implements DefaultInformationControl.IInformationPresenter, DefaultInformationControl.IInformationPresenterExtension {
|
||||
|
||||
private static final String LINE_DELIM= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
|
||||
private int fCounter;
|
||||
private boolean fEnforceUpperLineLimit;
|
||||
|
||||
public HTMLTextPresenter(boolean enforceUpperLineLimit) {
|
||||
super();
|
||||
fEnforceUpperLineLimit= enforceUpperLineLimit;
|
||||
}
|
||||
|
||||
public HTMLTextPresenter() {
|
||||
this(true);
|
||||
}
|
||||
|
||||
protected Reader createReader(String hoverInfo, TextPresentation presentation) {
|
||||
return new HTML2TextReader(new StringReader(hoverInfo), presentation);
|
||||
}
|
||||
|
||||
protected void adaptTextPresentation(TextPresentation presentation, int offset, int insertLength) {
|
||||
|
||||
int yoursStart= offset;
|
||||
int yoursEnd= offset + insertLength -1;
|
||||
yoursEnd= Math.max(yoursStart, yoursEnd);
|
||||
|
||||
Iterator e= presentation.getAllStyleRangeIterator();
|
||||
while (e.hasNext()) {
|
||||
|
||||
StyleRange range= (StyleRange) e.next();
|
||||
|
||||
int myStart= range.start;
|
||||
int myEnd= range.start + range.length -1;
|
||||
myEnd= Math.max(myStart, myEnd);
|
||||
|
||||
if (myEnd < yoursStart)
|
||||
continue;
|
||||
|
||||
if (myStart < yoursStart)
|
||||
range.length += insertLength;
|
||||
else
|
||||
range.start += insertLength;
|
||||
}
|
||||
}
|
||||
|
||||
private void append(StringBuffer buffer, String string, TextPresentation presentation) {
|
||||
|
||||
int length= string.length();
|
||||
buffer.append(string);
|
||||
|
||||
if (presentation != null)
|
||||
adaptTextPresentation(presentation, fCounter, length);
|
||||
|
||||
fCounter += length;
|
||||
}
|
||||
|
||||
private String getIndent(String line) {
|
||||
int length= line.length();
|
||||
|
||||
int i= 0;
|
||||
while (i < length && Character.isWhitespace(line.charAt(i))) ++i;
|
||||
|
||||
return (i == length ? line : line.substring(0, i)) + " "; //$NON-NLS-1$
|
||||
}
|
||||
|
||||
/*
|
||||
* @see IHoverInformationPresenter#updatePresentation(Display display, String, TextPresentation, int, int)
|
||||
*/
|
||||
public String updatePresentation(Drawable drawable, String hoverInfo, TextPresentation presentation, int maxWidth, int maxHeight) {
|
||||
|
||||
if (hoverInfo == null)
|
||||
return null;
|
||||
|
||||
GC gc= new GC(drawable);
|
||||
try {
|
||||
|
||||
StringBuffer buffer= new StringBuffer();
|
||||
int maxNumberOfLines= Math.round(maxHeight / gc.getFontMetrics().getHeight());
|
||||
|
||||
fCounter= 0;
|
||||
LineBreakingReader reader= new LineBreakingReader(createReader(hoverInfo, presentation), gc, maxWidth);
|
||||
|
||||
boolean lastLineFormatted= false;
|
||||
String lastLineIndent= null;
|
||||
|
||||
String line=reader.readLine();
|
||||
boolean lineFormatted= reader.isFormattedLine();
|
||||
boolean firstLineProcessed= false;
|
||||
|
||||
while (line != null) {
|
||||
|
||||
if (fEnforceUpperLineLimit && maxNumberOfLines <= 0)
|
||||
break;
|
||||
|
||||
if (firstLineProcessed) {
|
||||
if (!lastLineFormatted)
|
||||
append(buffer, LINE_DELIM, null);
|
||||
else {
|
||||
append(buffer, LINE_DELIM, presentation);
|
||||
if (lastLineIndent != null)
|
||||
append(buffer, lastLineIndent, presentation);
|
||||
}
|
||||
}
|
||||
|
||||
append(buffer, line, null);
|
||||
firstLineProcessed= true;
|
||||
|
||||
lastLineFormatted= lineFormatted;
|
||||
if (!lineFormatted)
|
||||
lastLineIndent= null;
|
||||
else if (lastLineIndent == null)
|
||||
lastLineIndent= getIndent(line);
|
||||
|
||||
line= reader.readLine();
|
||||
lineFormatted= reader.isFormattedLine();
|
||||
|
||||
maxNumberOfLines--;
|
||||
}
|
||||
|
||||
if (line != null) {
|
||||
append(buffer, LINE_DELIM, lineFormatted ? presentation : null);
|
||||
append(buffer, DisassemblyMessages.getString( "HTMLTextPresenter.ellipsis" ), presentation); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
return trim(buffer, presentation);
|
||||
|
||||
} catch (IOException e) {
|
||||
|
||||
DebugPlugin.log(e);
|
||||
return null;
|
||||
|
||||
} finally {
|
||||
gc.dispose();
|
||||
}
|
||||
}
|
||||
|
||||
private String trim(StringBuffer buffer, TextPresentation presentation) {
|
||||
|
||||
int length= buffer.length();
|
||||
|
||||
int end= length -1;
|
||||
while (end >= 0 && Character.isWhitespace(buffer.charAt(end)))
|
||||
-- end;
|
||||
|
||||
if (end == -1)
|
||||
return ""; //$NON-NLS-1$
|
||||
|
||||
if (end < length -1)
|
||||
buffer.delete(end + 1, length);
|
||||
else
|
||||
end= length;
|
||||
|
||||
int start= 0;
|
||||
while (start < end && Character.isWhitespace(buffer.charAt(start)))
|
||||
++ start;
|
||||
|
||||
buffer.delete(0, start);
|
||||
presentation.setResultWindow(new Region(start, buffer.length()));
|
||||
return buffer.toString();
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.eclipse.jface.text.DefaultInformationControl$IInformationPresenter#updatePresentation(org.eclipse.swt.widgets.Display, java.lang.String, org.eclipse.jface.text.TextPresentation, int, int)
|
||||
*/
|
||||
public String updatePresentation( Display display, String hoverInfo, TextPresentation presentation, int maxWidth, int maxHeight ) {
|
||||
return updatePresentation( (Drawable)display, hoverInfo, presentation, maxWidth, maxHeight );
|
||||
}
|
||||
}
|
||||
|
|
@ -1,109 +0,0 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (c) 2000, 2006 IBM Corporation and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.eclipse.org/legal/epl-v10.html
|
||||
*
|
||||
* Contributors:
|
||||
* IBM Corporation - initial API and implementation
|
||||
*******************************************************************************/
|
||||
package org.eclipse.cdt.debug.internal.ui;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
import java.io.Reader;
|
||||
|
||||
import java.text.BreakIterator;
|
||||
import org.eclipse.swt.graphics.GC;
|
||||
|
||||
/*
|
||||
* Not a real reader. Could change if requested
|
||||
*/
|
||||
public class LineBreakingReader {
|
||||
|
||||
private BufferedReader fReader;
|
||||
private GC fGC;
|
||||
private int fMaxWidth;
|
||||
|
||||
private String fLine;
|
||||
private int fOffset;
|
||||
|
||||
private BreakIterator fLineBreakIterator;
|
||||
|
||||
/**
|
||||
* Creates a reader that breaks an input text to fit in a given width.
|
||||
* @param reader Reader of the input text
|
||||
* @param gc The graphic context that defines the currently used font sizes
|
||||
* @param maxLineWidth The max width (pixes) where the text has to fit in
|
||||
*/
|
||||
public LineBreakingReader(Reader reader, GC gc, int maxLineWidth) {
|
||||
fReader= new BufferedReader(reader);
|
||||
fGC= gc;
|
||||
fMaxWidth= maxLineWidth;
|
||||
fOffset= 0;
|
||||
fLine= null;
|
||||
fLineBreakIterator= BreakIterator.getLineInstance();
|
||||
}
|
||||
|
||||
public boolean isFormattedLine() {
|
||||
return fLine != null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads the next line. The lengths of the line will not exceed the gived maximum
|
||||
* width.
|
||||
*/
|
||||
public String readLine() throws IOException {
|
||||
if (fLine == null) {
|
||||
String line= fReader.readLine();
|
||||
if (line == null)
|
||||
return null;
|
||||
|
||||
int lineLen= fGC.textExtent(line).x;
|
||||
if (lineLen < fMaxWidth) {
|
||||
return line;
|
||||
}
|
||||
fLine= line;
|
||||
fLineBreakIterator.setText(line);
|
||||
fOffset= 0;
|
||||
}
|
||||
int breakOffset= findNextBreakOffset(fOffset);
|
||||
String res;
|
||||
if (breakOffset != BreakIterator.DONE) {
|
||||
res= fLine.substring(fOffset, breakOffset);
|
||||
fOffset= findWordBegin(breakOffset);
|
||||
if (fOffset == fLine.length()) {
|
||||
fLine= null;
|
||||
}
|
||||
} else {
|
||||
res= fLine.substring(fOffset);
|
||||
fLine= null;
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
private int findNextBreakOffset(int currOffset) {
|
||||
int currWidth= 0;
|
||||
int nextOffset= fLineBreakIterator.following(currOffset);
|
||||
while (nextOffset != BreakIterator.DONE) {
|
||||
String word= fLine.substring(currOffset, nextOffset);
|
||||
int wordWidth= fGC.textExtent(word).x;
|
||||
int nextWidth= wordWidth + currWidth;
|
||||
if (nextWidth > fMaxWidth) {
|
||||
return (currWidth > 0) ? currOffset : nextOffset;
|
||||
}
|
||||
currWidth= nextWidth;
|
||||
currOffset= nextOffset;
|
||||
nextOffset= fLineBreakIterator.next();
|
||||
}
|
||||
return nextOffset;
|
||||
}
|
||||
|
||||
private int findWordBegin(int idx) {
|
||||
while (idx < fLine.length() && Character.isWhitespace(fLine.charAt(idx))) {
|
||||
idx++;
|
||||
}
|
||||
return idx;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,23 +1,22 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (c) 2004, 2006 QNX Software Systems and others.
|
||||
* Copyright (c) 2004, 2008 QNX Software Systems and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.eclipse.org/legal/epl-v10.html
|
||||
*
|
||||
* Contributors:
|
||||
* QNX Software Systems - Initial API and implementation
|
||||
* QNX Software Systems - Initial API and implementation
|
||||
* Anton Leherbauer (Wind River Systems)
|
||||
*******************************************************************************/
|
||||
package org.eclipse.cdt.debug.internal.ui.views.disassembly;
|
||||
|
||||
import org.eclipse.cdt.debug.internal.ui.HTMLTextPresenter;
|
||||
import org.eclipse.jface.text.DefaultInformationControl;
|
||||
import org.eclipse.jface.text.IInformationControl;
|
||||
import org.eclipse.jface.text.IInformationControlCreator;
|
||||
import org.eclipse.jface.text.source.IAnnotationHover;
|
||||
import org.eclipse.jface.text.source.ISourceViewer;
|
||||
import org.eclipse.jface.text.source.SourceViewerConfiguration;
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
|
||||
/**
|
||||
|
|
@ -45,11 +44,8 @@ public class DisassemblyViewerConfiguration extends SourceViewerConfiguration {
|
|||
|
||||
public IInformationControlCreator getInformationControlCreator( ISourceViewer sourceViewer, final boolean cutDown ) {
|
||||
return new IInformationControlCreator() {
|
||||
|
||||
public IInformationControl createInformationControl( Shell parent ) {
|
||||
int style = cutDown ? SWT.NONE : (SWT.V_SCROLL | SWT.H_SCROLL);
|
||||
return new DefaultInformationControl( parent, style, new HTMLTextPresenter( cutDown ) );
|
||||
// return new HoverBrowserControl(parent);
|
||||
return new DefaultInformationControl( parent, false );
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue