Changeset 3862 for devel-tools

Timestamp:

Jul 23, 2008, 12:22:09 PM (12 years ago)

Author:

yura

Message:

• Refactoring

Location:

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

Files:

• IndentAction.java (modified) (2 diffs)
• OpenDeclarationAction.java (modified) (2 diffs)
• RetargettableActionAdapterFactory.java (modified) (1 diff)
• RfpEditorActionDelegate.java (modified) (4 diffs)

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

@@ -40 +40 @@
                     if (target != null)
                         target.beginCompoundChange();
-
                     try {
                         for (int line = firstLine; line < firstLine + nLines; line++) {
@@ -63 +62 @@
                         // will only happen on concurrent modification
                         RfpUI.log("ConcurrentModification in IndentAction", e); //$NON-NLS-1$
-
                     } finally {
                         if (target != null)

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

@@ -21 +21 @@
 
 public class OpenDeclarationAction extends RfpEditorActionDelegate {
-    public static final String OPEN_DECLARATION = "openDeclaration"; //$NON-NLS-1$
-
     public void run () {
         if (editor == null)
@@ -84 +82 @@
         return null;
     }
-
 }

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

@@ -11 +11 @@
  */
 public class RetargettableActionAdapterFactory implements IAdapterFactory {
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
-     */
     @SuppressWarnings("unchecked")
     public Object getAdapter (Object adaptableObject, Class adapterType) {
-        if (adapterType == IToggleBreakpointsTarget.class) {
+        if (adapterType == IToggleBreakpointsTarget.class)
             return new ToggleBreakpointAdapter();
-        }
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
-     */
     @SuppressWarnings("unchecked")
     public Class[] getAdapterList () {

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

@@ -18 +18 @@
 
     public void run (IAction action) {
-        this.run();
+        run();
     }
 
@@ -39 +39 @@
 
     /**
-     * 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>.
@@ -56 +45 @@
      */
     protected ITextSelection getSelection () {
-        ISelectionProvider provider = getSelectionProvider();
-        if (provider != null) {
-            ISelection selection = provider.getSelection();
-            if (selection instanceof ITextSelection)
-                return (ITextSelection) selection;
+        if (editor != null) {
+            ISelectionProvider provider = editor.getSelectionProvider();
+            if (provider != null) {
+                ISelection selection = provider.getSelection();
+                if (selection instanceof ITextSelection)
+                    return (ITextSelection) selection;
+            }
         }
         return TextSelection.emptySelection();
@@ -66 +57 @@
 
     public void setActiveEditor (IAction action, IEditorPart editor) {
-        if (editor instanceof RfpEditor)
-            this.editor = (RfpEditor) editor;
-        else
-            this.editor = null;
+        this.editor = editor instanceof RfpEditor ? (RfpEditor) editor : null;
     }