Changeset 3859

Timestamp:

Jul 21, 2008, 7:27:20 PM (12 years ago)

Author:

yura

Message:

• RfpAction? -> RfpEditorActionDelegate?.
• Refactoring IndentAction?.

Location:

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/actions

Files:

• FormatAction.java (modified) (1 diff)
• IndentAction.java (modified) (5 diffs)
• OpenDeclarationAction.java (modified) (3 diffs)
• RfpEditorActionDelegate.java (moved) (moved from devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/actions/RfpAction.java) (3 diffs)

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/actions/FormatAction.java

@@ -5 +5 @@
 
 public class FormatAction extends IndentAction {
-        protected ITextSelection getSelection() {
-                ITextSelection selection = super.getSelection();
-                if (selection.getLength() == 0)
-                        selection = new TextSelection(0, getDocument().getLength());
-                return selection;
-        }
+    protected ITextSelection getSelection () {
+        ITextSelection selection = super.getSelection();
+        if (selection.getLength() == 0)
+            selection = new TextSelection(0, getDocument().getLength());
+        return selection;
+    }
 }

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/actions/IndentAction.java

@@ -1 +1 @@
 package org.refal.rfpdt.ui.actions;
 
-import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
@@ -8 +7 @@
 import org.eclipse.jface.text.ITextSelection;
 import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.texteditor.IDocumentProvider;
 import org.refal.rfpdt.editor.Document;
 import org.refal.rfpdt.editor.RfpAutoIndentStrategy;
-import org.refal.rfpdt.editor.RfpEditor;
 import org.refal.rfpdt.ui.RfpUI;
 
-public class IndentAction implements IEditorActionDelegate {
-
-    private RfpEditor editor;
-
-    public IndentAction () {}
-
-    public void run (IAction action) {
-        this.run();
-    }
-
+public class IndentAction extends RfpEditorActionDelegate {
     public void run () {
-
-        if (editor == null)
+        if (editor == null || !editor.validateEditorInputState())
             return;
-
-        if (!editor.validateEditorInputState())
-            return;
-
         ITextSelection selection = getSelection();
         final IDocument document = getDocument();
-
         if (document != null) {
-
             final int offset = selection.getOffset();
             final int length = selection.getLength();
             final Position end = new Position(offset + length);
             final int firstLine, nLines;
-
             try {
                 document.addPosition(end);
@@ -61 +35 @@
                 return;
             }
-
             Runnable runnable = new Runnable() {
                 public void run () {
@@ -97 +70 @@
                 }
             };
-
             if (nLines > 57) {
                 Display display = editor.getEditorSite().getWorkbenchWindow().getShell().getDisplay();
@@ -105 +77 @@
         }
     }
-
-    /**
-     * Returns the document currently displayed in the editor, or <code>null</code> if none can be obtained.
-     * 
-     * @return the current document or <code>null</code>
-     */
-    protected IDocument getDocument () {
-        if (editor != null) {
-
-            IDocumentProvider provider = editor.getDocumentProvider();
-            IEditorInput input = editor.getEditorInput();
-            if (provider != null && input != null)
-                return provider.getDocument(input);
-
-        }
-        return null;
-    }
-
-    /**
-     * Returns the editor's selection provider.
-     * 
-     * @return the editor's selection provider or <code>null</code>
-     */
-    protected ISelectionProvider getSelectionProvider () {
-        if (editor != null) {
-            return editor.getSelectionProvider();
-        }
-        return null;
-    }
-
-    /**
-     * Returns the selection on the editor or an invalid selection if none can be obtained. Returns never
-     * <code>null</code>.
-     * 
-     * @return the current selection, never <code>null</code>
-     */
-    protected ITextSelection getSelection () {
-        ISelectionProvider provider = getSelectionProvider();
-        if (provider != null) {
-
-            ISelection selection = provider.getSelection();
-            if (selection instanceof ITextSelection)
-                return (ITextSelection) selection;
-        }
-
-        // null object
-        return TextSelection.emptySelection();
-    }
-
-    public void setActiveEditor (IAction action, IEditorPart editor) {
-        if (editor instanceof RfpEditor)
-            this.editor = (RfpEditor) editor;
-        else
-            this.editor = null;
-    }
-
-    public void selectionChanged (IAction action, ISelection selection) {}
 }

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/actions/OpenDeclarationAction.java

@@ -3 +3 @@
 import java.util.List;
 
-import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.swt.custom.StyledText;
 import org.refal.rfpdt.ast.AstCall;
 import org.refal.rfpdt.ast.AstCut;
@@ -17 +15 @@
 import org.refal.rfpdt.editor.RfpEditorMessages;
 
-public class OpenDeclarationAction extends RfpAction {
+public class OpenDeclarationAction extends RfpEditorActionDelegate {
     public static final String OPEN_DECLARATION = "openDeclaration"; //$NON-NLS-1$
 
     public void run () {
+        if (editor == null)
+            return;
         ISourceViewer sourceViewer = editor.sourceViewer();
-        IDocument document = sourceViewer.getDocument();
-        if (document == null)
-            return;
-        StyledText text = sourceViewer.getTextWidget();
-        List<AstNode> nodeList = editor.getNodes(editor.widgetOffset2ModelOffset(text.getCaretOffset()));
+        List<AstNode> nodeList = editor.getNodes(getSelection().getOffset());
         if (nodeList == null) {
             editor.statusLineErrorMessage(RfpEditorMessages.OpenDeclaration_error_invalidSelection);
-            text.getDisplay().beep();
+            sourceViewer.getTextWidget().getDisplay().beep();
             return;
         }
@@ -35 +31 @@
         if (astNode == null) {
             editor.statusLineErrorMessage(RfpEditorMessages.OpenDeclaration_error_invalidSelection);
-            text.getDisplay().beep();
+            sourceViewer.getTextWidget().getDisplay().beep();
             return;
         }

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/actions/RfpEditorActionDelegate.java

@@ -13 +13 @@
 import org.refal.rfpdt.editor.RfpEditor;
 
-public abstract class RfpAction implements IEditorActionDelegate {
-    protected RfpEditor editor;
+public abstract class RfpEditorActionDelegate implements IEditorActionDelegate {
+    /** May be <code>null</code>! */
+    protected RfpEditor editor = null;
 
     public void run (IAction action) {
@@ -43 +44 @@
      */
     protected ISelectionProvider getSelectionProvider () {
-        if (editor != null) {
+        if (editor != null)
             return editor.getSelectionProvider();
-        }
         return null;
     }
@@ -58 +58 @@
         ISelectionProvider provider = getSelectionProvider();
         if (provider != null) {
-
             ISelection selection = provider.getSelection();
             if (selection instanceof ITextSelection)
                 return (ITextSelection) selection;
         }
-
-        // null object
         return TextSelection.emptySelection();
     }