Consistently use EclipseUtils.getAdapter()

Signed-off-by: Andrey Loskutov <loskutov@gmx.de>

Author: iloveeclipse

AnyEditTools/src/de/loskutov/anyedit/actions/AbstractOpenAction.java

@@ -23,6 +23,7 @@
 
 import de.loskutov.anyedit.ui.editor.AbstractEditor;
 import de.loskutov.anyedit.ui.editor.EditorPropertyTester;
+import de.loskutov.anyedit.util.EclipseUtils;
 
 /**
  * @author Andrey
@@ -53,7 +54,7 @@ public void run(IAction action) {
                 doPageBookViewAction((PageBookView) vp);
                 return;
             }
-            TextViewer viewer = (TextViewer)vp.getAdapter(TextViewer.class);
+            TextViewer viewer = EclipseUtils.getAdapter(vp, TextViewer.class);
             if(viewer != null) {
                 runWithViewer(viewer);
             }

AnyEditTools/src/de/loskutov/anyedit/actions/ConvertAllInFolderAction.java

@@ -17,8 +17,8 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialogWithToggle;
@@ -31,6 +31,7 @@
 import de.loskutov.anyedit.AnyEditToolsPlugin;
 import de.loskutov.anyedit.IAnyEditConstants;
 import de.loskutov.anyedit.Messages;
+import de.loskutov.anyedit.util.EclipseUtils;
 
 public class ConvertAllInFolderAction extends ConvertAllAction {
 
@@ -60,16 +61,14 @@ protected boolean getEnablement() {
         return !selectedResources.isEmpty();
     }
 
+    @Nullable
     protected IResource getResource(Object selection) {
         if(selection instanceof IContainer || selection instanceof IFile) {
             return (IResource)selection;
         }
-        if(selection instanceof IAdaptable) {
-            IAdaptable adaptable= (IAdaptable) selection;
-            Object adapter = adaptable.getAdapter(IResource.class);
-            if(adapter instanceof IContainer || adapter instanceof IFile){
-                return (IResource) adapter;
-            }
+        IResource resource = EclipseUtils.getResource(selection);
+        if(resource instanceof IContainer || resource instanceof IFile){
+            return resource;
         }
         return null;
     }

AnyEditTools/src/de/loskutov/anyedit/actions/CountAllInFolderAction.java

@@ -20,7 +20,6 @@
 import org.eclipse.core.resources.IResourceVisitor;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -32,6 +31,7 @@
 
 import de.loskutov.anyedit.AnyEditToolsPlugin;
 import de.loskutov.anyedit.Messages;
+import de.loskutov.anyedit.util.EclipseUtils;
 
 public class CountAllInFolderAction extends ConvertAllInFolderAction implements IHandler {
 
@@ -40,16 +40,13 @@ protected IResource getResource(Object selection) {
         if(selection instanceof IContainer) {
             return (IResource)selection;
         }
-        if(selection instanceof IAdaptable) {
-            IAdaptable adaptable= (IAdaptable) selection;
-            Object adapter = adaptable.getAdapter(IResource.class);
+        if(selection != null) {
+            IResource adapter = EclipseUtils.getResource(selection);
             if(adapter instanceof IContainer){
-                return (IResource) adapter;
-            }
-            adapter = adaptable.getAdapter(IProject.class);
-            if(adapter instanceof IProject){
-                return (IResource) adapter;
+                return adapter;
             }
+            adapter = EclipseUtils.getAdapter(selection, IProject.class);
+            return adapter;
         }
         return null;
     }

AnyEditTools/src/de/loskutov/anyedit/compare/AnyeditCompareInput.java

@@ -32,6 +32,7 @@
 import org.eclipse.ui.progress.UIJob;
 
 import de.loskutov.anyedit.AnyEditToolsPlugin;
+import de.loskutov.anyedit.util.EclipseUtils;
 
 /**
  * @author Andrey
@@ -82,11 +83,11 @@ public AnyeditCompareInput(StreamContent left, StreamContent right) {
     @Override
     public Object getAdapter(Class adapter) {
         if(IFile.class == adapter) {
-            Object object = left.getAdapter(adapter);
+            Object object = EclipseUtils.getIFile(left, false);
             if(object != null) {
                 return object;
             }
-            return right.getAdapter(adapter);
+            return EclipseUtils.getIFile(right, false);
         }
         return super.getAdapter(adapter);
     }

AnyEditTools/src/de/loskutov/anyedit/jdt/JdtUtils.java

@@ -33,6 +33,7 @@
 
 import de.loskutov.anyedit.AnyEditToolsPlugin;
 import de.loskutov.anyedit.IAnyEditConstants;
+import de.loskutov.anyedit.util.EclipseUtils;
 
 /**
  * @author Andrey
@@ -191,7 +192,7 @@ private static int getJavaProjectTabWidth(int tabWidth, IProject project) {
      */
     public static IProject getProjectForClass(IEditorInput currentInput) {
         IProject project = null;
-        Object adapter = currentInput.getAdapter(IClassFile.class);
+        Object adapter = EclipseUtils.getAdapter(currentInput, IClassFile.class);
         if (adapter instanceof IClassFile) {
             IClassFile classFile = (IClassFile) adapter;
             IJavaProject javaProject = classFile.getJavaProject();

AnyEditTools/src/de/loskutov/anyedit/ui/editor/EditorPropertyTester.java

@@ -12,15 +12,11 @@
 
 import org.eclipse.core.expressions.PropertyTester;
 import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.TextViewer;
-import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.console.TextConsolePage;
 import org.eclipse.ui.part.IPage;
 import org.eclipse.ui.part.MessagePage;
-import org.eclipse.ui.part.PageBookView;
 
 import de.loskutov.anyedit.AnyEditToolsPlugin;
 import de.loskutov.anyedit.IAnyEditConstants;
@@ -65,26 +61,9 @@ private static boolean hasModifiableDocument(IWorkbenchPart part, Object[] args,
 
     private static boolean hasDocument(IWorkbenchPart part, Object[] args, Object expectedValue) {
         if(part instanceof IEditorPart){
-            AbstractEditor ae = new AbstractEditor((IEditorPart) part);
+            AbstractEditor ae = new AbstractEditor(part);
             return ae.getDocument() != null;
         }
-        if(!(part instanceof IViewPart)){
-            return false;
-        }
-        IViewPart vp =(IViewPart) part;
-        if (vp instanceof PageBookView) {
-            IPage page = ((PageBookView) vp).getCurrentPage();
-            ITextViewer viewer = getViewer(page);
-            return viewer != null && viewer.getDocument() != null;
-        }
-        TextViewer viewer = (TextViewer) vp.getAdapter(TextViewer.class);
-        if(viewer != null){
-            return viewer.getDocument() != null;
-        }
-        ISelectionProvider sp = vp.getViewSite().getSelectionProvider();
-        if(sp instanceof ITextViewer){
-            return ((ITextViewer) sp).getDocument() != null;
-        }
         return false;
     }
 

AnyEditTools/src/de/loskutov/anyedit/ui/wizards/ImportPage.java

@@ -212,11 +212,11 @@ private void importSelectedSets() {
         }
     }
 
-    private void removeNonExistingChildren(IWorkingSet workingSet) {
+    private static void removeNonExistingChildren(IWorkingSet workingSet) {
         IAdaptable[] elements = workingSet.getElements();
-        List<IResource> existing = new ArrayList<IResource>();
+        List<IResource> existing = new ArrayList<>();
         for (int i = 0; i < elements.length; i++) {
-            IResource resource = (IResource) elements[i].getAdapter(IResource.class);
+            IResource resource =  EclipseUtils.getResource(elements[i]);
             if (resource != null && resource.exists()) {
                 existing.add(resource);
             }

AnyEditTools/src/de/loskutov/anyedit/util/EclipseUtils.java

@@ -115,16 +115,12 @@ public static IProject getProject(IEditorInput currentInput) {
         if (currentInput == null) {
             return null;
         }
-        IFile file = (IFile) currentInput.getAdapter(IFile.class);
-        if (file != null) {
-            return file.getProject();
+        IResource resource = getResource(currentInput);
+        if (resource != null) {
+            return resource.getProject();
         }
         IProject project = null;
-        if (currentInput instanceof IFileEditorInput) {
-            IFileEditorInput fileInput = (IFileEditorInput) currentInput;
-            IFile currentFile = fileInput.getFile();
-            project = currentFile.getProject();
-        } else if (hasJDT && isJavaInput(currentInput)) {
+        if (hasJDT && isJavaInput(currentInput)) {
             // it must be a class because java source *files* are IFileEditorInput's
             project = JdtUtils.getProjectForClass(currentInput);
         }