X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/IJavaAnnotation.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/IJavaAnnotation.java
index 1a07289..5634c76 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/IJavaAnnotation.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/IJavaAnnotation.java
@@ -15,6 +15,8 @@ import java.util.Iterator;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Display;
 
+import net.sourceforge.phpdt.core.ICompilationUnit;
+
 /**
  * Interface of annotations representing markers
  * and problems.
@@ -24,32 +26,25 @@ import org.eclipse.swt.widgets.Display;
  */
 public interface IJavaAnnotation {
 	
-	AnnotationType getAnnotationType();
-	
-	boolean isTemporary();
-	
-	String getMessage();
-	
-	String[] getArguments();
-	
-	int getId();
+	/**
+	 * @see org.eclipse.jface.text.source.Annotation#getType()
+	 */
+	String getType();
 	
+	/**
+	 * @see org.eclipse.jface.text.source.Annotation#isPersistent()
+	 */
+	boolean isPersistent();
 	
-	Image getImage(Display display);
+	/**
+	 * @see org.eclipse.jface.text.source.Annotation#isMarkedDeleted()
+	 */
+	boolean isMarkedDeleted();
 	
 	/**
-	 * Returns whether this annotation is relavant.
-	 * <p>
-	 * If the annotation is overlaid then it is not
-	 * relevant. After all overlays have been removed
-	 * the annotation might either become relevant again
-	 * or stay irrelevant.
-	 * </p>
-	 * 
-	 * @return <code>true</code> if relevant
-	 * @see #hasOverlay()
+	 * @see org.eclipse.jface.text.source.Annotation#getText() 
 	 */
-	boolean isRelevant();
+	String getText();
 	
 	/**
 	 * Returns whether this annotation is overlaid.
@@ -59,6 +54,14 @@ public interface IJavaAnnotation {
 	boolean hasOverlay();
 	
 	/**
+	 * Returns the overlay of this annotation.
+	 * 
+	 * @return the annotation's overlay
+	 * @since 3.0
+	 */
+	IJavaAnnotation getOverlay();
+	
+	/**
 	 * Returns an iterator for iterating over the
  	 * annotation which are overlaid by this annotation.
 	 * 
@@ -89,4 +92,16 @@ public interface IJavaAnnotation {
 	 * @return <code>true</code> if it is a problem annotation
 	 */
 	boolean isProblem();
-}
\ No newline at end of file
+	
+	/**
+	 * Returns the compilation unit corresponding to the document on which the annotation is set
+	 * or <code>null</code> if no corresponding co0mpilationunit exists.
+	 */
+	ICompilationUnit getCompilationUnit();
+	
+	String[] getArguments();
+	
+	int getId();
+	
+	Image getImage(Display display);
+}