refactor[ats_ATS284247]: Remove redundant null checks

Signed-off-by: Morgan E. Cook <Morgan.e.cook@boeing.com>
Change-Id: Ic0b70768a7da7cece5a8a0b4c5746654add26193

2 files changed, 72 insertions, 78 deletions

diff --git a/plugins/org.eclipse.osee.ote.ui.markers/src/org/eclipse/osee/ote/ui/markers/ClearOteMarkerAction.java b/plugins/org.eclipse.osee.ote.ui.markers/src/org/eclipse/osee/ote/ui/markers/ClearOteMarkerAction.java
index 44f290e4001..0d0f3ea0ac7 100644
--- a/plugins/org.eclipse.osee.ote.ui.markers/src/org/eclipse/osee/ote/ui/markers/ClearOteMarkerAction.java
+++ b/plugins/org.eclipse.osee.ote.ui.markers/src/org/eclipse/osee/ote/ui/markers/ClearOteMarkerAction.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.ote.ui.markers;
 
 import java.util.ArrayList;
 import java.util.Iterator;
-
 import org.eclipse.core.resources.IResource;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
@@ -20,47 +19,45 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.ui.IEditorActionDelegate;
 import org.eclipse.ui.IEditorPart;
 
-public class ClearOteMarkerAction implements IEditorActionDelegate{
-
-	ArrayList<IResource> selections;
-	private IEditorPart editor;
-	
-	public ClearOteMarkerAction()  {
-		selections = new ArrayList<>();
-	}
-
-	@Override
-	public void run(IAction action) {
-		for(IResource resource:selections){
-			MarkerPlugin.findAndRemoveOteMarkers(resource);
-		}
-	}
-
-	@Override
-	public void selectionChanged(IAction action, ISelection selection) {
-		selections.clear();
-		if(selection instanceof StructuredSelection){
-			Iterator<?> i = ((StructuredSelection)selection).iterator();
-			while (i.hasNext()) {
-				Object obj = i.next();
-				if (obj instanceof IResource) {
-					IResource resource = (IResource) obj;
-					if (resource != null) {
-						selections.add(resource);
-					}
-				} 
-			}
-		} else {
-			Object obj = editor.getEditorInput().getAdapter(IResource.class);
-			if(obj != null){
-				selections.add((IResource)obj);
-			}
-		}
-	}
-
-	@Override
-	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
-		this.editor = targetEditor;
-	}
+public class ClearOteMarkerAction implements IEditorActionDelegate {
+
+   ArrayList<IResource> selections;
+   private IEditorPart editor;
+
+   public ClearOteMarkerAction() {
+      selections = new ArrayList<>();
+   }
+
+   @Override
+   public void run(IAction action) {
+      for (IResource resource : selections) {
+         MarkerPlugin.findAndRemoveOteMarkers(resource);
+      }
+   }
+
+   @Override
+   public void selectionChanged(IAction action, ISelection selection) {
+      selections.clear();
+      if (selection instanceof StructuredSelection) {
+         Iterator<?> i = ((StructuredSelection) selection).iterator();
+         while (i.hasNext()) {
+            Object obj = i.next();
+            if (obj instanceof IResource) {
+               IResource resource = (IResource) obj;
+               selections.add(resource);
+            }
+         }
+      } else {
+         Object obj = editor.getEditorInput().getAdapter(IResource.class);
+         if (obj != null) {
+            selections.add((IResource) obj);
+         }
+      }
+   }
+
+   @Override
+   public void setActiveEditor(IAction action, IEditorPart targetEditor) {
+      this.editor = targetEditor;
+   }
 
 }
diff --git a/plugins/org.eclipse.osee.ote.ui.markers/src/org/eclipse/osee/ote/ui/markers/ClearOteMarkerActionView.java b/plugins/org.eclipse.osee.ote.ui.markers/src/org/eclipse/osee/ote/ui/markers/ClearOteMarkerActionView.java
index 09b61d02f8c..e0554a8f61f 100644
--- a/plugins/org.eclipse.osee.ote.ui.markers/src/org/eclipse/osee/ote/ui/markers/ClearOteMarkerActionView.java
+++ b/plugins/org.eclipse.osee.ote.ui.markers/src/org/eclipse/osee/ote/ui/markers/ClearOteMarkerActionView.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.ote.ui.markers;
 
 import java.util.ArrayList;
 import java.util.Iterator;
-
 import org.eclipse.core.resources.IResource;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
@@ -22,38 +21,36 @@ import org.eclipse.ui.IViewPart;
 
 public class ClearOteMarkerActionView implements IViewActionDelegate {
 
-	ArrayList<IResource> selections;
-	
-	public ClearOteMarkerActionView()  {
-		selections = new ArrayList<>();
-	}
-
-	@Override
-	public void run(IAction action) {
-		for(IResource resource:selections){
-			MarkerPlugin.findAndRemoveOteMarkers(resource);
-		}
-	}
-
-	@Override
-	public void selectionChanged(IAction action, ISelection selection) {
-		selections.clear();
-		if(selection instanceof StructuredSelection){
-			Iterator<?> i = ((StructuredSelection)selection).iterator();
-			while (i.hasNext()) {
-				Object obj = i.next();
-				if (obj instanceof IResource) {
-					IResource resource = (IResource) obj;
-					if (resource != null) {
-						selections.add(resource);
-					}
-				} 
-			}
-		} 
-	}
-
-	@Override
-	public void init(IViewPart view) {
-
-	}
+   ArrayList<IResource> selections;
+
+   public ClearOteMarkerActionView() {
+      selections = new ArrayList<>();
+   }
+
+   @Override
+   public void run(IAction action) {
+      for (IResource resource : selections) {
+         MarkerPlugin.findAndRemoveOteMarkers(resource);
+      }
+   }
+
+   @Override
+   public void selectionChanged(IAction action, ISelection selection) {
+      selections.clear();
+      if (selection instanceof StructuredSelection) {
+         Iterator<?> i = ((StructuredSelection) selection).iterator();
+         while (i.hasNext()) {
+            Object obj = i.next();
+            if (obj instanceof IResource) {
+               IResource resource = (IResource) obj;
+               selections.add(resource);
+            }
+         }
+      }
+   }
+
+   @Override
+   public void init(IViewPart view) {
+
+   }
 }