Bug 461762 - [cleanup] clean up org.eclipse.ui.ide and update to Java

1.7 - part 2

Fixed all "Statement unnecessarily nested within else clause. The
corresponding then clause does not complete normally" warnings.

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

11 files changed, 79 insertions, 102 deletions

diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchPlugin.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchPlugin.java
index c63b017ea99..1aa52dce081 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchPlugin.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchPlugin.java
@@ -125,26 +125,23 @@ public class IDEWorkbenchPlugin extends AbstractUIPlugin {
 		Bundle plugin = Platform.getBundle(element.getNamespace());
 		if (plugin.getState() == Bundle.ACTIVE) {
 			return element.createExecutableExtension(classAttribute);
-		} else {
-            final Object[] ret = new Object[1];
-            final CoreException[] exc = new CoreException[1];
-            BusyIndicator.showWhile(null, new Runnable() {
-                @Override
-				public void run() {
-                    try {
-                        ret[0] = element
-                                .createExecutableExtension(classAttribute);
-                    } catch (CoreException e) {
-                        exc[0] = e;
-                    }
-                }
-            });
-            if (exc[0] != null) {
-				throw exc[0];
-			} else {
-				return ret[0];
+		}
+		final Object[] ret = new Object[1];
+		final CoreException[] exc = new CoreException[1];
+		BusyIndicator.showWhile(null, new Runnable() {
+			@Override
+			public void run() {
+				try {
+					ret[0] = element.createExecutableExtension(classAttribute);
+				} catch (CoreException e) {
+					exc[0] = e;
+				}
 			}
-        }
+		});
+		if (exc[0] != null) {
+			throw exc[0];
+		}
+		return ret[0];
     }
 
     /* Return the default instance of the receiver. This represents the runtime plugin.
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/StringMatcher.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/StringMatcher.java
index 6a7bbf8f9c8..9dd94ca1389 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/StringMatcher.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/StringMatcher.java
@@ -218,10 +218,9 @@ public class StringMatcher {
         if (!fHasLeadingStar) {
             if (!regExpRegionMatches(text, start, current, 0, segLength)) {
                 return false;
-            } else {
-                ++i;
-                tCurPos = tCurPos + segLength;
             }
+			++i;
+			tCurPos = tCurPos + segLength;
         }
         if ((fSegments.length == 1) && (!fHasLeadingStar)
                 && (!fHasTrailingStar)) {
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/WelcomeEditor.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/WelcomeEditor.java
index 47d0523130b..39eb8ce0fab 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/WelcomeEditor.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/WelcomeEditor.java
@@ -60,6 +60,7 @@ import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
@@ -145,16 +146,14 @@ public class WelcomeEditor extends EditorPart {
         int index = 0;
         if (text == null) {
 			return (StyledText) texts.get(0);
-		} else {
-			index = texts.indexOf(text);
 		}
+		index = texts.indexOf(text);
 
         //If we are not at the end....
         if (index < texts.size() - 1) {
 			return (StyledText) texts.get(index + 1);
-		} else {
-			return (StyledText) texts.get(0);
 		}
+		return (StyledText) texts.get(0);
     }
 
     /**
@@ -164,16 +163,14 @@ public class WelcomeEditor extends EditorPart {
         int index = 0;
         if (text == null) {
 			return (StyledText) texts.get(0);
-		} else {
-			index = texts.indexOf(text);
 		}
+		index = texts.indexOf(text);
 
         //If we are at the beginning....
         if (index == 0) {
 			return (StyledText) texts.get(texts.size() - 1);
-		} else {
-			return (StyledText) texts.get(index - 1);
 		}
+		return (StyledText) texts.get(index - 1);
     }
 
     /**
@@ -332,12 +329,11 @@ public class WelcomeEditor extends EditorPart {
                     if ((e.stateMask & SWT.CTRL) != 0) {
                         if (e.widget == lastText) {
 							return;
-						} else {
-                            e.doit = false;
-                            nextTabAbortTraversal = true;
-                            lastText.traverse(SWT.TRAVERSE_TAB_NEXT);
-                            return;
-                        }
+						}
+						e.doit = false;
+						nextTabAbortTraversal = true;
+						lastText.traverse(SWT.TRAVERSE_TAB_NEXT);
+						return;
                     }
                     if (nextTabAbortTraversal) {
                         nextTabAbortTraversal = false;
@@ -364,12 +360,11 @@ public class WelcomeEditor extends EditorPart {
                     if ((e.stateMask & SWT.CTRL) != 0) {
                         if (e.widget == firstText) {
 							return;
-						} else {
-                            e.doit = false;
-                            previousTabAbortTraversal = true;
-                            firstText.traverse(SWT.TRAVERSE_TAB_PREVIOUS);
-                            return;
-                        }
+						}
+						e.doit = false;
+						previousTabAbortTraversal = true;
+						firstText.traverse(SWT.TRAVERSE_TAB_PREVIOUS);
+						return;
                     }
                     if (previousTabAbortTraversal) {
                         previousTabAbortTraversal = false;
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/registry/MarkerImageProviderRegistry.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/registry/MarkerImageProviderRegistry.java
index 185923950eb..cf199f23467 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/registry/MarkerImageProviderRegistry.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/registry/MarkerImageProviderRegistry.java
@@ -136,15 +136,14 @@ public class MarkerImageProviderRegistry {
                                 return desc.imageDescriptor;
                             }
                             return desc.imageDescriptor;
-                        } else {
-                            if (desc.imageDescriptor == null) {
-                                //Create a image descriptor to be used until the plugin gets activated.
-                                desc.imagePath = (String) marker
-                                        .getAttribute(MARKER_ATT_KEY);
-                                desc.imageDescriptor = getImageDescriptor(desc);
-                            }
-                            return desc.imageDescriptor;
                         }
+						if (desc.imageDescriptor == null) {
+							// Create a image descriptor to be used until the
+							// plugin gets activated.
+							desc.imagePath = (String) marker.getAttribute(MARKER_ATT_KEY);
+							desc.imageDescriptor = getImageDescriptor(desc);
+						}
+						return desc.imageDescriptor;
                     } else if (desc.imageDescriptor != null) {
                         return desc.imageDescriptor;
                     }
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/bookmarkexplorer/BookmarkContentProvider.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/bookmarkexplorer/BookmarkContentProvider.java
index acd7f779426..d1a4c7c19cf 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/bookmarkexplorer/BookmarkContentProvider.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/bookmarkexplorer/BookmarkContentProvider.java
@@ -74,9 +74,8 @@ class BookmarkContentProvider implements IStructuredContentProvider,
         // of the existing bookmarks.  Otherwise, return an empty list.
         if (element instanceof IResource) {
 			return getBookmarks((IResource) element);
-		} else {
-			return new Object[0];
 		}
+		return new Object[0];
     }
 
     @Override
@@ -134,9 +133,8 @@ class BookmarkContentProvider implements IStructuredContentProvider,
     public boolean hasChildren(Object element) {
         if (element instanceof IWorkspace) {
 			return true;
-		} else {
-			return false;
 		}
+		return false;
     }
 
     @Override
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/framelist/TreeViewerFrameSource.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/framelist/TreeViewerFrameSource.java
index 580a805f6d3..cb70b120862 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/framelist/TreeViewerFrameSource.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/framelist/TreeViewerFrameSource.java
@@ -117,19 +117,18 @@ public class TreeViewerFrameSource implements IFrameSource {
         Object parent = provider.getParent(input);
         if (parent == null) {
             return null;
-        } else {
-            TreeFrame frame = createFrame(parent);
-            if ((flags & IFrameSource.FULL_CONTEXT) != 0) {
-                frame.setSelection(viewer.getSelection());
-                // include current input in expanded set
-                Object[] expanded = viewer.getExpandedElements();
-                Object[] newExpanded = new Object[expanded.length + 1];
-                System.arraycopy(expanded, 0, newExpanded, 0, expanded.length);
-                newExpanded[newExpanded.length - 1] = input;
-                frame.setExpandedElements(newExpanded);
-            }
-            return frame;
         }
+		TreeFrame frame = createFrame(parent);
+		if ((flags & IFrameSource.FULL_CONTEXT) != 0) {
+			frame.setSelection(viewer.getSelection());
+			// include current input in expanded set
+			Object[] expanded = viewer.getExpandedElements();
+			Object[] newExpanded = new Object[expanded.length + 1];
+			System.arraycopy(expanded, 0, newExpanded, 0, expanded.length);
+			newExpanded[newExpanded.length - 1] = input;
+			frame.setExpandedElements(newExpanded);
+		}
+		return frame;
     }
 
     /**
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/PasteAction.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/PasteAction.java
index 7ffebc668ec..6affaa7a669 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/PasteAction.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/PasteAction.java
@@ -166,9 +166,8 @@ import org.eclipse.ui.part.ResourceTransfer;
         List selection = getSelectedResources();
         if (selection.get(0) instanceof IFile) {
 			return ((IFile) selection.get(0)).getParent();
-		} else {
-			return (IContainer) selection.get(0);
 		}
+		return (IContainer) selection.get(0);
     }
 
     /**
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/StringMatcher.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/StringMatcher.java
index 285b3b3d79d..7284bb046bf 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/StringMatcher.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/StringMatcher.java
@@ -221,10 +221,9 @@ import java.util.Vector;
         if (!fHasLeadingStar) {
             if (!regExpRegionMatches(text, start, current, 0, segLength)) {
                 return false;
-            } else {
-                ++i;
-                tCurPos = tCurPos + segLength;
             }
+			++i;
+			tCurPos = tCurPos + segLength;
         }
         if ((fSegments.length == 1) && (!fHasLeadingStar)
                 && (!fHasTrailingStar)) {
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/DefaultTaskListResourceAdapter.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/DefaultTaskListResourceAdapter.java
index c66ace9c844..f5a91c403b6 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/DefaultTaskListResourceAdapter.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/DefaultTaskListResourceAdapter.java
@@ -50,9 +50,8 @@ class DefaultTaskListResourceAdapter implements ITaskListResourceAdapter {
         IResource resource = adaptable.getAdapter(IResource.class);
         if (resource == null) {
 			return adaptable.getAdapter(IFile.class);
-		} else {
-			return resource;
 		}
+		return resource;
 
     }
 
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/MarkerUtil.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/MarkerUtil.java
index bc1d159512a..3cc43f39ea8 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/MarkerUtil.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/MarkerUtil.java
@@ -12,8 +12,6 @@
 
 package org.eclipse.ui.views.tasklist;
 
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.MessageFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -28,6 +26,9 @@ import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
 import org.eclipse.ui.internal.views.tasklist.TaskListMessages;
 
+import com.ibm.icu.text.DateFormat;
+import com.ibm.icu.text.MessageFormat;
+
 /**
  * Utility class for accessing marker attributes.
  */
