diff --git a/org.eclipse.ui.editors/plugin.properties b/org.eclipse.ui.editors/plugin.properties
index 91ee570..b992381 100644
--- a/org.eclipse.ui.editors/plugin.properties
+++ b/org.eclipse.ui.editors/plugin.properties
@@ -18,11 +18,14 @@
 lastSaveReferenceProvider.label= Version on Disk
 
 
-problems.label= Problems
+errors.label= Errors
 warnings.label= Warnings
 infos.label= Infos
 tasks.label= Tasks
 bookmarks.label= Bookmarks
+changes.label= Diff Changes
+additions.label= Diff Additions
+deletions.label= Diff Deletions
 
 PreferencePages.TextEditor= Text Editor
 
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditor.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditor.java
index fe4f6c6..1f254e0 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditor.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditor.java
@@ -41,6 +41,7 @@
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
 import org.eclipse.ui.dialogs.SaveAsDialog;
 import org.eclipse.ui.ide.IDEActionFactory;
+import org.eclipse.ui.ide.IMarkerEditorPositioner;
 import org.eclipse.ui.part.FileEditorInput;
 import org.eclipse.ui.texteditor.AbstractMarkerAnnotationModel;
 import org.eclipse.ui.texteditor.AddMarkerAction;
@@ -73,6 +74,13 @@
  * </p>
  */
 public class TextEditor extends ExtendedTextEditor {
+	
+	private class MarkerEditorPositioner implements IMarkerEditorPositioner {
+		public void gotoPosition(IMarker marker) {
+			gotoMarker(marker);
+		}
+	}
+	
 	/** 
 	 * The encoding support for the editor.
 	 * @since 2.0
@@ -83,8 +91,16 @@
 	 * @since 2.1
 	 */
 	private MarkerAnnotationPreferences fAnnotationPreferences;
-	/** The editor's implicit document provider. */
+	/** 
+	 * The editor's implicit document provider.
+	 * @since 3.0
+	 */
 	private IDocumentProvider fImplicitDocumentProvider;
+	/** 
+	 * The editor's marker positioner.
+	 * @since 3.0 
+	 */
+	private Object fMarkerEditorPositioner= new MarkerEditorPositioner();
 	
 	
 	/**
@@ -395,6 +411,8 @@
 	public Object getAdapter(Class adapter) {
 		if (IEncodingSupport.class.equals(adapter))
 			return fEncodingSupport;
+		if (IMarkerEditorPositioner.class.equals(adapter))
+			return fMarkerEditorPositioner;
 		return super.getAdapter(adapter);
 	}
 	
@@ -415,10 +433,9 @@
 	 * must be determined as it might differ from the position stated in the marker.
 	 * 
 	 * @param marker the marker to go to
-	 * @see EditorPart#gotoMarker(org.eclipse.core.resources.IMarker)
 	 * @since 3.0
 	 */
-	public void gotoMarker(IMarker marker) {
+	protected void gotoMarker(IMarker marker) {
 		
 		if (getSourceViewer() == null)
 			return;
diff --git a/org.eclipse.ui.examples.javaeditor/.classpath b/org.eclipse.ui.examples.javaeditor/.classpath
index 844e6d4..e43e8fe 100644
--- a/org.eclipse.ui.examples.javaeditor/.classpath
+++ b/org.eclipse.ui.examples.javaeditor/.classpath
@@ -1,11 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="Eclipse Java Editor Example/"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+    <classpathentry kind="src" path="Eclipse Java Editor Example"/>
+    <classpathentry kind="src" path="/org.eclipse.ui"/>
+    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
+    <classpathentry kind="src" path="/org.eclipse.core.filebuffers"/>
+    <classpathentry kind="src" path="/org.eclipse.text"/>
+    <classpathentry kind="src" path="/org.eclipse.jface.text"/>
+    <classpathentry kind="src" path="/org.eclipse.ui.workbench.texteditor"/>
+    <classpathentry kind="src" path="/org.eclipse.ui.editors"/>
+    <classpathentry kind="src" path="/org.eclipse.ui.views"/>
     <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="src" path="/org.eclipse.core.filebuffers"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
+    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+    <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.eclipse.ui.examples.javaeditor/.project b/org.eclipse.ui.examples.javaeditor/.project
index 9b57fc8..7dd7c09 100644
--- a/org.eclipse.ui.examples.javaeditor/.project
+++ b/org.eclipse.ui.examples.javaeditor/.project
@@ -1,33 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ui.examples.javaeditor</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.filebuffers</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.ui</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.ui.examples.javaeditor</name>
+	<comment></comment>
+	<projects>
+		<project>org.eclipse.core.boot</project>
+		<project>org.eclipse.core.filebuffers</project>
+		<project>org.eclipse.core.resources</project>
+		<project>org.eclipse.core.runtime</project>
+		<project>org.eclipse.jface.text</project>
+		<project>org.eclipse.text</project>
+		<project>org.eclipse.ui</project>
+		<project>org.eclipse.ui.editors</project>
+		<project>org.eclipse.ui.views</project>
+		<project>org.eclipse.ui.workbench.texteditor</project>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaEditor.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaEditor.java
index 9c4f4d3..bc4b055 100644
--- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaEditor.java
+++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaEditor.java
@@ -140,7 +140,7 @@
 	protected void initializeEditor() {
 		super.initializeEditor();
 		setSourceViewerConfiguration(new JavaSourceViewerConfiguration());
-		setEditorContextMenuId("#JavaEditorContext"); //$NON-NLS-1$
-		setRulerContextMenuId("#JavaRulerContext"); //$NON-NLS-1$
+//		setEditorContextMenuId("#JavaEditorContext"); //$NON-NLS-1$
+//		setRulerContextMenuId("#JavaRulerContext"); //$NON-NLS-1$
 	}
 }
diff --git a/org.eclipse.ui.examples.javaeditor/plugin.xml b/org.eclipse.ui.examples.javaeditor/plugin.xml
index 3602bfd..ebde918 100644
--- a/org.eclipse.ui.examples.javaeditor/plugin.xml
+++ b/org.eclipse.ui.examples.javaeditor/plugin.xml
@@ -1,43 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-   id="org.eclipse.ui.examples.javaeditor"
-   name="%pluginName"
-   version="3.0.0"
-   provider-name="%providerName"
-   class="org.eclipse.ui.examples.javaeditor.JavaEditorExamplePlugin">
-
-   <runtime>
-      <library name="javaeditorexample.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.filebuffers"/>
-   </requires>
-
-
-   <extension
-         point="org.eclipse.ui.editors">
-      <editor
-            name="%javaEditorName"
-            icon="icons/obj16/java.gif"
-            extensions="%javaFileExtensions"
-            contributorClass="org.eclipse.ui.examples.javaeditor.JavaActionContributor"
-            class="org.eclipse.ui.examples.javaeditor.JavaEditor"
-            id="org.eclipse.ui.JavaEditor">
-      </editor>
-   </extension>
-
-   <extension
-         id="ExampleJavaDocumentSetupParticipant"
-         name="%documentSetupParticipantName"
-         point="org.eclipse.core.filebuffers.documentSetup">
-      <participant
-            extensions="%javaFileExtensions"
-            class="org.eclipse.ui.examples.javaeditor.JavaDocumentSetupParticipant">
-      </participant>
-   </extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin
+   id="org.eclipse.ui.examples.javaeditor"
+   name="%pluginName"
+   version="3.0.0"
+   provider-name="%providerName"
+   class="org.eclipse.ui.examples.javaeditor.JavaEditorExamplePlugin">
+
+   <runtime>
+      <library name="javaeditorexample.jar">
+         <export name="*"/>
+      </library>
+   </runtime>
+   <requires>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.core.filebuffers"/>
+      <import plugin="org.eclipse.text"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.editors"/>
+      <import plugin="org.eclipse.ui.views"/>
+     
+      
+   </requires>
+
+
+   <extension
+         point="org.eclipse.ui.editors">
+      <editor
+            name="%javaEditorName"
+            icon="icons/obj16/java.gif"
+            extensions="%javaFileExtensions"
+            contributorClass="org.eclipse.ui.examples.javaeditor.JavaActionContributor"
+            class="org.eclipse.ui.examples.javaeditor.JavaEditor"
+            id="org.eclipse.ui.JavaEditor">
+      </editor>
+   </extension>
+
+   <extension
+         id="ExampleJavaDocumentSetupParticipant"
+         name="%documentSetupParticipantName"
+         point="org.eclipse.core.filebuffers.documentSetup">
+      <participant
+            extensions="%javaFileExtensions"
+            class="org.eclipse.ui.examples.javaeditor.JavaDocumentSetupParticipant">
+      </participant>
+   </extension>
+
+</plugin>
diff --git a/org.eclipse.ui.workbench.texteditor/plugin.properties b/org.eclipse.ui.workbench.texteditor/plugin.properties
index 56b725a..efbc875 100644
--- a/org.eclipse.ui.workbench.texteditor/plugin.properties
+++ b/org.eclipse.ui.workbench.texteditor/plugin.properties
@@ -158,16 +158,6 @@
 context.text.name = Text Editing
 
 
-
-errors.label= Errors
-warnings.label= Warnings
-infos.label= Infos
-tasks.label= Tasks
-bookmarks.label= Bookmarks
-changes.label= Diff Changes
-additions.label= Diff Additions
-deletions.label= Diff Deletions
-
 goToPreviousAnnotation.label= Go to Previous Annotation
 goToPreviousAnnotation.tooltip= Go to Previous Annotation
 goToNextAnnotation.label= Go to Next Annotation