Menu
▾
▴
[Phpeclipse-commits] net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/hover AnnotationHover.java,NONE,1.1 JavaTypeHover.java,NONE,1.1 BestMatchHover.java,1.1,1.2 JavaProblemHover.java,1.2,NONE
Update of /cvsroot/phpeclipse/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/hover In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15052/src/net/sourceforge/phpdt/internal/ui/text/java/hover Modified Files: BestMatchHover.java Added Files: AnnotationHover.java JavaTypeHover.java Removed Files: JavaProblemHover.java Log Message: Eclipse 3M7 --- NEW FILE: AnnotationHover.java --- /******************************************************************************* * Copyright (c) 2000, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Common Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/cpl-v10.html * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ package net.sourceforge.phpdt.internal.ui.text.java.hover; import java.util.Iterator; import net.sourceforge.phpdt.internal.ui.text.HTMLPrinter; import net.sourceforge.phpdt.ui.PreferenceConstants; import net.sourceforge.phpeclipse.PHPeclipsePlugin; import net.sourceforge.phpeclipse.phpeditor.JavaAnnotationIterator; import net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.Position; import org.eclipse.jface.text.source.Annotation; import org.eclipse.jface.text.source.IAnnotationModel; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.editors.text.EditorsUI; import org.eclipse.ui.texteditor.AnnotationPreference; import org.eclipse.ui.texteditor.DefaultMarkerAnnotationAccess; import org.eclipse.ui.texteditor.IDocumentProvider; public class AnnotationHover extends AbstractJavaEditorTextHover { private IPreferenceStore fStore= PHPeclipsePlugin.getDefault().getPreferenceStore(); private DefaultMarkerAnnotationAccess fAnnotationAccess= new DefaultMarkerAnnotationAccess(); /* * Formats a message as HTML text. */ private String formatMessage(String message) { StringBuffer buffer= new StringBuffer(); HTMLPrinter.addPageProlog(buffer); HTMLPrinter.addParagraph(buffer, HTMLPrinter.convertToHTMLContent(message)); HTMLPrinter.addPageEpilog(buffer); return buffer.toString(); } /* * @see ITextHover#getHoverInfo(ITextViewer, IRegion) */ public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) { if (getEditor() == null) return null; IDocumentProvider provider= PHPeclipsePlugin.getDefault().getCompilationUnitDocumentProvider(); IAnnotationModel model= provider.getAnnotationModel(getEditor().getEditorInput()); if (model != null) { Iterator e= new JavaAnnotationIterator(model, true); int layer= -1; String message= null; while (e.hasNext()) { Annotation a= (Annotation) e.next(); AnnotationPreference preference= getAnnotationPreference(a); if (preference == null || !(fStore.getBoolean(preference.getTextPreferenceKey()) || (preference.getHighlightPreferenceKey() != null && fStore.getBoolean(preference.getHighlightPreferenceKey())))) continue; Position p= model.getPosition(a); int l= fAnnotationAccess.getLayer(a); if (l > layer && p != null && p.overlapsWith(hoverRegion.getOffset(), hoverRegion.getLength())) { String msg= a.getText(); if (msg != null && msg.trim().length() > 0) { message= msg; layer= l; } } } if (layer > -1) return formatMessage(message); } return null; } /* * @see IJavaEditorTextHover#setEditor(IEditorPart) */ public void setEditor(IEditorPart editor) { if (editor instanceof PHPUnitEditor) super.setEditor(editor); else super.setEditor(null); } /** * Returns the annotation preference for the given annotation. * * @param annotation the annotation * @return the annotation preference or <code>null</code> if none */ private AnnotationPreference getAnnotationPreference(Annotation annotation) { if (annotation.isMarkedDeleted()) return null; return EditorsUI.getAnnotationPreferenceLookup().getAnnotationPreference(annotation); } static boolean isJavaProblemHover(String id) { return PreferenceConstants.ID_PROBLEM_HOVER.equals(id); } } --- NEW FILE: JavaTypeHover.java --- /******************************************************************************* * Copyright (c) 2000, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Common Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/cpl-v10.html * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ package net.sourceforge.phpdt.internal.ui.text.java.hover; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextViewer; import org.eclipse.ui.IEditorPart; import net.sourceforge.phpdt.ui.text.java.hover.IJavaEditorTextHover; public class JavaTypeHover implements IJavaEditorTextHover { private IJavaEditorTextHover fAnnotationHover; //private IJavaEditorTextHover fJavadocHover; public JavaTypeHover() { fAnnotationHover= new AnnotationHover(); // fJavadocHover= new JavadocHover(); } /** * @see IJavaEditorTextHover#setEditor(IEditorPart) */ public void setEditor(IEditorPart editor) { fAnnotationHover.setEditor(editor); // fJavadocHover.setEditor(editor); } /* * @see ITextHover#getHoverRegion(ITextViewer, int) */ public IRegion getHoverRegion(ITextViewer textViewer, int offset) { //return fJavadocHover.getHoverRegion(textViewer, offset); return null; } /* * @see ITextHover#getHoverInfo(ITextViewer, IRegion) */ public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) { String hoverInfo= fAnnotationHover.getHoverInfo(textViewer, hoverRegion); if (hoverInfo != null) return hoverInfo; //return fJavadocHover.getHoverInfo(textViewer, hoverRegion); return null; } } Index: BestMatchHover.java =================================================================== RCS file: /cvsroot/phpeclipse/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/hover/BestMatchHover.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BestMatchHover.java 22 Dec 2003 14:12:32 -0000 1.1 --- BestMatchHover.java 24 Feb 2004 20:42:31 -0000 1.2 *************** *** 11,18 **** package net.sourceforge.phpdt.internal.ui.text.java.hover; - import java.util.ArrayList; - import java.util.Collections; - import java.util.Comparator; import java.util.Iterator; import java.util.List; --- 11,15 ---- *************** *** 22,73 **** import net.sourceforge.phpeclipse.PHPeclipsePlugin; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextHover; import org.eclipse.jface.text.ITextViewer; import org.eclipse.ui.IEditorPart; /** * Caution: this implementation is a layer breaker and contains some "shortcuts" */ ! public class BestMatchHover extends AbstractJavaEditorTextHover { ! ! private static class JavaEditorTextHoverDescriptorComparator implements Comparator { ! ! /* ! * @see Comparator#compare(Object, Object) ! */ ! public int compare(Object object0, Object object1) { ! ! JavaEditorTextHoverDescriptor element0= (JavaEditorTextHoverDescriptor)object0; ! JavaEditorTextHoverDescriptor element1= (JavaEditorTextHoverDescriptor)object1; ! ! String id0= element0.getId(); ! String id1= element1.getId(); ! ! if (id0 != null && id0.equals(id1)) ! return 0; ! ! if (id0 != null && JavaProblemHover.isJavaProblemHover(id0)) ! return -1; ! ! if (id1 != null && JavaProblemHover.isJavaProblemHover(id1)) ! return +1; ! ! ! // now compare non-problem hovers ! if (element0.dependsOn(element1)) ! return -1; ! ! if (element1.dependsOn(element0)) ! return +1; ! ! return 0; ! } ! } ! ! protected String fCurrentPerspectiveId; ! protected List fTextHoverSpecifications; ! protected List fInstantiatedTextHovers; public BestMatchHover() { --- 19,39 ---- import net.sourceforge.phpeclipse.PHPeclipsePlugin; + import org.eclipse.jface.text.IInformationControlCreator; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextHover; + import org.eclipse.jface.text.ITextHoverExtension; import org.eclipse.jface.text.ITextViewer; + import org.eclipse.jface.text.information.IInformationProviderExtension2; import org.eclipse.ui.IEditorPart; + /** * Caution: this implementation is a layer breaker and contains some "shortcuts" */ ! public class BestMatchHover extends AbstractJavaEditorTextHover implements ITextHoverExtension, IInformationProviderExtension2 { + private List fTextHoverSpecifications; + private List fInstantiatedTextHovers; + private ITextHover fBestHover; public BestMatchHover() { *************** *** 96,100 **** fTextHoverSpecifications.add(hoverDescs[i]); } - Collections.sort(fTextHoverSpecifications, new JavaEditorTextHoverDescriptorComparator()); } --- 62,65 ---- *************** *** 126,129 **** --- 91,95 ---- checkTextHovers(); + fBestHover= null; if (fInstantiatedTextHovers == null) *************** *** 131,142 **** for (Iterator iterator= fInstantiatedTextHovers.iterator(); iterator.hasNext(); ) { ! ITextHover hover= (ITextHover) iterator.next(); String s= hover.getHoverInfo(textViewer, hoverRegion); ! if (s != null && s.trim().length() > 0) return s; } return null; } } --- 97,132 ---- for (Iterator iterator= fInstantiatedTextHovers.iterator(); iterator.hasNext(); ) { ! ITextHover hover= (ITextHover)iterator.next(); String s= hover.getHoverInfo(textViewer, hoverRegion); ! if (s != null && s.trim().length() > 0) { ! fBestHover= hover; return s; + } } return null; } + + /* + * @see org.eclipse.jface.text.ITextHoverExtension#getInformationControlCreator() + * @since 3.0 + */ + public IInformationControlCreator getInformationControlCreator() { + if (fBestHover instanceof ITextHoverExtension) + return ((ITextHoverExtension)fBestHover).getInformationControlCreator(); + + return null; + } + + /* + * @see org.eclipse.jface.text.information.IInformationProviderExtension2#getInformationPresenterControlCreator() + * @since 3.0 + */ + public IInformationControlCreator getInformationPresenterControlCreator() { + if (fBestHover instanceof IInformationProviderExtension2) + return ((IInformationProviderExtension2)fBestHover).getInformationPresenterControlCreator(); + + return null; + } } --- JavaProblemHover.java DELETED --- |