Removed unncessary else blocks

5 files changed, 17 insertions, 23 deletions

diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/WorkingSetComparator.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/WorkingSetComparator.java
index aa1fda133..f12578711 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/WorkingSetComparator.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/WorkingSetComparator.java
@@ -30,9 +30,8 @@ public class WorkingSetComparator implements Comparator {
 		if (one == null || two == null) {
 			if (one == two) {
 				return 0;
-			} else {
-				return -1;
-			}
+			} 
+			return -1;
 		}
 		if (one.startsWith("${working_set:") && two.startsWith("${working_set:")) {		  //$NON-NLS-1$//$NON-NLS-2$
 			IWorkingSet workingSet1 = RefreshTab.getWorkingSet(one);
@@ -40,16 +39,14 @@ public class WorkingSetComparator implements Comparator {
 			if (workingSet1 == null || workingSet2 == null) {
 				if (workingSet1 == workingSet2) {
 					return 0;
-				} else {
-					return -1;
-				}
+				} 
+				return -1;
 			}
 			if (workingSet1.equals(workingSet2)) {
 				return 0;
 			}
 			return -1;
-		} else {
-			return one.compareTo(two);
 		}
+		return one.compareTo(two);
 	}
 }
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolBuilder.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolBuilder.java
index 026caacb0..a7916109d 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolBuilder.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolBuilder.java
@@ -196,12 +196,11 @@ public final class ExternalToolBuilder extends IncrementalProjectBuilder {
 			if (delta == null) {
 				//project just added to the workspace..no previous build tree
 				return true;
-			} else {	
-				IPath path= resources[i].getProjectRelativePath();
-				IResourceDelta change= delta.findMember(path);
-				if (change != null) {
-					return true;
-				}
+			} 
+			IPath path= resources[i].getProjectRelativePath();
+			IResourceDelta change= delta.findMember(path);
+			if (change != null) {
+				return true;
 			}
 		}
 		return false;
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/StringMatcher.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/StringMatcher.java
index a1c94cf5e..4a4b2ea2b 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/StringMatcher.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/StringMatcher.java
@@ -182,10 +182,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)) {
 			// only one segment to match, no wildcards specified
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/FileSelectionDialog.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/FileSelectionDialog.java
index 707964fc1..b01d5d92d 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/FileSelectionDialog.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/FileSelectionDialog.java
@@ -197,9 +197,9 @@ public class FileSelectionDialog extends MessageDialog {
 						}
 					}
 					return results.toArray();
-				} else {
-					return new Object[0];
 				}
+				
+				return new Object[0];
 			}
 		};
 	}
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/TreeAndListGroup.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/TreeAndListGroup.java
index 509b21554..48f387ab1 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/TreeAndListGroup.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/TreeAndListGroup.java
@@ -216,9 +216,8 @@ public class TreeAndListGroup implements ISelectionChangedListener {
 		ISelection selection=  this.listViewer.getSelection();
 		if (selection instanceof IStructuredSelection) {
 			return (IStructuredSelection)selection;
-		} else {
-			return StructuredSelection.EMPTY;
-		}
+		} 
+		return StructuredSelection.EMPTY;
 	}
 	
 	protected void initialListItem(Object element) {