diff -r 6552f6e77b1d editor.lib/src/org/netbeans/editor/Annotations.java
--- a/editor.lib/src/org/netbeans/editor/Annotations.java	Tue Mar 18 16:40:56 2008 +0100
+++ b/editor.lib/src/org/netbeans/editor/Annotations.java	Thu Mar 20 19:40:58 2008 +0100
@@ -61,9 +61,12 @@ import javax.swing.JMenuItem;
 import javax.swing.JMenuItem;
 import javax.swing.SwingUtilities;
 import org.netbeans.editor.ext.ExtKit;
+import org.openide.util.ContextAwareAction;
+import org.openide.util.Lookup;
 import org.openide.util.NbBundle;
 import org.openide.util.RequestProcessor;
 import org.openide.util.actions.Presenter;
+import org.openide.util.lookup.Lookups;
 
 /** Annotations class act as data model containing all annotations attached
  * to one document. Class uses instances of private class LineAnnotations for 
@@ -642,6 +645,14 @@ public class Annotations implements Docu
         }
     }
     
+    private Action getAction(AnnotationDesc anno, Action action) {
+        if (action instanceof ContextAwareAction && anno instanceof Lookup.Provider) {
+            Lookup lookup = ((Lookup.Provider) anno).getLookup();
+            action = ((ContextAwareAction) action).createContextAwareInstance(lookup);
+        }
+        return action;
+    }
+    
     /** Creates menu item for the given action. It must handle the BaseActions, which
      * have localized name stored not in Action.NAME property. */
     private JMenuItem createMenuItem(Action action, BaseKit kit) {
@@ -684,7 +695,7 @@ public class Annotations implements Docu
                 if (actions != null) {
                     subMenu = new JMenu(anno.getAnnotationTypeInstance().getDescription());
                     for (int j=0; j<actions.length; j++)
-                        subMenu.add(createMenuItem(actions[j], kit));
+                        subMenu.add(createMenuItem(getAction(anno, actions[j]), kit));
                     
                     if (subMenu.getItemCount() > 0) {
                         orderedSubMenus.add(subMenu);
@@ -703,7 +714,7 @@ public class Annotations implements Docu
                     if (actions != null) {
                         subMenu = new JMenu(pasiveAnnos[i].getAnnotationTypeInstance().getDescription());
                         for (int j=0; j<actions.length; j++)
-                            subMenu.add(createMenuItem(actions[j], kit));
+                            subMenu.add(createMenuItem(getAction(pasiveAnnos[i], actions[j]), kit));
                         if (separator) {
                             separator = false;
                             //pm.addSeparator();
@@ -1228,7 +1239,7 @@ public class Annotations implements Docu
      * annotations which are representd by this combined annotation. The only
      * added functionality is for tooltip text and annotation type.
      */
-    private static class AnnotationCombination extends AnnotationDesc {
+    private static class AnnotationCombination extends AnnotationDesc implements Lookup.Provider {
         
         /** Delegate annotaiton */
         private AnnotationDesc delegate;
@@ -1284,6 +1295,14 @@ public class Annotations implements Docu
         /** Get Mark which represent this annotation in document */
         /* package */ @Override Mark getMark() {
             return delegate.getMark();
+        }
+
+        public Lookup getLookup() {
+            if (delegate instanceof Lookup.Provider) {
+                return ((Lookup.Provider) delegate).getLookup();
+            } else {
+                return Lookups.fixed(new Object[0]);
+            }
         }
         
     }
diff -r 6552f6e77b1d editor/src/org/netbeans/modules/editor/NbEditorDocument.java
--- a/editor/src/org/netbeans/modules/editor/NbEditorDocument.java	Tue Mar 18 16:40:56 2008 +0100
+++ b/editor/src/org/netbeans/modules/editor/NbEditorDocument.java	Thu Mar 20 19:40:58 2008 +0100
@@ -49,6 +49,7 @@ import java.text.AttributedCharacterIter
 import java.text.AttributedCharacterIterator;
 import javax.swing.text.AttributeSet;
 import javax.swing.JEditorPane;
+import org.netbeans.editor.AnnotationType;
 import org.netbeans.editor.BaseKit;
 import org.netbeans.editor.GuardedDocument;
 import org.netbeans.editor.PrintContainer;
@@ -71,6 +72,8 @@ import javax.swing.text.BadLocationExcep
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 import org.netbeans.editor.AnnotationDesc;
+import org.openide.util.Lookup;
+import org.openide.util.lookup.Lookups;
 
 /**
 * BaseDocument extension managing the readonly blocks of text
@@ -297,7 +300,7 @@ NbDocument.Printable, NbDocument.CustomE
     /** Implementation of AnnotationDesc, which delegate to Annotation instance
      * defined in org.openide.text package.
      */
-    static class AnnotationDescDelegate extends AnnotationDesc {
+    static class AnnotationDescDelegate extends AnnotationDesc implements Lookup.Provider {
         
         private Annotation delegate;
         private PropertyChangeListener l;
@@ -328,7 +331,7 @@ NbDocument.Printable, NbDocument.CustomE
             };
             delegate.addPropertyChangeListener(l);
         }
-        
+
         public String getAnnotationType() {
             return delegate.getAnnotationType();
         }
@@ -352,9 +355,12 @@ NbDocument.Printable, NbDocument.CustomE
                 return 0;
             }
         }
-        
-    }
-    
+
+        public Lookup getLookup() {
+            return Lookups.singleton(delegate);
+        }
+        
+    }
     
     class NbPrintContainer extends AttributedCharacters implements PrintContainer {
 
diff -r 6552f6e77b1d editor/test/unit/src/org/netbeans/modules/editor/AnnotationsTest.java
--- a/editor/test/unit/src/org/netbeans/modules/editor/AnnotationsTest.java	Tue Mar 18 16:40:56 2008 +0100
+++ b/editor/test/unit/src/org/netbeans/modules/editor/AnnotationsTest.java	Thu Mar 20 19:40:58 2008 +0100
@@ -22,6 +22,7 @@ import org.openide.filesystems.FileObjec
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.Repository;
 import org.openide.text.Annotation;
+import org.openide.util.Lookup;
 
 /**
  * Test the annotations attached to the editor.
@@ -139,18 +140,10 @@ public class AnnotationsTest extends Bas
         if (lineAnnotations != null) {
             annotations = new ArrayList();
             Class[] inners = NbEditorDocument.class.getDeclaredClasses();
-            Field delegate = null;
-            for (int i = inners.length - 1; i >= 0; i--) {
-                Class cls = inners[i];
-                if (cls.getName().endsWith("AnnotationDescDelegate")) {
-                    delegate = cls.getDeclaredField("delegate");
-                    delegate.setAccessible(true);
-                }
-            }
             
             for (Iterator it = lineAnnotations.getAnnotations(); it.hasNext();) {
                 AnnotationDesc annoDesc = (AnnotationDesc)it.next();
-                Annotation anno = (Annotation)delegate.get(annoDesc);
+                Annotation anno = ((Lookup.Provider) annoDesc).getLookup().lookup(Annotation.class);
                 annotations.add(anno);
             }