[jbosstools-commits] JBoss Tools SVN: r29368 - in trunk: common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml and 1 other directories.

Author: dazarov Date: 2011-02-25 20:40:18 -0500 (Fri, 25 Feb 2011) New Revision: 29368 Added: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerAnnotationInfo.java trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerProblemAnnotationHoverProcessor.java trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/QuickFixProposal.java trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/TextXMLMessages.java trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/TextXMLMessages.properties Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/XMLTextViewerConfiguration.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java Log: https://issues.jboss.org/browse/JBIDE-8350 Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF 2011-02-25 22:44:11 UTC (rev 29367) +++ trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF 2011-02-26 01:40:18 UTC (rev 29368) @@ -26,6 +26,7 @@ org.eclipse.wst.sse.core, org.eclipse.core.resources, org.eclipse.wst.xsd.ui, - org.eclipse.wst.dtd.ui + org.eclipse.wst.dtd.ui, + org.eclipse.ui.ide;bundle-version="3.6.0" Bundle-Version: 3.2.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Added: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerAnnotationInfo.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerAnnotationInfo.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerAnnotationInfo.java 2011-02-26 01:40:18 UTC (rev 29368) @@ -0,0 +1,44 @@ +/******************************************************************************* + * Copyright (c) 2011 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.common.text.xml; + +import java.util.ArrayList; + +import org.eclipse.core.resources.IMarker; +import org.eclipse.jface.text.ITextViewer; +import org.eclipse.jface.text.Position; +import org.eclipse.ui.IMarkerResolution; +import org.eclipse.ui.ide.IDE; +import org.eclipse.ui.texteditor.SimpleMarkerAnnotation; + +public class MarkerAnnotationInfo { + public final SimpleMarkerAnnotation annotation; + public final Position position; + public final ITextViewer viewer; + + public MarkerAnnotationInfo(SimpleMarkerAnnotation annotation, Position position, ITextViewer textViewer) { + this.annotation= annotation; + this.position= position; + this.viewer= textViewer; + } + + public QuickFixProposal[] getCompletionProposals() { + ArrayList<QuickFixProposal> proposals = new ArrayList<QuickFixProposal>(); + + IMarker marker = annotation.getMarker(); + IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry().getResolutions(marker); + for (IMarkerResolution resolution : resolutions) { + proposals.add(new QuickFixProposal(resolution, marker)); + } + + return proposals.toArray(new QuickFixProposal[proposals.size()]); + } +} Property changes on: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerAnnotationInfo.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerProblemAnnotationHoverProcessor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerProblemAnnotationHoverProcessor.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerProblemAnnotationHoverProcessor.java 2011-02-26 01:40:18 UTC (rev 29368) @@ -0,0 +1,379 @@ +/******************************************************************************* + * Copyright (c) 2011 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.common.text.xml; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.core.runtime.Assert; +import org.eclipse.jface.resource.JFaceResources; +import org.eclipse.jface.text.AbstractInformationControl; +import org.eclipse.jface.text.AbstractReusableInformationControlCreator; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IInformationControl; +import org.eclipse.jface.text.IInformationControlCreator; +import org.eclipse.jface.text.IInformationControlExtension2; +import org.eclipse.jface.text.IInformationControlExtension4; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.IRewriteTarget; +import org.eclipse.jface.text.ITextHoverExtension; +import org.eclipse.jface.text.ITextHoverExtension2; +import org.eclipse.jface.text.ITextViewer; +import org.eclipse.jface.text.ITextViewerExtension; +import org.eclipse.jface.text.Position; +import org.eclipse.jface.text.source.Annotation; +import org.eclipse.jface.text.source.IAnnotationModel; +import org.eclipse.jface.text.source.SourceViewer; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.ScrolledComposite; +import org.eclipse.swt.custom.StyledText; +import org.eclipse.swt.events.MouseEvent; +import org.eclipse.swt.events.MouseListener; +import org.eclipse.swt.events.PaintEvent; +import org.eclipse.swt.events.PaintListener; +import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.Font; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Canvas; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Link; +import org.eclipse.swt.widgets.ScrollBar; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.editors.text.EditorsUI; +import org.eclipse.ui.texteditor.DefaultMarkerAnnotationAccess; +import org.eclipse.ui.texteditor.SimpleMarkerAnnotation; +import org.eclipse.wst.sse.ui.internal.taginfo.ProblemAnnotationHoverProcessor; + +public class MarkerProblemAnnotationHoverProcessor extends ProblemAnnotationHoverProcessor implements ITextHoverExtension, ITextHoverExtension2{ + + private IInformationControlCreator controlCreator = null; + private static IInformationControlCreator presenterControlCreator; + + public String getHoverInfo(ITextViewer viewer, IRegion hoverRegion) { + return null; + } + + public Object getHoverInfo2(ITextViewer viewer, IRegion hoverRegion) { + IAnnotationModel model = ((SourceViewer) viewer).getAnnotationModel(); + if (model != null) { + Iterator<Annotation> iterator = model.getAnnotationIterator(); + while (iterator.hasNext()) { + Annotation annotation = (Annotation) iterator.next(); + if (!isAnnotationValid(annotation)) + continue; + + Position position = model.getPosition(annotation); + + if (position.overlapsWith(hoverRegion.getOffset(), hoverRegion.getLength())) { + return new MarkerAnnotationInfo((SimpleMarkerAnnotation)annotation, position, viewer); + } + } + } + return null; + } + + public IInformationControlCreator getInformationPresenterControlCreator() { + if (presenterControlCreator == null) + presenterControlCreator= new PresenterControlCreator(); + return presenterControlCreator; + } + + protected boolean isAnnotationValid(Annotation annotation) { + if(annotation instanceof SimpleMarkerAnnotation) + return true; + return false; + } + + public IInformationControlCreator getHoverControlCreator() { + if (controlCreator == null) + controlCreator= new AnnotationHoverControlCreator(getInformationPresenterControlCreator()); + return controlCreator; + } + + private static class MarkerAnnotationInformationControl extends AbstractInformationControl implements IInformationControlExtension2{ + private final DefaultMarkerAnnotationAccess annotationAccess; + private MarkerAnnotationInfo info; + private Composite parent; + + public MarkerAnnotationInformationControl(Shell parentShell, + String str) { + super(parentShell, str); + annotationAccess= new DefaultMarkerAnnotationAccess(); + create(); + } + + public boolean hasContents() { + return info != null; + } + + private MarkerAnnotationInfo getAnnotationInfo() { + return info; + } + + @Override + protected void createContent(Composite parent) { + this.parent = parent; + GridLayout layout= new GridLayout(1, false); + layout.verticalSpacing= 0; + layout.marginWidth= 0; + layout.marginHeight= 0; + parent.setLayout(layout); + } + + public final void setVisible(boolean visible) { + if (!visible) + disposeContent(); + super.setVisible(visible); + } + + public Point computeSizeHint() { + Point preferedSize= getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT, true); + + Point constrains= getSizeConstraints(); + if (constrains == null) + return preferedSize; + + Point constrainedSize= getShell().computeSize(constrains.x, SWT.DEFAULT, true); + + int width= Math.min(preferedSize.x, constrainedSize.x); + int height= Math.max(preferedSize.y, constrainedSize.y); + + return new Point(width, height); + } + + public void setInput(Object input) { + Assert.isLegal(input instanceof MarkerAnnotationInfo); + info = (MarkerAnnotationInfo)input; + disposeContent(); + createContent(); + } + + protected void disposeContent() { + for (Control child : parent.getChildren()) { + child.dispose(); + } + } + + protected void createContent() { + createInfo(parent, getAnnotationInfo().annotation); + setDecoration(parent, parent.getForeground(), parent.getBackground(), JFaceResources.getDialogFont()); + + QuickFixProposal[] proposals = getAnnotationInfo().getCompletionProposals(); + if (proposals.length > 0) + createControl(parent, proposals); + + parent.layout(true); + } + + private void createControl(Composite parent, QuickFixProposal[] proposals) { + Composite composite = new Composite(parent, SWT.NONE); + composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + GridLayout layout2 = new GridLayout(1, false); + layout2.marginHeight = 0; + layout2.marginWidth = 0; + layout2.verticalSpacing = 2; + composite.setLayout(layout2); + + Label separator= new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL); + GridData gridData= new GridData(SWT.FILL, SWT.CENTER, true, false); + separator.setLayoutData(gridData); + + Label quickFixLabel= new Label(composite, SWT.NONE); + GridData layoutData= new GridData(SWT.BEGINNING, SWT.CENTER, false, false); + layoutData.horizontalIndent = 4; + quickFixLabel.setLayoutData(layoutData); + String text; + if (proposals.length == 1) { + text= TextXMLMessages.SINGLE_QUICK_FIX; + } else { + text= NLS.bind(TextXMLMessages.MULTIPLE_QUICK_FIX, proposals.length); + } + quickFixLabel.setText(text); + + setDecoration(composite, parent.getForeground(), parent.getBackground(), JFaceResources.getDialogFont()); + createList(composite, proposals); + } + + private void createList(Composite parent, QuickFixProposal[] proposals) { + final ScrolledComposite scrolledComposite= new ScrolledComposite(parent, SWT.V_SCROLL | SWT.H_SCROLL); + GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true); + scrolledComposite.setLayoutData(gridData); + scrolledComposite.setExpandVertical(false); + scrolledComposite.setExpandHorizontal(false); + + Composite composite = new Composite(scrolledComposite, SWT.NONE); + composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + GridLayout layout = new GridLayout(2, false); + layout.marginLeft = 5; + layout.verticalSpacing = 2; + composite.setLayout(layout); + + List<Link> list = new ArrayList<Link>(); + for (QuickFixProposal proposal : proposals) { + list.add(createLink(composite, proposal)); + } + + scrolledComposite.setContent(composite); + setDecoration(scrolledComposite, parent.getForeground(), parent.getBackground(), JFaceResources.getDialogFont()); + + Point contentSize= composite.computeSize(SWT.DEFAULT, SWT.DEFAULT); + composite.setSize(contentSize); + + Point constraints= getSizeConstraints(); + if (constraints != null && contentSize.x < constraints.x) { + ScrollBar horizontalBar= scrolledComposite.getHorizontalBar(); + + int scrollBarHeight; + if (horizontalBar == null) { + Point scrollSize = scrolledComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT); + scrollBarHeight = scrollSize.y - contentSize.y; + } else { + scrollBarHeight = horizontalBar.getSize().y; + } + gridData.heightHint = contentSize.y - scrollBarHeight; + } + } + + private Link createLink(Composite parent, final QuickFixProposal proposal) { + Link proposalLink = new Link(parent, SWT.WRAP); + GridData layoutData = new GridData(SWT.BEGINNING, SWT.CENTER, false, false); + String linkText = proposal.getDisplayString(); + proposalLink.setText("<a>" + linkText + "</a>"); //$NON-NLS-1$ //$NON-NLS-2$ + proposalLink.setLayoutData(layoutData); + proposalLink.addMouseListener(new MouseListener(){ + public void mouseDoubleClick(MouseEvent e) { + } + + public void mouseDown(MouseEvent e) { + fix(proposal, info.viewer, info.position.offset); + } + + public void mouseUp(MouseEvent e) { + } + }); + return proposalLink; + } + + private void fix(QuickFixProposal p, ITextViewer viewer, int offset) { + dispose(); + + IRewriteTarget target = null; + try { + IDocument document = viewer.getDocument(); + + if (viewer instanceof ITextViewerExtension) { + ITextViewerExtension extension= (ITextViewerExtension) viewer; + target= extension.getRewriteTarget(); + } + + if (target != null) + target.beginCompoundChange(); + + p.apply(document); + + Point selection = p.getSelection(document); + if (selection != null) { + viewer.setSelectedRange(selection.x, selection.y); + viewer.revealRange(selection.x, selection.y); + } + } finally { + if (target != null) + target.endCompoundChange(); + } + } + + private void createInfo(Composite parent, final Annotation annotation) { + Composite composite = new Composite(parent, SWT.NONE); + composite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); + GridLayout layout = new GridLayout(2, false); + layout.marginHeight = 2; + layout.marginWidth = 2; + layout.horizontalSpacing = 0; + composite.setLayout(layout); + + final Canvas canvas = new Canvas(composite, SWT.NO_FOCUS); + GridData gridData = new GridData(SWT.BEGINNING, SWT.BEGINNING, false, false); + gridData.widthHint = 17; + gridData.heightHint = 16; + canvas.setLayoutData(gridData); + canvas.addPaintListener(new PaintListener() { + public void paintControl(PaintEvent e) { + e.gc.setFont(null); + annotationAccess.paint(annotation, e.gc, canvas, new Rectangle(0, 0, 16, 16)); + } + }); + + StyledText text = new StyledText(composite, SWT.MULTI | SWT.WRAP | SWT.READ_ONLY); + GridData data = new GridData(SWT.FILL, SWT.FILL, true, true); + text.setLayoutData(data); + String annotationText = annotation.getText(); + if (annotationText != null) + text.setText(annotationText); + } + + private void setDecoration(Control control, Color foreground, Color background, Font font) { + control.setForeground(foreground); + control.setBackground(background); + control.setFont(font); + + if (control instanceof Composite) { + for (Control child : ((Composite) control).getChildren()) { + setDecoration(child, foreground, background, font); + } + } + } + + } + + private static final class AnnotationHoverControlCreator extends AbstractReusableInformationControlCreator { + private final IInformationControlCreator presenterControlCreator; + + public AnnotationHoverControlCreator(IInformationControlCreator presenterControlCreator) { + this.presenterControlCreator = presenterControlCreator; + } + + public IInformationControl doCreateInformationControl(Shell parent) { + return new MarkerAnnotationInformationControl(parent, EditorsUI.getTooltipAffordanceString()) { + public IInformationControlCreator getInformationPresenterControlCreator() { + return presenterControlCreator; + } + }; + } + + public boolean canReuse(IInformationControl control) { + if (!super.canReuse(control)) + return false; + + if (control instanceof IInformationControlExtension4) + ((IInformationControlExtension4) control).setStatusText(EditorsUI.getTooltipAffordanceString()); + + return true; + } + } + + private static final class PresenterControlCreator extends AbstractReusableInformationControlCreator { + public IInformationControl doCreateInformationControl(Shell parent) { + return new MarkerAnnotationInformationControl(parent, EditorsUI.getTooltipAffordanceString()) { + public IInformationControlCreator getInformationPresenterControlCreator() { + return presenterControlCreator; + } + }; + } + } + +} Property changes on: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerProblemAnnotationHoverProcessor.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/QuickFixProposal.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/QuickFixProposal.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/QuickFixProposal.java 2011-02-26 01:40:18 UTC (rev 29368) @@ -0,0 +1,59 @@ +/******************************************************************************* + * Copyright (c) 2011 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.common.text.xml; + +import org.eclipse.core.resources.IMarker; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.eclipse.jface.text.contentassist.IContextInformation; +import org.eclipse.ui.IMarkerResolution; +import org.eclipse.ui.IMarkerResolution2; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.Point; + +class QuickFixProposal implements ICompletionProposal{ + private IMarkerResolution resolution; + private IMarker marker; + + public QuickFixProposal(IMarkerResolution resolution, IMarker marker){ + this.resolution = resolution; + this.marker = marker; + } + + public void apply(IDocument document) { + resolution.run(marker); + } + + public Point getSelection(IDocument document) { + return null; + } + + public String getAdditionalProposalInfo() { + if (resolution instanceof IMarkerResolution2) + return ((IMarkerResolution2) resolution).getDescription(); + + return (String)marker.getAttribute(IMarker.MESSAGE, ""); //$NON-NLS-1$ + } + + public String getDisplayString() { + return resolution.getLabel(); + } + + public Image getImage() { + if (resolution instanceof IMarkerResolution2) + return ((IMarkerResolution2)resolution).getImage(); + return null; + } + + public IContextInformation getContextInformation() { + return null; + } +} Property changes on: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/QuickFixProposal.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/TextXMLMessages.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/TextXMLMessages.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/TextXMLMessages.java 2011-02-26 01:40:18 UTC (rev 29368) @@ -0,0 +1,24 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.common.text.xml; + +import org.eclipse.osgi.util.NLS; + +public class TextXMLMessages extends NLS{ + private static final String BUNDLE_NAME = "org.jboss.tools.common.text.xml.TextXMLMessages"; //$NON-NLS-1$ + + static { + NLS.initializeMessages(BUNDLE_NAME, TextXMLMessages.class); + } + + public static String SINGLE_QUICK_FIX; + public static String MULTIPLE_QUICK_FIX; +} Property changes on: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/TextXMLMessages.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/TextXMLMessages.properties =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/TextXMLMessages.properties (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/TextXMLMessages.properties 2011-02-26 01:40:18 UTC (rev 29368) @@ -0,0 +1,13 @@ +################################################################################## +### Copyright (c) 2011 Red Hat, Inc. +### Distributed under license by Red Hat, Inc. All rights reserved. +### This program is 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: +### Red Hat, Inc. - initial API and implementation +################################################################################## + +SINGLE_QUICK_FIX=one quick fix available: +MULTIPLE_QUICK_FIX=''{0}''quick fixes available: \ No newline at end of file Property changes on: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/TextXMLMessages.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/XMLTextViewerConfiguration.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/XMLTextViewerConfiguration.java 2011-02-25 22:44:11 UTC (rev 29367) +++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/XMLTextViewerConfiguration.java 2011-02-26 01:40:18 UTC (rev 29368) @@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Plugin; +import org.eclipse.jface.text.ITextHover; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.text.hyperlink.IHyperlinkDetector; import org.eclipse.jface.text.source.ISourceViewer; @@ -26,6 +27,11 @@ import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants; import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration; import org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext; +import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; +import org.eclipse.wst.sse.ui.internal.taginfo.AnnotationHoverProcessor; +import org.eclipse.wst.sse.ui.internal.taginfo.BestMatchHover; +import org.eclipse.wst.sse.ui.internal.taginfo.ProblemAnnotationHoverProcessor; +import org.eclipse.wst.sse.ui.internal.taginfo.TextHoverManager; import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML; import org.eclipse.wst.xml.ui.internal.contentassist.XMLStructuredContentAssistProcessor; import org.jboss.tools.common.text.xml.contentassist.ProposalSorter; @@ -180,4 +186,21 @@ return findDeclaredMethod(sc, name, paramTypes); } + @Override + public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType, int stateMask) { + TextHoverManager.TextHoverDescriptor[] hoverDescs = SSEUIPlugin.getDefault().getTextHoverManager().getTextHovers(); + int i = 0; + while (i < hoverDescs.length) { + if (hoverDescs[i].isEnabled() && computeStateMask(hoverDescs[i].getModifierString()) == stateMask) { + String hoverType = hoverDescs[i].getId(); + if (TextHoverManager.COMBINATION_HOVER.equalsIgnoreCase(hoverType)){ + return new MarkerProblemAnnotationHoverProcessor(); + } + } + i++; + } + + return super.getTextHover(sourceViewer, contentType, stateMask); + } + } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java 2011-02-25 22:44:11 UTC (rev 29367) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java 2011-02-26 01:40:18 UTC (rev 29368) @@ -40,6 +40,7 @@ import org.eclipse.wst.sse.ui.internal.taginfo.AnnotationHoverProcessor; import org.eclipse.wst.sse.ui.internal.taginfo.ProblemAnnotationHoverProcessor; import org.eclipse.wst.sse.ui.internal.taginfo.TextHoverManager; +import org.jboss.tools.common.text.xml.MarkerProblemAnnotationHoverProcessor; import org.jboss.tools.common.text.xml.contentassist.ProposalSorter; import org.jboss.tools.jst.jsp.format.HTMLFormatProcessor; import org.jboss.tools.jst.jsp.jspeditor.info.ChainTextHover; @@ -204,8 +205,7 @@ textHover = new AnnotationHoverProcessor(); else if (TextHoverManager.COMBINATION_HOVER .equalsIgnoreCase(hoverType)) - textHover = new ChainTextHover( - createDocumentationHovers(contentType)); + return new MarkerProblemAnnotationHoverProcessor(); else if (TextHoverManager.DOCUMENTATION_HOVER .equalsIgnoreCase(hoverType)) { ITextHover[] hovers = createDocumentationHovers(contentType); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java 2011-02-25 22:44:11 UTC (rev 29367) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java 2011-02-26 01:40:18 UTC (rev 29368) @@ -15,6 +15,7 @@ import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jface.text.ITextHover; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.text.hyperlink.IHyperlinkDetector; import org.eclipse.jface.text.source.ISourceViewer; @@ -24,7 +25,10 @@ import org.eclipse.jst.jsp.ui.internal.style.jspel.LineStyleProviderForJSPEL; import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants; import org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext; +import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider; +import org.eclipse.wst.sse.ui.internal.taginfo.TextHoverManager; +import org.jboss.tools.common.text.xml.MarkerProblemAnnotationHoverProcessor; import org.jboss.tools.common.text.xml.contentassist.ProposalSorter; /** @@ -145,4 +149,22 @@ // return super.getContentAssistProcessors(sourceViewer, partitionType); return new IContentAssistProcessor[0]; } + + @Override + public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType, int stateMask) { + TextHoverManager.TextHoverDescriptor[] hoverDescs = SSEUIPlugin.getDefault().getTextHoverManager().getTextHovers(); + int i = 0; + while (i < hoverDescs.length) { + if (hoverDescs[i].isEnabled() && computeStateMask(hoverDescs[i].getModifierString()) == stateMask) { + String hoverType = hoverDescs[i].getId(); + if (TextHoverManager.COMBINATION_HOVER.equalsIgnoreCase(hoverType)){ + return new MarkerProblemAnnotationHoverProcessor(); + } + } + i++; + } + + return super.getTextHover(sourceViewer, contentType, stateMask); + } + } \ No newline at end of file