refactor[ats_ATS284247]: Remove redundant null checks

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

3 files changed, 12 insertions, 15 deletions

diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/jobs/CommitJobDialog.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/jobs/CommitJobDialog.java
index 4b2079df7f3..a37638bdfcb 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/jobs/CommitJobDialog.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/jobs/CommitJobDialog.java
@@ -147,7 +147,7 @@ class CommitJobDialog extends UIJob {
          if (columnIndex >= DUMMY_COLUMNS) {
             if (element instanceof Artifact) {
                Artifact artifact = (Artifact) element;
-               if (artifact != null && artifact.isDeleted() != true) {
+               if (!artifact.isDeleted()) {
                   CommitColumnEnum column = CommitColumnEnum.values()[columnIndex - DUMMY_COLUMNS];
                   switch (column) {
                      case Branch:
diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/actions/OpenAssociatedScript.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/actions/OpenAssociatedScript.java
index 0606bf0c28a..b486bd40305 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/actions/OpenAssociatedScript.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/actions/OpenAssociatedScript.java
@@ -11,7 +11,6 @@
 package org.eclipse.osee.ote.ui.define.viewers.actions;
 
 import java.net.URL;
-
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.StructuredViewer;
@@ -67,13 +66,12 @@ public class OpenAssociatedScript extends AbstractActionHandler {
    private void openRemoteScript(String scriptUrl, String revision) {
       try {
          URL urlToOpen = new URL(scriptUrl);
-         if (urlToOpen != null) {
-            IWorkbenchBrowserSupport browserSupport = PlatformUI.getWorkbench().getBrowserSupport();
-            IWebBrowser browser =
-               browserSupport.createBrowser(IWorkbenchBrowserSupport.AS_EDITOR, "org.eclipse.ui.browser.editor",
-                  scriptUrl, "");
-            browser.openURL(urlToOpen);
-         }
+
+         IWorkbenchBrowserSupport browserSupport = PlatformUI.getWorkbench().getBrowserSupport();
+         IWebBrowser browser = browserSupport.createBrowser(IWorkbenchBrowserSupport.AS_EDITOR,
+            "org.eclipse.ui.browser.editor", scriptUrl, "");
+         browser.openURL(urlToOpen);
+
       } catch (Exception ex) {
          handleException();
       }
diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/ScriptItem.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/ScriptItem.java
index 3634a56813d..36a9b30db5a 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/ScriptItem.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/ScriptItem.java
@@ -41,16 +41,14 @@ public class ScriptItem extends DataItem implements IXViewerItem {
 
    private void setScriptUrlAndRevision(String scriptUrl, String revision) {
       boolean wasThereAnError = false;
+
       try {
          URI url = new URI(scriptUrl);
-         if (url != null) {
-            this.scriptUrl = scriptUrl;
-         } else {
-            wasThereAnError = true;
-         }
+         this.scriptUrl = scriptUrl;
       } catch (Exception ex) {
          wasThereAnError = true;
       }
+
       try {
          if (Strings.isValid(revision)) {
             this.revision = revision;
@@ -85,7 +83,8 @@ public class ScriptItem extends DataItem implements IXViewerItem {
    public String getLabel(int index) {
       String toReturn = "";
       if (index == 0) {
-         if (scriptUrl.equals(DEFAULT_SCRIPT_NAME) != true && revision.equals(DEFAULT_REVISION) != true && isFullDescriptionModeEnabled() != false) {
+         if (scriptUrl.equals(DEFAULT_SCRIPT_NAME) != true && revision.equals(
+            DEFAULT_REVISION) != true && isFullDescriptionModeEnabled() != false) {
             toReturn = getFullLabel();
          } else {
             toReturn = getShortLabel();