X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaSourceViewer.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaSourceViewer.java index d300642..030c7d5 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaSourceViewer.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaSourceViewer.java @@ -12,20 +12,17 @@ package net.sourceforge.phpeclipse.phpeditor; import java.util.ArrayList; -import java.util.Hashtable; -import java.util.Map; -import net.sourceforge.phpdt.core.JavaCore; import net.sourceforge.phpdt.internal.ui.text.SmartBackspaceManager; import net.sourceforge.phpdt.ui.PreferenceConstants; +import net.sourceforge.phpdt.ui.text.PHPSourceViewerConfiguration; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.jface.text.Assert; import org.eclipse.jface.text.ITextPresentationListener; -import org.eclipse.jface.text.formatter.FormattingContextProperties; -import org.eclipse.jface.text.formatter.IFormattingContext; import org.eclipse.jface.text.information.IInformationPresenter; +import org.eclipse.jface.text.reconciler.IReconciler; import org.eclipse.jface.text.source.IOverviewRuler; import org.eclipse.jface.text.source.IVerticalRuler; import org.eclipse.jface.text.source.SourceViewerConfiguration; @@ -43,8 +40,8 @@ import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants; public class JavaSourceViewer extends ProjectionViewer implements IPropertyChangeListener { - - /** + + /** * Text operation code for requesting the outline for the current input. */ public static final int SHOW_OUTLINE= 51; @@ -139,6 +136,13 @@ public class JavaSourceViewer extends ProjectionViewer implements IPropertyChang case SHOW_HIERARCHY: // fHierarchyPresenter.showInformation(); return; + case FORMAT: + Point point = getSelectedRange(); + if (point.y==0) { +// setSelectedRange(0, getDocument().getLength()); + revealRange(0, getDocument().getLength()); + } + break; } super.doOperation(operation); @@ -377,7 +381,7 @@ public class JavaSourceViewer extends ProjectionViewer implements IPropertyChang fBackspaceManager.uninstall(); fBackspaceManager= null; } - + super.handleDispose(); } @@ -400,4 +404,23 @@ public class JavaSourceViewer extends ProjectionViewer implements IPropertyChang fTextPresentationListeners.remove(listener); fTextPresentationListeners.add(0, listener); } + /** + * Sets the given reconciler. + * + * @param reconciler the reconciler + * @since 3.0 + */ + void setReconciler(IReconciler reconciler) { + fReconciler= reconciler; + } + + /** + * Returns the reconciler. + * + * @return the reconciler or null if not set + * @since 3.0 + */ + Object getReconciler() { + return fReconciler; + } }