Fixed bug 340570: [rulers][api] Pull up #addVerticalRulerColumn andv20111018-0800

#removeVerticalRulerColumn from ProjectionViewer to SourceViewer

3 files changed, 30 insertions, 29 deletions

diff --git a/org.eclipse.jface.text/META-INF/MANIFEST.MF b/org.eclipse.jface.text/META-INF/MANIFEST.MF
index 4e268c86171..fcac8044396 100644
--- a/org.eclipse.jface.text/META-INF/MANIFEST.MF
+++ b/org.eclipse.jface.text/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jface.text
-Bundle-Version: 3.7.100.qualifier
+Bundle-Version: 3.8.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: 
diff --git a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionViewer.java b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionViewer.java
index 872f86155cc..0d509e1e0d5 100644
--- a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionViewer.java
+++ b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionViewer.java
@@ -51,14 +51,12 @@ import org.eclipse.jface.text.projection.ProjectionDocumentEvent;
 import org.eclipse.jface.text.projection.ProjectionDocumentManager;
 import org.eclipse.jface.text.source.Annotation;
 import org.eclipse.jface.text.source.AnnotationModelEvent;
-import org.eclipse.jface.text.source.CompositeRuler;
 import org.eclipse.jface.text.source.IAnnotationModel;
 import org.eclipse.jface.text.source.IAnnotationModelExtension;
 import org.eclipse.jface.text.source.IAnnotationModelListener;
 import org.eclipse.jface.text.source.IAnnotationModelListenerExtension;
 import org.eclipse.jface.text.source.IOverviewRuler;
 import org.eclipse.jface.text.source.IVerticalRuler;
-import org.eclipse.jface.text.source.IVerticalRulerColumn;
 import org.eclipse.jface.text.source.SourceViewer;
 
 
@@ -1278,32 +1276,6 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 			super.handleVerifyEvent(e);
 	}
 
-	/**
-	 * Adds the give column as last column to this viewer's vertical ruler.
-	 *
-	 * @param column the column to be added
-	 */
-	public void addVerticalRulerColumn(IVerticalRulerColumn column) {
-		IVerticalRuler ruler= getVerticalRuler();
-		if (ruler instanceof CompositeRuler) {
-			CompositeRuler compositeRuler= (CompositeRuler) ruler;
-			compositeRuler.addDecorator(99, column);
-		}
-	}
-
-	/**
-	 * Removes the give column from this viewer's vertical ruler.
-	 *
-	 * @param column the column to be removed
-	 */
-	public void removeVerticalRulerColumn(IVerticalRulerColumn column) {
-		IVerticalRuler ruler= getVerticalRuler();
-		if (ruler instanceof CompositeRuler) {
-			CompositeRuler compositeRuler= (CompositeRuler) ruler;
-			compositeRuler.removeDecorator(column);
-		}
-	}
-
 	/*
 	 * @see org.eclipse.jface.text.ITextViewerExtension5#exposeModelRange(org.eclipse.jface.text.IRegion)
 	 */
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java
index 88df57dedfa..c574a468c94 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java
@@ -1179,6 +1179,34 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
 		return fVerticalRuler;
 	}
 
+	/**
+	 * Adds the give column as last column to this viewer's vertical ruler.
+	 * 
+	 * @param column the column to be added
+	 * @since 3.8
+	 */
+	public void addVerticalRulerColumn(IVerticalRulerColumn column) {
+		IVerticalRuler ruler= getVerticalRuler();
+		if (ruler instanceof CompositeRuler) {
+			CompositeRuler compositeRuler= (CompositeRuler)ruler;
+			compositeRuler.addDecorator(99, column);
+		}
+	}
+
+	/**
+	 * Removes the give column from this viewer's vertical ruler.
+	 * 
+	 * @param column the column to be removed
+	 * @since 3.8
+	 */
+	public void removeVerticalRulerColumn(IVerticalRulerColumn column) {
+		IVerticalRuler ruler= getVerticalRuler();
+		if (ruler instanceof CompositeRuler) {
+			CompositeRuler compositeRuler= (CompositeRuler)ruler;
+			compositeRuler.removeDecorator(column);
+		}
+	}
+
 	/*
 	 * @see org.eclipse.jface.text.source.ISourceViewerExtension#showAnnotationsOverview(boolean)
 	 * @since 2.1
@@ -1207,4 +1235,5 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
     		return null;
     	return fVerticalRulerHoveringController.getCurrentAnnotationHover();
     }
+
 }