X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaSelectMarkerRulerAction2.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaSelectMarkerRulerAction2.java index 1de298b..78e6932 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaSelectMarkerRulerAction2.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaSelectMarkerRulerAction2.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials + * All rights reserved. This program and the accompanying materials * are made available under the terms of the Common Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/cpl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -20,7 +20,7 @@ import org.eclipse.jface.text.source.Annotation; import org.eclipse.jface.text.source.IAnnotationModel; import org.eclipse.jface.text.source.VerticalRulerEvent; import org.eclipse.ui.ISelectionListener; -import org.eclipse.ui.help.WorkbenchHelp; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.ITextEditorActionConstants; import org.eclipse.ui.texteditor.IUpdate; @@ -38,28 +38,28 @@ public class JavaSelectMarkerRulerAction2 extends SelectAnnotationRulerAction { public JavaSelectMarkerRulerAction2(ResourceBundle bundle, String prefix, ITextEditor editor) { super(bundle, prefix, editor); - WorkbenchHelp.setHelp(this, IJavaHelpContextIds.JAVA_SELECT_MARKER_RULER_ACTION); + PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IJavaHelpContextIds.JAVA_SELECT_MARKER_RULER_ACTION); } - + /* * @see org.eclipse.ui.texteditor.IVerticalRulerListener#annotationDefaultSelected(org.eclipse.ui.texteditor.VerticalRulerEvent) */ public void annotationDefaultSelected(VerticalRulerEvent event) { Annotation annotation= event.getSelectedAnnotation(); IAnnotationModel model= getAnnotationModel(); - + // if (isOverrideIndicator(annotation)) { // ((OverrideIndicatorManager.OverrideIndicator)annotation).open(); // return; // } - + if (isBreakpoint(annotation)) triggerAction(ITextEditorActionConstants.RULER_DOUBLE_CLICK); - + Position position= model.getPosition(annotation); if (position == null) return; - + // if (isQuickFixTarget(annotation)) { // ITextOperationTarget operation= (ITextOperationTarget) getTextEditor().getAdapter(ITextOperationTarget.class); // final int opCode= PHPUnitEditor.CORRECTIONASSIST_PROPOSALS; @@ -69,7 +69,7 @@ public class JavaSelectMarkerRulerAction2 extends SelectAnnotationRulerAction { // return; // } // } - + // default: super.annotationDefaultSelected(event); } @@ -89,9 +89,9 @@ public class JavaSelectMarkerRulerAction2 extends SelectAnnotationRulerAction { * @return */ private boolean isBreakpoint(Annotation annotation) { - return annotation.getType().equals("org.eclipse.debug.core.breakpoint"); + return annotation.getType().equals("org.eclipse.debug.core.breakpoint"); //|| annotation.getType().equals(JavaExpandHover.NO_BREAKPOINT_ANNOTATION); //$NON-NLS-1$ - + } private boolean isQuickFixTarget(Annotation a) {