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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java
index e692e83..0ba1930 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java
@@ -48,7 +48,7 @@ import net.sourceforge.phpdt.internal.ui.text.JavaWordFinder;
 import net.sourceforge.phpdt.internal.ui.text.JavaWordIterator;
 import net.sourceforge.phpdt.internal.ui.text.PHPPairMatcher;
 import net.sourceforge.phpdt.internal.ui.text.PreferencesAdapter;
-import net.sourceforge.phpdt.internal.ui.text.java.JavaExpandHover;
+import net.sourceforge.phpdt.internal.ui.text.java.hover.JavaExpandHover;
 import net.sourceforge.phpdt.internal.ui.viewsupport.ISelectionListenerWithAST;
 import net.sourceforge.phpdt.internal.ui.viewsupport.IViewPartInputProvider;
 import net.sourceforge.phpdt.internal.ui.viewsupport.SelectionListenerWithASTManager;
@@ -118,6 +118,7 @@ import org.eclipse.jface.text.source.IOverviewRuler;
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.jface.text.source.ISourceViewerExtension2;
 import org.eclipse.jface.text.source.IVerticalRuler;
+import org.eclipse.jface.text.source.IVerticalRulerColumn;
 import org.eclipse.jface.text.source.OverviewRuler;
 import org.eclipse.jface.text.source.SourceViewerConfiguration;
 import org.eclipse.jface.text.source.projection.ProjectionSupport;
@@ -5394,12 +5395,53 @@ public abstract class PHPEditor extends AbstractDecoratedTextEditor implements I
 	/*
 	 * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#createCompositeRuler()
 	 */
-	protected CompositeRuler createCompositeRuler() {
+//	protected CompositeRuler createCompositeRuler() {
+//		if (!getPreferenceStore().getBoolean(PreferenceConstants.EDITOR_ANNOTATION_ROLL_OVER))
+//			return super.createCompositeRuler();
+//
+//		CompositeRuler ruler = new CompositeRuler();
+//		AnnotationRulerColumn column = new AnnotationRulerColumn(VERTICAL_RULER_WIDTH, getAnnotationAccess());
+//		column.setHover(new JavaExpandHover(ruler, getAnnotationAccess(), new IDoubleClickListener() {
+//
+//			public void doubleClick(DoubleClickEvent event) {
+//				// for now: just invoke ruler double click action
+//				triggerAction(ITextEditorActionConstants.RULER_DOUBLE_CLICK);
+//			}
+//
+//			private void triggerAction(String actionID) {
+//				IAction action = getAction(actionID);
+//				if (action != null) {
+//					if (action instanceof IUpdate)
+//						((IUpdate) action).update();
+//					// hack to propagate line change
+//					if (action instanceof ISelectionListener) {
+//						((ISelectionListener) action).selectionChanged(null, null);
+//					}
+//					if (action.isEnabled())
+//						action.run();
+//				}
+//			}
+//
+//		}));
+//		ruler.addDecorator(0, column);
+//
+//		if (isLineNumberRulerVisible())
+//			ruler.addDecorator(1, createLineNumberRulerColumn());
+//		else if (isPrefQuickDiffAlwaysOn())
+//			ruler.addDecorator(1, createChangeRulerColumn());
+//
+//		return ruler;
+//	}
+
+	/*
+	 * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#createAnnotationRulerColumn(org.eclipse.jface.text.source.CompositeRuler)
+	 * @since 3.2
+	 */
+	protected IVerticalRulerColumn createAnnotationRulerColumn(CompositeRuler ruler) {
 		if (!getPreferenceStore().getBoolean(PreferenceConstants.EDITOR_ANNOTATION_ROLL_OVER))
-			return super.createCompositeRuler();
+			return super.createAnnotationRulerColumn(ruler);
 
-		CompositeRuler ruler = new CompositeRuler();
-		AnnotationRulerColumn column = new AnnotationRulerColumn(VERTICAL_RULER_WIDTH, getAnnotationAccess());
+		AnnotationRulerColumn column= new AnnotationRulerColumn(VERTICAL_RULER_WIDTH, getAnnotationAccess());
 		column.setHover(new JavaExpandHover(ruler, getAnnotationAccess(), new IDoubleClickListener() {
 
 			public void doubleClick(DoubleClickEvent event) {
@@ -5408,13 +5450,13 @@ public abstract class PHPEditor extends AbstractDecoratedTextEditor implements I
 			}
 
 			private void triggerAction(String actionID) {
-				IAction action = getAction(actionID);
+				IAction action= getAction(actionID);
 				if (action != null) {
 					if (action instanceof IUpdate)
 						((IUpdate) action).update();
 					// hack to propagate line change
 					if (action instanceof ISelectionListener) {
-						((ISelectionListener) action).selectionChanged(null, null);
+						((ISelectionListener)action).selectionChanged(null, null);
 					}
 					if (action.isEnabled())
 						action.run();
@@ -5422,16 +5464,9 @@ public abstract class PHPEditor extends AbstractDecoratedTextEditor implements I
 			}
 
 		}));
-		ruler.addDecorator(0, column);
-
-		if (isLineNumberRulerVisible())
-			ruler.addDecorator(1, createLineNumberRulerColumn());
-		else if (isPrefQuickDiffAlwaysOn())
-			ruler.addDecorator(1, createChangeRulerColumn());
-
-		return ruler;
+		
+		return column;
 	}
-
 	/**
 	 * Returns the folding action group, or <code>null</code> if there is none.
 	 *