@@ -155,9 +156,8 @@ class MarkerUtil implements IMarkerConstants {
         if (isMarkerType(marker, IMarker.TASK)) {
             if (isComplete(marker)) {
 				return TaskListMessages.TaskList_completed;
-			} else {
-				return TaskListMessages.TaskList_notCompleted;
 			}
+			return TaskListMessages.TaskList_notCompleted;
         }
         return ""; //$NON-NLS-1$
     }
@@ -273,18 +273,13 @@ class MarkerUtil implements IMarkerConstants {
         if (lineNumber == -1) {
             if (location.equals("")) {//$NON-NLS-1$
                 return "";//$NON-NLS-1$
-            } else {
-                return location;
-            }
-        } else {
-            if (location.equals("")) {//$NON-NLS-1$
-                return line
-                        .format(new Object[] { Integer.toString(lineNumber) });
-            } else {
-                return lineAndLocation.format(new Object[] {
-                        Integer.toString(lineNumber), location });
             }
+			return location;
         }
+		if (location.equals("")) {//$NON-NLS-1$
+			return line.format(new Object[] { Integer.toString(lineNumber) });
+		}
+		return lineAndLocation.format(new Object[] { Integer.toString(lineNumber), location });
     }
 
     /**
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/TaskListContentProvider.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/TaskListContentProvider.java
index 57d4668eb32..3a3e03a18b5 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/TaskListContentProvider.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/TaskListContentProvider.java
@@ -141,10 +141,9 @@ class TaskListContentProvider implements IStructuredContentProvider,
 
         if (filter.isShowingAll()) {
             return NLS.bind(TaskListMessages.TaskList_titleSummaryUnfiltered, new Integer(visibleMarkerCount));
-        } else {
-            return NLS.bind(TaskListMessages.TaskList_titleSummaryFiltered, new Integer(visibleMarkerCount),
-			new Integer(getTotalMarkerCount()));
         }
+		return NLS.bind(TaskListMessages.TaskList_titleSummaryFiltered, new Integer(visibleMarkerCount),
+				new Integer(getTotalMarkerCount()));
     }
 
     /**
@@ -417,20 +416,19 @@ class TaskListContentProvider implements IStructuredContentProvider,
                 }
 
                 return new IMarker[0];
-            } else {
-                if (isMarkerLimitExceeded()) {
-                    setMarkerLimitExceeded(false);
+			}
+			if (isMarkerLimitExceeded()) {
+				setMarkerLimitExceeded(false);
 
-                    viewer.getControl().getDisplay().syncExec(new Runnable() {
-                        @Override
-						public void run() {
-                            viewer.refresh();
-                        }
-                    });
-                }
+				viewer.getControl().getDisplay().syncExec(new Runnable() {
+					@Override
+					public void run() {
+						viewer.refresh();
+					}
+				});
+			}
 
-                return markers;
-            }
+			return markers;
         } catch (CoreException e) {
             return new IMarker[0];
         }