Removed unnecessary else clause
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaUISourceLocator.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaUISourceLocator.java
index ed409c7..ae72bca 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaUISourceLocator.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaUISourceLocator.java
@@ -217,9 +217,8 @@
 				JDIDebugUIPlugin.log(e);
 				return sourceElements[0];
 			}
-		} else {
-			return fSourceLocator.getSourceElement(stackFrame);
 		}
+		return fSourceLocator.getSourceElement(stackFrame);
 	}
 	
 	private Object getSourceElement(IJavaClassType type) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java
index b1361bc..eece5dd 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java
@@ -417,9 +417,8 @@
 		ILaunchConfigurationTab tab = getDynamicTab();
 		if ((super.getErrorMessage() != null) || (tab == null)) {
 			return super.getErrorMessage();
-		} else {
-			return tab.getErrorMessage();
 		}
+		return tab.getErrorMessage();
 	}
 
 	protected void setLaunchConfigurationWorkingCopy(ILaunchConfigurationWorkingCopy workingCopy) {
@@ -464,16 +463,15 @@
 						name = vm.getName();
 					}
 					return MessageFormat.format(LauncherMessages.getString("JavaJRETab.8"), new String[]{name}); //$NON-NLS-1$
-				} else {
-					try {
-						IVMInstall vm = JavaRuntime.getVMInstall(project);
-						if (vm != null) {
-							name = vm.getName();
-						}
-					} catch (CoreException e) {
-					}
-					return MessageFormat.format(LauncherMessages.getString("JavaJRETab.9"), new String[]{name}); //$NON-NLS-1$
 				}
+				try {
+					IVMInstall vm = JavaRuntime.getVMInstall(project);
+					if (vm != null) {
+						name = vm.getName();
+					}
+				} catch (CoreException e) {
+				}
+				return MessageFormat.format(LauncherMessages.getString("JavaJRETab.9"), new String[]{name}); //$NON-NLS-1$
 			}
 		};
 	}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointUtils.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointUtils.java
index f615028..41ef5be 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointUtils.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointUtils.java
@@ -177,9 +177,8 @@
 	private static IMember asMember(IJavaElement element) {
 		if (element instanceof IMember) {
 			return (IMember)element;
-		} else {
-			return null;
-		}		
+		}
+		return null;		
 	}
 	
 	/**
@@ -188,9 +187,8 @@
 	protected static IJavaElement getElementAt(IType type, int pos) throws JavaModelException {
 		if (type.isBinary()) {
 			return type.getClassFile().getElementAt(pos);
-		} else {
-			return type.getCompilationUnit().getElementAt(pos);
 		}
+		return type.getCompilationUnit().getElementAt(pos);
 	}
 	
 	/**
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DetailFormatter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DetailFormatter.java
index cf0c3f4..f9dbccd 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DetailFormatter.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DetailFormatter.java
@@ -84,9 +84,8 @@
 		if (fTypeName == null) {
 			if (detailFormatter.fTypeName == null) {
 				return 0;
-			} else {
-				return detailFormatter.fTypeName.compareTo(fTypeName);
 			}
+			return detailFormatter.fTypeName.compareTo(fTypeName);
 		}
 		return fTypeName.compareTo(detailFormatter.fTypeName);
 	}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EvaluationContextManager.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EvaluationContextManager.java
index f877c8a..2bdec0d 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EvaluationContextManager.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EvaluationContextManager.java
@@ -211,9 +211,8 @@
 		IJavaStackFrame frame = getContext(page);
 		if (frame == null) {
 			return getEvaluationContext(page.getWorkbenchWindow());
-		} else {
-			return frame;
 		}
+		return frame;
 	}
 
 	/**
@@ -269,9 +268,8 @@
 				}
 			}
 			return null;
-		} else {
-			return frame;
 		}
+		return frame;
 	}
 	
 	/**
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/FilterLabelProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/FilterLabelProvider.java
index d9dc4aa..e83dae9 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/FilterLabelProvider.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/FilterLabelProvider.java
@@ -51,8 +51,7 @@
 		String name = ((Filter) object).getName();
 		if (name.endsWith("*") || name.equals("(default package)")) { //$NON-NLS-1$ //$NON-NLS-2$
 			return IMG_PKG;
-		} else {
-			return IMG_CUNIT;
 		}
+		return IMG_CUNIT;
 	}
 }
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIDebugUIPlugin.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIDebugUIPlugin.java
index 2c0c15d..e9f2249 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIDebugUIPlugin.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIDebugUIPlugin.java
@@ -262,25 +262,23 @@
 		Bundle bundle = Platform.getBundle(element.getDeclaringExtension().getNamespace());
 		if (bundle.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() {
-				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() {
+			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];
 	}	
 	
 	/* (non-Javadoc)
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
index 9a39230..fa32484 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
@@ -272,30 +272,26 @@
 		if (thread.isTerminated()) {
 			if (thread.isSystemThread()) {
 				return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[({0}]_(Terminated)_7"), thread.getName()); //$NON-NLS-1$
-			} else {
-				return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[({0}]_(Terminated)_8"), thread.getName()); //$NON-NLS-1$
 			}
+			return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[({0}]_(Terminated)_8"), thread.getName()); //$NON-NLS-1$
 		}
 		if (thread.isStepping()) {
 			if (thread.isSystemThread()) {
 				return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Stepping)_9"), thread.getName()); //$NON-NLS-1$
-			} else {
-				return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Stepping)_10"), thread.getName()); //$NON-NLS-1$
-			}
+			} 
+			return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Stepping)_10"), thread.getName()); //$NON-NLS-1$
 		}
 		if (thread.isPerformingEvaluation()) {
 			if (thread.isSystemThread()) {
 				return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Evaluating)_9"), thread.getName()); //$NON-NLS-1$
-			} else {
-				return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Evaluating)_10"), thread.getName()); //$NON-NLS-1$
 			}
+			return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Evaluating)_10"), thread.getName()); //$NON-NLS-1$
 		}
 		if (!thread.isSuspended() || (thread instanceof JDIThread && ((JDIThread)thread).isSuspendedQuiet())) {
 			if (thread.isSystemThread()) {
 				return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Running)_11"), thread.getName()); //$NON-NLS-1$
-			} else {
-				return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Running)_12"), thread.getName()); //$NON-NLS-1$
-			}
+			} 
+			return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Running)_12"), thread.getName()); //$NON-NLS-1$
 		}
 		IBreakpoint[] breakpoints= thread.getBreakpoints();
 		if (breakpoints.length > 0) {
@@ -318,9 +314,8 @@
 					String message = problem.getAttribute(IMarker.MESSAGE, DebugUIMessages.getString("JDIModelPresentation.Compilation_error_1")); //$NON-NLS-1$
 					if (thread.isSystemThread()) {
 						return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Suspended_({1}))_2"), new String[] {thread.getName(), message}); //$NON-NLS-1$
-					} else {
-						return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_({1}))_3"), new String[] {thread.getName(), message}); //$NON-NLS-1$
 					}
+					return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_({1}))_3"), new String[] {thread.getName(), message}); //$NON-NLS-1$
 				}
 			}			
 			if (breakpoint instanceof IJavaExceptionBreakpoint) {
@@ -333,9 +328,8 @@
 				} 
 				if (thread.isSystemThread()) {
 					return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Suspended_(exception_{1}))_13"), new String[] {thread.getName(), exName}); //$NON-NLS-1$
-				} else {
-					return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_(exception_{1}))_14"), new String[] {thread.getName(), exName}); //$NON-NLS-1$
 				}
+				return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_(exception_{1}))_14"), new String[] {thread.getName(), exName}); //$NON-NLS-1$
 			}
 			if (breakpoint instanceof IJavaWatchpoint) {
 				IJavaWatchpoint wp = (IJavaWatchpoint)breakpoint;
@@ -343,17 +337,14 @@
 				if (wp.isAccessSuspend(thread.getDebugTarget())) {
 					if (thread.isSystemThread()) {
 						return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Suspended_(access_of_field_{1}_in_{2}))_16"), new String[] {thread.getName(), fieldName, typeName}); //$NON-NLS-1$
-					} else {
-						return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_(access_of_field_{1}_in_{2}))_17"), new String[] {thread.getName(), fieldName, typeName}); //$NON-NLS-1$
 					}
-				} else {
-					// modification
-					if (thread.isSystemThread()) {
-						return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Suspended_(modification_of_field_{1}_in_{2}))_18"), new String[] {thread.getName(), fieldName, typeName}); //$NON-NLS-1$
-					} else {
-						return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_(modification_of_field_{1}_in_{2}))_19"), new String[] {thread.getName(), fieldName, typeName}); //$NON-NLS-1$
-					}
+					return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_(access_of_field_{1}_in_{2}))_17"), new String[] {thread.getName(), fieldName, typeName}); //$NON-NLS-1$
 				}
+				// modification
+				if (thread.isSystemThread()) {
+					return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Suspended_(modification_of_field_{1}_in_{2}))_18"), new String[] {thread.getName(), fieldName, typeName}); //$NON-NLS-1$
+				} 
+				return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_(modification_of_field_{1}_in_{2}))_19"), new String[] {thread.getName(), fieldName, typeName}); //$NON-NLS-1$
 			}
 			if (breakpoint instanceof IJavaMethodBreakpoint) {
 				IJavaMethodBreakpoint me= (IJavaMethodBreakpoint)breakpoint;
@@ -361,16 +352,13 @@
 				if (me.isEntrySuspend(thread.getDebugTarget())) {
 					if (thread.isSystemThread()) {
 						return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Suspended_(entry_into_method_{1}_in_{2}))_21"), new String[] {thread.getName(), methodName, typeName}); //$NON-NLS-1$
-					} else {
-						return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_(entry_into_method_{1}_in_{2}))_22"), new String[] {thread.getName(), methodName, typeName}); //$NON-NLS-1$
 					}
-				} else {
-					if (thread.isSystemThread()) {
-						return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Suspended_(exit_of_method_{1}_in_{2}))_21"), new String[] {thread.getName(), methodName, typeName}); //$NON-NLS-1$
-					} else {
-						return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_(exit_of_method_{1}_in_{2}))_22"), new String[] {thread.getName(), methodName, typeName}); //$NON-NLS-1$
-					}					
+					return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_(entry_into_method_{1}_in_{2}))_22"), new String[] {thread.getName(), methodName, typeName}); //$NON-NLS-1$
 				}
+				if (thread.isSystemThread()) {
+					return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Suspended_(exit_of_method_{1}_in_{2}))_21"), new String[] {thread.getName(), methodName, typeName}); //$NON-NLS-1$
+				}
+				return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_(exit_of_method_{1}_in_{2}))_22"), new String[] {thread.getName(), methodName, typeName}); //$NON-NLS-1$					
 			}
 			if (breakpoint instanceof IJavaLineBreakpoint) {
 				IJavaLineBreakpoint jlbp = (IJavaLineBreakpoint)breakpoint;
@@ -379,16 +367,13 @@
 					if (thread.isSystemThread()) {
 						if (BreakpointUtils.isRunToLineBreakpoint(jlbp)) {
 							return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Suspended_(run_to_line_{1}_in_{2}))_23"), new String[] {thread.getName(), String.valueOf(lineNumber), typeName}); //$NON-NLS-1$
-						} else {
-							return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Suspended_(breakpoint_at_line_{1}_in_{2}))_24"), new String[] {thread.getName(), String.valueOf(lineNumber), typeName}); //$NON-NLS-1$
 						}
-					} else {
-						if (BreakpointUtils.isRunToLineBreakpoint(jlbp)) {
-							return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_(run_to_line_{1}_in_{2}))_25"), new String[] {thread.getName(), String.valueOf(lineNumber), typeName}); //$NON-NLS-1$
-						} else {
-							return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_(breakpoint_at_line_{1}_in_{2}))_26"), new String[] {thread.getName(), String.valueOf(lineNumber), typeName}); //$NON-NLS-1$
-						}
+						return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Suspended_(breakpoint_at_line_{1}_in_{2}))_24"), new String[] {thread.getName(), String.valueOf(lineNumber), typeName}); //$NON-NLS-1$
 					}
+					if (BreakpointUtils.isRunToLineBreakpoint(jlbp)) {
+						return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_(run_to_line_{1}_in_{2}))_25"), new String[] {thread.getName(), String.valueOf(lineNumber), typeName}); //$NON-NLS-1$
+					}
+					return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_(breakpoint_at_line_{1}_in_{2}))_26"), new String[] {thread.getName(), String.valueOf(lineNumber), typeName}); //$NON-NLS-1$
 				}
 			}
 			if (breakpoint instanceof IJavaClassPrepareBreakpoint) {
@@ -399,9 +384,8 @@
 		// Otherwise, it's just suspended
 		if (thread.isSystemThread()) {
 			return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Suspended)_27"), thread.getName()); //$NON-NLS-1$
-		} else {
-			return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended)_28"), thread.getName()); //$NON-NLS-1$
 		}
+		return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended)_28"), thread.getName()); //$NON-NLS-1$
 	}
 
 	/**
@@ -659,9 +643,8 @@
 		
 		if (breakpoint instanceof IJavaLineBreakpoint && BreakpointUtils.isRunToLineBreakpoint((IJavaLineBreakpoint)breakpoint)) {
 			return null;
-		} else {
-			return getJavaBreakpointImage(breakpoint);
 		}
+		return getJavaBreakpointImage(breakpoint);
 	}
 
 	protected Image getExceptionBreakpointImage(IJavaExceptionBreakpoint exception) throws CoreException {
@@ -1087,9 +1070,8 @@
 				// occur if the inspected object has been garbage collected.
 				if (exception.getStatus().getException() instanceof ObjectCollectedException) {
 					return DebugUIMessages.getString("JDIModelPresentation.<garbage_collected_object>_6"); //$NON-NLS-1$
-				} else {
-					throw exception;
 				}
+				throw exception;
 			}
 			if (showTypes ) {
 				typeName= getQualifiedName(typeName);
@@ -1552,21 +1534,20 @@
 		int parameterStart= qualifiedName.indexOf('<');
 		if (parameterStart == -1) {
 			return getSimpleName(qualifiedName);
-		} else {
-			// get the list of the parameters and generates their simple name
-			List parameters= getNameList(qualifiedName.substring(parameterStart + 1, qualifiedName.length() - 1));
-			StringBuffer name= new StringBuffer(getSimpleName(qualifiedName.substring(0, parameterStart)));
-			name.append('<');
-			Iterator iterator= parameters.iterator();
-			if (iterator.hasNext()) {
-				name.append(removeQualifierFromGenericName((String)iterator.next()));
-				while (iterator.hasNext()) {
-					name.append(',').append(removeQualifierFromGenericName((String)iterator.next()));
-				}
-			}
-			name.append('>');
-			return name.toString();
 		}
+		// get the list of the parameters and generates their simple name
+		List parameters= getNameList(qualifiedName.substring(parameterStart + 1, qualifiedName.length() - 1));
+		StringBuffer name= new StringBuffer(getSimpleName(qualifiedName.substring(0, parameterStart)));
+		name.append('<');
+		Iterator iterator= parameters.iterator();
+		if (iterator.hasNext()) {
+			name.append(removeQualifierFromGenericName((String)iterator.next()));
+			while (iterator.hasNext()) {
+				name.append(',').append(removeQualifierFromGenericName((String)iterator.next()));
+			}
+		}
+		name.append('>');
+		return name.toString();
 	}
 	
 	/**
@@ -1576,9 +1557,8 @@
 		int index = qualifiedName.lastIndexOf('.');
 		if (index >= 0) {
 			return qualifiedName.substring(index + 1);
-		} else {
-			return qualifiedName;
 		}
+		return qualifiedName;
 	}
 
 	/**
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersManager.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersManager.java
index fe5b6b5..b924fa8 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersManager.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDetailFormattersManager.java
@@ -284,13 +284,12 @@
 		Key key= new Key(typeName, debugTarget);
 		if (fCacheMap.containsKey(key)) {
 			return (ICompiledExpression) fCacheMap.get(key);
-		} else {
-			String snippet= getDetailFormatter(type);
-			if (snippet != null) {
-				ICompiledExpression res= evaluationEngine.getCompiledExpression(snippet, javaObject);
-				fCacheMap.put(key, res);
-				return res;
-			}
+		}
+		String snippet= getDetailFormatter(type);
+		if (snippet != null) {
+			ICompiledExpression res= evaluationEngine.getCompiledExpression(snippet, javaObject);
+			fCacheMap.put(key, res);
+			return res;
 		}
 		return null;
 	}
@@ -375,9 +374,8 @@
 			if (obj instanceof Key) {
 				Key key= (Key) obj;
 				return fTypeName != null && fDebugTarget != null && fTypeName.equals(key.fTypeName) && fDebugTarget.equals(key.fDebugTarget);
-			} else {
-				return false;
 			}
+			return false;
 		}
 		
 		public int hashCode() {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointLocationVerifierJob.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointLocationVerifierJob.java
index e4d33d1..4f0fd6f 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointLocationVerifierJob.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointLocationVerifierJob.java
@@ -125,30 +125,28 @@
 						// There is already a breakpoint on the valid line.
 						report(ActionMessages.getString("BreakpointLocationVerifierJob.not_valid_location")); //$NON-NLS-1$
 						return new Status(IStatus.OK, JDIDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, ActionMessages.getString("BreakpointLocationVerifierJob.not_valid_location"), null); //$NON-NLS-1$
-					} else {
-						// There is already a breakpoint on the valid line, but it's also the requested line.
-						// Removing the existing breakpoint.
-						DebugPlugin.getDefault().getBreakpointManager().removeBreakpoint(breakpoint, true);
-						return new Status(IStatus.OK, JDIDebugUIPlugin.getUniqueIdentifier(), IStatus.OK, ActionMessages.getString("BreakpointLocationVerifierJob.breakpointRemoved"), null); //$NON-NLS-1$
 					}
+					// There is already a breakpoint on the valid line, but it's also the requested line.
+					// Removing the existing breakpoint.
+					DebugPlugin.getDefault().getBreakpointManager().removeBreakpoint(breakpoint, true);
+					return new Status(IStatus.OK, JDIDebugUIPlugin.getUniqueIdentifier(), IStatus.OK, ActionMessages.getString("BreakpointLocationVerifierJob.breakpointRemoved"), null); //$NON-NLS-1$
 				}
 				createNewBreakpoint(lineNumber, typeName);
 				return new Status(IStatus.OK, JDIDebugUIPlugin.getUniqueIdentifier(), IStatus.OK, ActionMessages.getString("BreakpointLocationVerifierJob.breakpoint_set"), null); //$NON-NLS-1$
-			} else {
-				if (differentLineNumber) {
-					if (breakpointExist) {
-						// there is already a breakpoint on the valid line.
-						report(ActionMessages.getString("BreakpointLocationVerifierJob.not_valid_location")); //$NON-NLS-1$
-						DebugPlugin.getDefault().getBreakpointManager().removeBreakpoint(fBreakpoint, true);
-						return new Status(IStatus.OK, JDIDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, ActionMessages.getString("BreakpointLocationVerifierJob.not_valid_location"), null); //$NON-NLS-1$
-					}
-					replaceBreakpoint(lineNumber, typeName);
-					return new Status(IStatus.OK, JDIDebugUIPlugin.getUniqueIdentifier(), IStatus.WARNING, ActionMessages.getString("BreakpointLocationVerifierJob.breakpointMovedToValidPosition"), null); //$NON-NLS-1$
+			}
+			if (differentLineNumber) {
+				if (breakpointExist) {
+					// there is already a breakpoint on the valid line.
+					report(ActionMessages.getString("BreakpointLocationVerifierJob.not_valid_location")); //$NON-NLS-1$
+					DebugPlugin.getDefault().getBreakpointManager().removeBreakpoint(fBreakpoint, true);
+					return new Status(IStatus.OK, JDIDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, ActionMessages.getString("BreakpointLocationVerifierJob.not_valid_location"), null); //$NON-NLS-1$
 				}
-				if (!typeName.equals(fTypeName)) {
-					replaceBreakpoint(lineNumber, typeName);
-					return new Status(IStatus.OK, JDIDebugUIPlugin.getUniqueIdentifier(), IStatus.WARNING, ActionMessages.getString("BreakpointLocationVerifierJob.breakpointSetToRightType"), null); //$NON-NLS-1$
-				}
+				replaceBreakpoint(lineNumber, typeName);
+				return new Status(IStatus.OK, JDIDebugUIPlugin.getUniqueIdentifier(), IStatus.WARNING, ActionMessages.getString("BreakpointLocationVerifierJob.breakpointMovedToValidPosition"), null); //$NON-NLS-1$
+			}
+			if (!typeName.equals(fTypeName)) {
+				replaceBreakpoint(lineNumber, typeName);
+				return new Status(IStatus.OK, JDIDebugUIPlugin.getUniqueIdentifier(), IStatus.WARNING, ActionMessages.getString("BreakpointLocationVerifierJob.breakpointSetToRightType"), null); //$NON-NLS-1$
 			}
 		} catch (CoreException e) {
 			JDIDebugUIPlugin.log(e);
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EvaluateAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EvaluateAction.java
index 9a1620d..b6002a6 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EvaluateAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EvaluateAction.java
@@ -393,9 +393,8 @@
 	protected Shell getShell() {
 		if (getTargetPart() != null) {
 			return getTargetPart().getSite().getShell();
-		} else {
-			return JDIDebugUIPlugin.getActiveWorkbenchShell();
 		}
+		return JDIDebugUIPlugin.getActiveWorkbenchShell();
 	}
 	
 	protected IDataDisplay getDataDisplay() {
@@ -537,9 +536,8 @@
 		String[] errors= result.getErrorMessages();
 		if (errors.length == 0) {
 			return getExceptionMessage(result.getException());
-		} else {
-			return getErrorMessage(errors);
 		}
+		return getErrorMessage(errors);
 	}
 	
 	protected String getErrorMessage(String[] errors) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionActionDelegate.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionActionDelegate.java
index 1282e8c..691a2a2 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionActionDelegate.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionActionDelegate.java
@@ -231,10 +231,9 @@
 		if (part instanceof ITextEditor) { 
 			ITextEditor editor = (ITextEditor)part;
 			return (ITextSelection)editor.getSelectionProvider().getSelection();
-		} else {
-			showErrorMessage(ActionMessages.getString("StepIntoSelectionActionDelegate.Step_into_selection_only_available_in_Java_editor._4")); //$NON-NLS-1$
-			return null;
 		}
+		showErrorMessage(ActionMessages.getString("StepIntoSelectionActionDelegate.Step_into_selection_only_available_in_Java_editor._4")); //$NON-NLS-1$
+		return null;
 	}
 	
 	private IMethod getMethod() {
@@ -322,10 +321,9 @@
 		if (fWindow != null) {
 			// global action
 			return fWindow.getActivePage().getActiveEditor();
-		} else {
-			// pop-up action
-			return fEditorPart;
 		}
+		// pop-up action
+		return fEditorPart;
 	}
 
 	/**
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionHandler.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionHandler.java
index 4f51f14..5ff7f6c 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionHandler.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StepIntoSelectionHandler.java
@@ -177,10 +177,9 @@
 				if (fFirstStep) {
 					fFirstStep = false;
 					return events; // include the first resume event
-				} else {
-					// secondary step - filter the event
-					return filtered;
-				}			
+				}
+				// secondary step - filter the event
+				return filtered;			
 			case DebugEvent.SUSPEND:
 				// compare location to desired location
 				try {
@@ -200,49 +199,48 @@
 						// hit
 						cleanup();
 						return events;
-					} else {
-						// step again
-						Runnable r = null;
-						if (stackDepth > fOriginalStackDepth) {
-							r = new Runnable() {
-								public void run() {
-									try {
-										setExpectedEvent(DebugEvent.RESUME, DebugEvent.STEP_RETURN);
-										frame.stepReturn();
-									} catch (DebugException e) {
-										JDIDebugUIPlugin.log(e);
-										cleanup();
-										DebugPlugin.getDefault().fireDebugEventSet(new DebugEvent[]{new DebugEvent(getDebugTarget(), DebugEvent.CHANGE)});
-									}
-								}
-							};								
-						} else if (stackDepth == fOriginalStackDepth){
-							// we should be back in the original stack frame - if not, abort
-							if (!(frame.getSignature().equals(fOriginalSignature) && frame.getName().equals(fOriginalName) && frame.getDeclaringTypeName().equals(fOriginalTypeName))) {
-								missed();
-								return events;
-							}
-							r = new Runnable() {
-								public void run() {
-									try {
-										setExpectedEvent(DebugEvent.RESUME, DebugEvent.STEP_INTO);
-										frame.stepInto();	
-									} catch (DebugException e) {
-										JDIDebugUIPlugin.log(e);
-										cleanup();
-										DebugPlugin.getDefault().fireDebugEventSet(new DebugEvent[]{new DebugEvent(getDebugTarget(), DebugEvent.CHANGE)});
-									}
-								}
-							};																
-						} else {
-							// we returned from the original frame - never hit the desired method
-							missed();
-							return events;								
-						}
-						DebugPlugin.getDefault().asyncExec(r);
-						// filter the events
-						return filtered;
 					}
+					// step again
+					Runnable r = null;
+					if (stackDepth > fOriginalStackDepth) {
+						r = new Runnable() {
+							public void run() {
+								try {
+									setExpectedEvent(DebugEvent.RESUME, DebugEvent.STEP_RETURN);
+									frame.stepReturn();
+								} catch (DebugException e) {
+									JDIDebugUIPlugin.log(e);
+									cleanup();
+									DebugPlugin.getDefault().fireDebugEventSet(new DebugEvent[]{new DebugEvent(getDebugTarget(), DebugEvent.CHANGE)});
+								}
+							}
+						};								
+					} else if (stackDepth == fOriginalStackDepth){
+						// we should be back in the original stack frame - if not, abort
+						if (!(frame.getSignature().equals(fOriginalSignature) && frame.getName().equals(fOriginalName) && frame.getDeclaringTypeName().equals(fOriginalTypeName))) {
+							missed();
+							return events;
+						}
+						r = new Runnable() {
+							public void run() {
+								try {
+									setExpectedEvent(DebugEvent.RESUME, DebugEvent.STEP_INTO);
+									frame.stepInto();	
+								} catch (DebugException e) {
+									JDIDebugUIPlugin.log(e);
+									cleanup();
+									DebugPlugin.getDefault().fireDebugEventSet(new DebugEvent[]{new DebugEvent(getDebugTarget(), DebugEvent.CHANGE)});
+								}
+							}
+						};																
+					} else {
+						// we returned from the original frame - never hit the desired method
+						missed();
+						return events;								
+					}
+					DebugPlugin.getDefault().asyncExec(r);
+					// filter the events
+						return filtered;
 				} catch (CoreException e) {
 					// abort
 					JDIDebugUIPlugin.log(e);
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java
index 7d4788f..ee6e5d4 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java
@@ -295,49 +295,46 @@
 		if (selection instanceof IStructuredSelection) {
 			IStructuredSelection ss = (IStructuredSelection) selection;
 			return getMethods(ss).length > 0;
-		} else {
-			return selection instanceof ITextSelection;
 		}
+		return selection instanceof ITextSelection;
 	}
 	
 	protected IMethod[] getMethods(IStructuredSelection selection) {
 		if (selection.isEmpty()) {
 			return new IMethod[0];
-		} else {
-			List methods = new ArrayList(selection.size());
-			Iterator iterator = selection.iterator();
-			while (iterator.hasNext()) {
-				Object thing = iterator.next();
-				try {
-					if (thing instanceof IMethod && !Flags.isAbstract(((IMethod)thing).getFlags())) {	
-						methods.add(thing);
-					}
-				} catch (JavaModelException e) {
-				}
-			}
-			return (IMethod[]) methods.toArray(new IMethod[methods.size()]);
 		}
+		List methods = new ArrayList(selection.size());
+		Iterator iterator = selection.iterator();
+		while (iterator.hasNext()) {
+			Object thing = iterator.next();
+			try {
+				if (thing instanceof IMethod && !Flags.isAbstract(((IMethod)thing).getFlags())) {	
+					methods.add(thing);
+				}
+			} catch (JavaModelException e) {
+			}
+		}
+		return (IMethod[]) methods.toArray(new IMethod[methods.size()]);
 	}
 	
 	protected IField[] getFields(IStructuredSelection selection) {
 		if (selection.isEmpty()) {
 			return new IField[0];
-		} else {
-			List fields = new ArrayList(selection.size());
-			Iterator iterator = selection.iterator();
-			while (iterator.hasNext()) {
-				Object thing = iterator.next();
-				if (thing instanceof IField) {	
-					fields.add(thing);
-				} else if (thing instanceof IJavaFieldVariable) {
-					IField field= getField((IJavaFieldVariable) thing);
-					if (field != null) {
-						fields.add(field);
-					}
+		}
+		List fields = new ArrayList(selection.size());
+		Iterator iterator = selection.iterator();
+		while (iterator.hasNext()) {
+			Object thing = iterator.next();
+			if (thing instanceof IField) {	
+				fields.add(thing);
+			} else if (thing instanceof IJavaFieldVariable) {
+				IField field= getField((IJavaFieldVariable) thing);
+				if (field != null) {
+					fields.add(field);
 				}
 			}
-			return (IField[]) fields.toArray(new IField[fields.size()]);
 		}
+		return (IField[]) fields.toArray(new IField[fields.size()]);
 	}
 	
 	private boolean isFields(IStructuredSelection selection) {
@@ -575,9 +572,8 @@
 		if (selection instanceof IStructuredSelection) {
 			IStructuredSelection ss = (IStructuredSelection) selection;
 			return isFields(ss);
-		} else {
-			return selection instanceof ITextSelection;
 		}
+		return selection instanceof ITextSelection;
 	}
 	
 	/**
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathModel.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathModel.java
index bc56236..11c23c0 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathModel.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathModel.java
@@ -30,22 +30,21 @@
 				return entry;
 			}
 			return null;
-		} else {
-			ClasspathEntry newEntry= createEntry((IRuntimeClasspathEntry)entry, null);
-			Iterator entries= childEntries.iterator();
-			while (entries.hasNext()) {
-				Object element = entries.next();
-				if (element instanceof ClasspathGroup) {
-					if(((ClasspathGroup)element).contains(newEntry)) {
-						return null;
-					}
-				} else if (element.equals(newEntry)) {
+		}
+		ClasspathEntry newEntry= createEntry((IRuntimeClasspathEntry)entry, null);
+		Iterator entries= childEntries.iterator();
+		while (entries.hasNext()) {
+			Object element = entries.next();
+			if (element instanceof ClasspathGroup) {
+				if(((ClasspathGroup)element).contains(newEntry)) {
 					return null;
 				}
+			} else if (element.equals(newEntry)) {
+				return null;
 			}
-			childEntries.add(newEntry);
-			return newEntry;
 		}
+		childEntries.add(newEntry);
+		return newEntry;
 	}
 	
 	public Object addEntry(int entryType, IRuntimeClasspathEntry entry) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/J9StackTraceHyperlink.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/J9StackTraceHyperlink.java
index 72d5403..b97adcd 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/J9StackTraceHyperlink.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/J9StackTraceHyperlink.java
@@ -44,10 +44,9 @@
 			}
 			// replace slashes with dots
 			return typeName.replace('/', '.');
-		} else {
-			IStatus status = new Status(IStatus.ERROR, JDIDebugUIPlugin.getUniqueIdentifier(), 0, ConsoleMessages.getString("J9StackTraceHyperlink.Unable_to_parse_type_name_from_hyperlink._1"), null); //$NON-NLS-1$
-			throw new CoreException(status);
-		}
+		} 
+		IStatus status = new Status(IStatus.ERROR, JDIDebugUIPlugin.getUniqueIdentifier(), 0, ConsoleMessages.getString("J9StackTraceHyperlink.Unable_to_parse_type_name_from_hyperlink._1"), null); //$NON-NLS-1$
+		throw new CoreException(status);
 	}
 	
 	/**
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceHyperlink.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceHyperlink.java
index f8ee389..fce67d4 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceHyperlink.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/JavaStackTraceHyperlink.java
@@ -158,10 +158,9 @@
 				typeName = typeName.substring(0, index);
 			}
 			return typeName;
-		} else {
-			IStatus status = new Status(IStatus.ERROR, JDIDebugUIPlugin.getUniqueIdentifier(), 0, ConsoleMessages.getString("JavaStackTraceHyperlink.Unable_to_parse_type_name_from_hyperlink._5"), null); //$NON-NLS-1$
-			throw new CoreException(status);
 		}
+		IStatus status = new Status(IStatus.ERROR, JDIDebugUIPlugin.getUniqueIdentifier(), 0, ConsoleMessages.getString("JavaStackTraceHyperlink.Unable_to_parse_type_name_from_hyperlink._5"), null); //$NON-NLS-1$
+		throw new CoreException(status);
 	}	
 	
 	/**
@@ -180,10 +179,9 @@
 				IStatus status = new Status(IStatus.ERROR, JDIDebugUIPlugin.getUniqueIdentifier(), 0, ConsoleMessages.getString("JavaStackTraceHyperlink.Unable_to_parse_line_number_from_hyperlink._6"), e); //$NON-NLS-1$
 				throw new CoreException(status);
 			}		
-		} else {
-			IStatus status = new Status(IStatus.ERROR, JDIDebugUIPlugin.getUniqueIdentifier(), 0, ConsoleMessages.getString("JavaStackTraceHyperlink.Unable_to_parse_line_number_from_hyperlink._7"), null); //$NON-NLS-1$
-			throw new CoreException(status);			
 		}
+		IStatus status = new Status(IStatus.ERROR, JDIDebugUIPlugin.getUniqueIdentifier(), 0, ConsoleMessages.getString("JavaStackTraceHyperlink.Unable_to_parse_line_number_from_hyperlink._7"), null); //$NON-NLS-1$
+		throw new CoreException(status);			
 	}
 	
 	/**
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/StringMatcher.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/StringMatcher.java
index 827b747..ec30369 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/StringMatcher.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/console/StringMatcher.java
@@ -183,10 +183,9 @@
 		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.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsComboBlock.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsComboBlock.java
index f077002..6da2115 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsComboBlock.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/JREsComboBlock.java
@@ -372,9 +372,8 @@
 		int index = fCombo.getSelectionIndex();
 		if (index >= 0) {
 			return (IVMInstall)fVMs.get(index);
-		} else {
-			return null;
 		}
+		return null;
 	}
 	
 	/**
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletLaunchConfigurationUtils.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletLaunchConfigurationUtils.java
index da5768f..7c44802 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletLaunchConfigurationUtils.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletLaunchConfigurationUtils.java
@@ -166,9 +166,8 @@
 					if (child.equals(parent)) {
 						result.add(target);
 						break;
-					} else {
-						child = child.getParent();
 					}
+					child = child.getParent();
 				}
 			}
 		}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletSelectionDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletSelectionDialog.java
index 1763e3c..51a9ba6 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletSelectionDialog.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletSelectionDialog.java
@@ -130,11 +130,10 @@
 		// Convert the results to an array and return it
 		if (canceled) {
 			return null;
-		} else {
-			IType[] types = null;
-			types = (IType[]) results.toArray(new IType[results.size()]);		
-			return types;
-		} 
+		}
+		IType[] types = null;
+		types = (IType[]) results.toArray(new IType[results.size()]);		
+		return types; 
 	}
 
 	/**
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JreResolutionGenerator.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JreResolutionGenerator.java
index 2ea9d93..3d1268e 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JreResolutionGenerator.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JreResolutionGenerator.java
@@ -45,10 +45,9 @@
 					if (JREResolution.getAllVMs().length > 0) {
 						IJavaProject project = getJavaProject(marker);
 						return new IMarkerResolution[]{new SelectSystemLibraryQuickFix(path, project)};
-					} else {
-						// define a new JRE
-						return new IMarkerResolution[]{new DefineSystemLibraryQuickFix()};
 					}
+					// define a new JRE
+					return new IMarkerResolution[]{new DefineSystemLibraryQuickFix()};
 				}
 				break;
 
@@ -60,10 +59,9 @@
 					// unbound JRE_LIB
 					if (JREResolution.getAllVMs().length > 0) {
 						return new IMarkerResolution[]{new SelectDefaultSystemLibraryQuickFix()};
-					} else {
-						// define a new default JRE
-						return new IMarkerResolution[]{new DefineSystemLibraryQuickFix()};
 					}
+					// define a new default JRE
+					return new IMarkerResolution[]{new DefineSystemLibraryQuickFix()};
 				}
 				break;
 		}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/MainMethodSearchEngine.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/MainMethodSearchEngine.java
index a627035..f01d590 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/MainMethodSearchEngine.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/MainMethodSearchEngine.java
@@ -122,10 +122,8 @@
 			subtypesMonitor.beginTask(LauncherMessages.getString("MainMethodSearchEngine.2"), result.size()); //$NON-NLS-1$
 			Set set = addSubtypes(result, subtypesMonitor);
 			return (IType[]) set.toArray(new IType[set.size()]);
-		} else {
-			return (IType[]) result.toArray(new IType[result.size()]);
 		}
-		
+		return (IType[]) result.toArray(new IType[result.size()]);
 	}
 
 	private Set addSubtypes(List types, IProgressMonitor monitor) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathEntryLabelProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathEntryLabelProvider.java
index 842fa1a..cbc6104 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathEntryLabelProvider.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathEntryLabelProvider.java
@@ -100,9 +100,8 @@
 				}
 				if (resource == null) {
 					return JavaPluginImages.get(JavaPluginImages.IMG_OBJS_LIBRARY);
-				} else {
-					return lp.getImage(resource);
 				}
+				return lp.getImage(resource);
 		}	
 		return null;
 	}
@@ -198,9 +197,8 @@
 				String name = lp.getText(delegate);
 				if (name == null || name.length() == 0) {
 					return ((IRuntimeClasspathEntry2)delegate).getName();
-				} else {
-					return name;
 				}
+				return name;
 		}	
 		return ""; //$NON-NLS-1$
 	}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SourceElementQualifierProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SourceElementQualifierProvider.java
index c1ff0cf..fa44839 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SourceElementQualifierProvider.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SourceElementQualifierProvider.java
@@ -52,10 +52,9 @@
 			if (res == null) {
 				// external
 				return zipFile.getName();
-			} else {
-				// internal
-				return res.getName();
 			}
+			// internal
+			return res.getName();
 		} else if (element instanceof LocalFileStorage) {
 			LocalFileStorage storage = (LocalFileStorage)element;
 			File extFile = storage.getFile();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/MonitorManager.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/MonitorManager.java
index 8c09438..a5f0b35 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/MonitorManager.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/MonitorManager.java
@@ -400,24 +400,22 @@
 				return res;
 			}
 			// if owningThread has not already been used
-			else{
-				List newUsedThreadsList= new ArrayList(usedThreadsList);
+			List newUsedThreadsList= new ArrayList(usedThreadsList);
+			
+			//adding current thread to the new used list
+			newUsedThreadsList.add(thread);
+			
+			if(owningThread==null){
+				return null;
+			}
+			// recursive call, one level lower in the deadlock list
+			List newRes = listToDeadlock(owningThread, newUsedThreadsList);
 				
-				//adding current thread to the new used list
-				newUsedThreadsList.add(thread);
-				
-				if(owningThread==null){
-					return null;
-				}
-				// recursive call, one level lower in the deadlock list
-				List newRes = listToDeadlock(owningThread, newUsedThreadsList);
-					
-				if(newRes!=null){
-					res.add(thread);
-					res.add(contendedMonitor);
-					res.addAll(newRes);
-					return res;
-				}
+			if(newRes!=null){
+				res.add(thread);
+				res.add(contendedMonitor);
+				res.addAll(newRes);
+				return res;
 			}
 		} else {
 			// if the thread is not waiting for any monitor
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/MonitorsViewContentProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/MonitorsViewContentProvider.java
index f8c678a..8bd46de 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/MonitorsViewContentProvider.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/MonitorsViewContentProvider.java
@@ -112,9 +112,8 @@
 			List contendingThreads = MonitorManager.getDefault().getContendingThreads(monitor);
 			if (owningThread == null && contendingThreads == null) {
 				return false;
-			} else {
-				return true;
 			}
+			return true;
 		}
 		return false;
 	}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/ThreadsViewContentProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/ThreadsViewContentProvider.java
index 55ae10d..00b5797 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/ThreadsViewContentProvider.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/monitors/ThreadsViewContentProvider.java
@@ -116,9 +116,8 @@
 			IJavaObject contendedMonitor= MonitorManager.getDefault().getContendedMonitor(thread);
 			if (ownedMonitors == null && contendedMonitor == null) {
 				return false;
-			} else {
-				return true;
 			}
+			return true;
 		}
 		return false;
 	}
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/LocalEvaluationEngine.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/LocalEvaluationEngine.java
index 923ebc1..e386f8e 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/LocalEvaluationEngine.java
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/LocalEvaluationEngine.java
@@ -296,9 +296,8 @@
 						new Status(IStatus.ERROR, JDIDebugModel.getPluginIdentifier(),
 						DebugException.REQUEST_FAILED, EvaluationMessages.getString("LocalEvaluationEngine.Evaluation_failed_-_unable_to_initialize_local_variables._4"), null) //$NON-NLS-1$
 					);
-				} else {
-					field.setValue(local.getValue());
 				}
+				field.setValue(local.getValue());
 			}
 		}
 		if (thisObject != null) {
@@ -309,9 +308,8 @@
 					new Status(IStatus.ERROR, JDIDebugModel.getPluginIdentifier(),
 					DebugException.REQUEST_FAILED, EvaluationMessages.getString("LocalEvaluationEngine.Evaluation_failed_-_unable_to_initialize___this___context._5"), null) //$NON-NLS-1$
 				);				
-			} else {
-				field.setValue(thisObject);
-			}
+			} 
+			field.setValue(thisObject);
 		}
 	}
 	
@@ -340,9 +338,8 @@
 						new Status(IStatus.ERROR, JDIDebugModel.getPluginIdentifier(),
 						DebugException.REQUEST_FAILED, EvaluationMessages.getString("LocalEvaluationEngine.Evaluation_failed_-_unable_to_initialize_local_variables._6"), null) //$NON-NLS-1$
 					);
-				} else {
-					local.setValue(field.getValue());
-				}
+				} 
+				local.setValue(field.getValue());
 			}
 		}
 	}
@@ -868,9 +865,8 @@
 	protected List getSnippetFiles() {
 		if (fSnippetFiles == null) {
 			return Collections.EMPTY_LIST;
-		} else {
-			return fSnippetFiles;
 		}
+		return fSnippetFiles;
 	}
 	
 	/**
@@ -882,9 +878,8 @@
 	protected List getDirectories() {
 		if (fDirectories == null) {
 			return Collections.EMPTY_LIST;
-		} else {
-			return fDirectories;
-		}
+		} 
+		return fDirectories;
 	}	
 	
 	/**
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTInstructionCompiler.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTInstructionCompiler.java
index b6ba9c6..39ffd74 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTInstructionCompiler.java
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/ASTInstructionCompiler.java
@@ -2174,18 +2174,17 @@
 		if (tokenLength < 10) {
 			// Integer.decode can handle tokens with less than 18 digits
 			return Integer.decode(token).intValue();
-		} else {
-			switch (getBase(token)) {
-				case 8:
-					return (Integer.decode(token.substring(0, tokenLength - 1)).intValue() << 3) | Integer.decode("0" + token.charAt(tokenLength - 1)).intValue(); //$NON-NLS-1$
-				case 10:
-					return Integer.decode(token).intValue();
-				case 16:
-					return (Integer.decode(token.substring(0, tokenLength - 1)).intValue() << 4) | Integer.decode("0x" + token.charAt(tokenLength - 1)).intValue(); //$NON-NLS-1$
-				default:
-					// getBase(String) only returns 8, 10, or 16. This code is unreachable
-					return 0;
-			}
+		} 
+		switch (getBase(token)) {
+			case 8:
+				return (Integer.decode(token.substring(0, tokenLength - 1)).intValue() << 3) | Integer.decode("0" + token.charAt(tokenLength - 1)).intValue(); //$NON-NLS-1$
+			case 10:
+				return Integer.decode(token).intValue();
+			case 16:
+				return (Integer.decode(token.substring(0, tokenLength - 1)).intValue() << 4) | Integer.decode("0x" + token.charAt(tokenLength - 1)).intValue(); //$NON-NLS-1$
+			default:
+				// getBase(String) only returns 8, 10, or 16. This code is unreachable
+				return 0;
 		}
 	}
 
@@ -2199,18 +2198,17 @@
 		if (tokenLength < 18) {
 			// Long.decode can handle tokens with less than 10 digits
 			return Long.decode(token).longValue();
-		} else {
-			switch (getBase(token)) {
-				case 8:
-					return (Long.decode(token.substring(0, tokenLength - 1)).longValue() << 3) | Long.decode("0" + token.charAt(tokenLength - 1)).longValue(); //$NON-NLS-1$
-				case 10:
-					return Long.decode(token).longValue();
-				case 16:
-					return (Long.decode(token.substring(0, tokenLength - 1)).longValue() << 4) | Long.decode("0x" + token.charAt(tokenLength - 1)).longValue(); //$NON-NLS-1$
-				default:
-					// getBase(String) only returns 8, 10, or 16. This code is unreachable
-					return 0;
-			}
+		} 
+		switch (getBase(token)) {
+			case 8:
+				return (Long.decode(token.substring(0, tokenLength - 1)).longValue() << 3) | Long.decode("0" + token.charAt(tokenLength - 1)).longValue(); //$NON-NLS-1$
+			case 10:
+				return Long.decode(token).longValue();
+			case 16:
+				return (Long.decode(token.substring(0, tokenLength - 1)).longValue() << 4) | Long.decode("0x" + token.charAt(tokenLength - 1)).longValue(); //$NON-NLS-1$
+			default:
+				// getBase(String) only returns 8, 10, or 16. This code is unreachable
+				return 0;
 		}
 	}
 
@@ -2223,12 +2221,10 @@
 		if (token.charAt(0) == '0') {
 			if (token.charAt(1) == 'x') {
 				return 16; // "0x" prefix: Hexadecimal
-			} else {
-				return 8; // "0" prefix: Octal
-			}
-		} else {
-			return 10; // No prefix: Decimal
-		}
+			} 
+			return 8; // "0" prefix: Octal
+		} 
+		return 10; // No prefix: Decimal
 	}
 
 	/**
@@ -2814,9 +2810,8 @@
 			SimpleType simpleType = (SimpleType) type;
 			if ("java.lang.String".equals(simpleType.getName())){ //$NON-NLS-1$
 				return Instruction.T_String;
-			} else {
-				return Instruction.T_Object;
-			}
+			} 
+			return Instruction.T_Object;
 		} else if (type.isArrayType()) {
 			return Instruction.T_Object;
 		} else {
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/SourceBasedSourceGenerator.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/SourceBasedSourceGenerator.java
index 018a746..ce21585 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/SourceBasedSourceGenerator.java
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/SourceBasedSourceGenerator.java
@@ -229,10 +229,9 @@
 			int startLineNumber= getCorrespondingLineNumber(node.getStartPosition());
 			int endLineNumber= getCorrespondingLineNumber(node.getStartPosition() + node.getLength() - 1);
 			return startLineNumber <= position && position <= endLineNumber;
-		} else {
-			int startPosition= node.getStartPosition();
-			return startPosition <= position && position <= startPosition + node.getLength();
-		}
+		} 
+		int startPosition= node.getStartPosition();
+		return startPosition <= position && position <= startPosition + node.getLength();
 	}
 	
 	private StringBuffer buildTypeBody(StringBuffer buffer, List list) {
@@ -522,14 +521,12 @@
 			char char0 = typeName.charAt(0);
 			if (char0 == 'v') {
 				return ""; //$NON-NLS-1$
-			} else {
-				char char1 = typeName.charAt(1);
-				if (char0 == 'b' && char1 == 'o') {
-					return "return false;"; //$NON-NLS-1$
-				} else {
-					return "return 0;"; //$NON-NLS-1$
-				}
 			}
+			char char1 = typeName.charAt(1);
+			if (char0 == 'b' && char1 == 'o') {
+				return "return false;"; //$NON-NLS-1$
+			}
+			return "return 0;"; //$NON-NLS-1$
 		}
 		return null;
 	}
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/InstanceOfOperator.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/InstanceOfOperator.java
index 7f185a9..39d5054 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/InstanceOfOperator.java
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/InstanceOfOperator.java
@@ -44,9 +44,8 @@
 		IJavaObject classObject= getClassObject(type);
 		if (classObject == null) {
 			throw new CoreException(new Status(IStatus.ERROR, JDIDebugPlugin.getUniqueIdentifier(), IStatus.OK, MessageFormat.format(InstructionsEvaluationMessages.getString("InstanceOfOperator.No_class_object"), new String[]{type.getName()}), null)); //$NON-NLS-1$
-		} else {
-			push(classObject.sendMessage(IS_INSTANCE, IS_INSTANCE_SIGNATURE, new IJavaValue[] {object}, getContext().getThread(), false));
 		}
+		push(classObject.sendMessage(IS_INSTANCE, IS_INSTANCE_SIGNATURE, new IJavaValue[] {object}, getContext().getThread(), false));
 	}
 	
 	public String toString() {
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Instruction.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Instruction.java
index f17ccfb..2164ac7 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Instruction.java
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/Instruction.java
@@ -208,25 +208,24 @@
 		if (types.length == 1) {
 			// Found only one class.
 			return types[0];
-		} else {
-			// Found many classes, look for the right one for this scope.
-			if (classReference == null) {
-				throw new CoreException(new Status(IStatus.ERROR, JDIDebugPlugin.getUniqueIdentifier(), IStatus.OK, MessageFormat.format(InstructionsEvaluationMessages.getString("Instruction.No_type"), new String[]{qualifiedName}), null)); //$NON-NLS-1$
-			}
-			for(int i= 0, length= types.length; i < length; i++) {
-				IJavaType type= types[i];
-				if (classReference.equals(getClassObject(type))) {
-					return type;
-				}
-			}
-
-			// At this point a very strange thing has happened,
-			// the VM was able to return multiple types in the classesByName
-			// call, but none of them were the class that was returned in
-			// the classForName call.
-
+		} 
+		// Found many classes, look for the right one for this scope.
+		if (classReference == null) {
 			throw new CoreException(new Status(IStatus.ERROR, JDIDebugPlugin.getUniqueIdentifier(), IStatus.OK, MessageFormat.format(InstructionsEvaluationMessages.getString("Instruction.No_type"), new String[]{qualifiedName}), null)); //$NON-NLS-1$
 		}
+		for(int i= 0, length= types.length; i < length; i++) {
+			IJavaType type= types[i];
+			if (classReference.equals(getClassObject(type))) {
+				return type;
+			}
+		}
+
+		// At this point a very strange thing has happened,
+		// the VM was able to return multiple types in the classesByName
+		// call, but none of them were the class that was returned in
+		// the classForName call.
+
+		throw new CoreException(new Status(IStatus.ERROR, JDIDebugPlugin.getUniqueIdentifier(), IStatus.OK, MessageFormat.format(InstructionsEvaluationMessages.getString("Instruction.No_type"), new String[]{qualifiedName}), null)); //$NON-NLS-1$
 	}
 
 
@@ -249,22 +248,21 @@
 		if (types.length == 1) {
 			// Found only one class.
 			return (IJavaArrayType)types[0];
-		} else {
-			// Found many classes, look for the right one for this scope.
-			for(int i= 0, length= types.length; i < length; i++) {
-				IJavaType type= types[i];
-				if (classReference.equals(getClassObject(type))) {
-					return (IJavaArrayType)type;
-				}
-			}
-
-			// At this point a very strange thing has happened,
-			// the VM was able to return multiple types in the classesByName
-			// call, but none of them were the class that was returned in
-			// the classForName call.
-
-			throw new CoreException(new Status(IStatus.ERROR, JDIDebugPlugin.getUniqueIdentifier(), IStatus.OK, MessageFormat.format(InstructionsEvaluationMessages.getString("Instruction.No_type"), new String[]{qualifiedName}), null)); //$NON-NLS-1$
 		}
+		// Found many classes, look for the right one for this scope.
+		for(int i= 0, length= types.length; i < length; i++) {
+			IJavaType type= types[i];
+			if (classReference.equals(getClassObject(type))) {
+				return (IJavaArrayType)type;
+			}
+		}
+
+		// At this point a very strange thing has happened,
+		// the VM was able to return multiple types in the classesByName
+		// call, but none of them were the class that was returned in
+		// the classForName call.
+
+		throw new CoreException(new Status(IStatus.ERROR, JDIDebugPlugin.getUniqueIdentifier(), IStatus.OK, MessageFormat.format(InstructionsEvaluationMessages.getString("Instruction.No_type"), new String[]{qualifiedName}), null)); //$NON-NLS-1$
 	}
 
 	protected IJavaObject classForName(String qualifiedName) throws CoreException {
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PlusOperator.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PlusOperator.java
index 2c15d82..95eb8cc 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PlusOperator.java
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PlusOperator.java
@@ -42,26 +42,25 @@
 				e.printStackTrace();
 				return null;
 			}		
-		} else {
-			IJavaPrimitiveValue primitiveValue= (IJavaPrimitiveValue)value;
-			switch (typeId) {
-				case T_boolean:
-					return new Boolean(primitiveValue.getBooleanValue()).toString();
-				case T_byte:
-					return new Integer(primitiveValue.getByteValue()).toString();
-				case T_char:
-					return new Character(primitiveValue.getCharValue()).toString();
-				case T_double:
-					return new Double(primitiveValue.getDoubleValue()).toString();
-				case T_float:
-					return new Float(primitiveValue.getFloatValue()).toString();
-				case T_int:
-					return new Integer(primitiveValue.getIntValue()).toString();
-				case T_long:
-					return new Long(primitiveValue.getLongValue()).toString();
-				case T_short:
-					return new Integer(primitiveValue.getShortValue()).toString();
-			}
+		} 
+		IJavaPrimitiveValue primitiveValue= (IJavaPrimitiveValue)value;
+		switch (typeId) {
+			case T_boolean:
+				return new Boolean(primitiveValue.getBooleanValue()).toString();
+			case T_byte:
+				return new Integer(primitiveValue.getByteValue()).toString();
+			case T_char:
+				return new Character(primitiveValue.getCharValue()).toString();
+			case T_double:
+				return new Double(primitiveValue.getDoubleValue()).toString();
+			case T_float:
+				return new Float(primitiveValue.getFloatValue()).toString();
+			case T_int:
+				return new Integer(primitiveValue.getIntValue()).toString();
+			case T_long:
+				return new Long(primitiveValue.getLongValue()).toString();
+			case T_short:
+				return new Integer(primitiveValue.getShortValue()).toString();
 		}
 		return NULL;
 	}	
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushFieldVariable.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushFieldVariable.java
index 9f9d0e4..2c57638 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushFieldVariable.java
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PushFieldVariable.java
@@ -58,9 +58,8 @@
 		
 		if (field == null) {
 			throw new CoreException(new Status(IStatus.ERROR, JDIDebugPlugin.getUniqueIdentifier(), IStatus.OK, MessageFormat.format(InstructionsEvaluationMessages.getString("PushFieldVariable.Cannot_find_the_field_{0}_for_the_object_{1}_1"), new String[] {fName, receiver.toString()}), null)); //$NON-NLS-1$ //$NON-NLS-2$
-		} else {
-			push(field);
-		}
+		} 
+		push(field);
 	}
 	
 	public String toString() {
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/RuntimeSignature.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/RuntimeSignature.java
index 7dbd56f..5866ef0 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/RuntimeSignature.java
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/RuntimeSignature.java
@@ -235,16 +235,15 @@
 							// decrement param count because it is going to be added for return type
 							paramCount--;
 							continue signature;
+						} 
+						if (paramCount > 0) {
+							// remove space for ", " that was added with last parameter and add space for ")"
+							resultLength--;
 						} else {
-							if (paramCount > 0) {
-								// remove space for ", " that was added with last parameter and add space for ")"
-								resultLength--;
-							} else {
-								// add space for ")"
-								resultLength++;
-							}
-							break signature;
+							// add space for ")"
+							resultLength++;
 						}
+						break signature;
 					default :
 						throw new IllegalArgumentException();
 				}
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ClassTypeImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ClassTypeImpl.java
index ab9ecca..e06df9d 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ClassTypeImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ClassTypeImpl.java
@@ -126,9 +126,8 @@
 	 		if (method.name().equals(name) && method.signature().equals(signature)) {
 	 			if (method.isAbstract()) {
 	 				return null;
-	 			} else {
-	 				return method;
-	 			}
+	 			} 
+	 			return method;
 	 		}
 	 	}
 	 	
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/GenericSignature.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/GenericSignature.java
index 968e2fa..09df6f6 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/GenericSignature.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/GenericSignature.java
@@ -53,9 +53,8 @@
 		int exceptionStart= methodSignature.indexOf(C_EXCEPTION_START, parametersEnd + 1);
 		if (exceptionStart == -1) {
 			return methodSignature.substring(parametersEnd + 1);
-		} else {
-			return methodSignature.substring(parametersEnd + 1, exceptionStart);
-		}
+		} 
+		return methodSignature.substring(parametersEnd + 1, exceptionStart);
 	}
 	
 	public static List getArgumentsSignature(String methodSignature) {
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ReferenceTypeImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ReferenceTypeImpl.java
index f239efb..8f5ee28 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ReferenceTypeImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ReferenceTypeImpl.java
@@ -1264,9 +1264,8 @@
 			if (type.classLoader() == null) {	// bootstrap classloader
 				if (classLoader == null) {
 					return type;
-				} else {
-					refTypeBootstrap = type;
 				}
+				refTypeBootstrap = type;
 			}
 			if (classLoader != null && classLoader.equals(type.classLoader())) {
 				return type;
@@ -1585,10 +1584,11 @@
 		initJdwpRequest();
 		try {
 			JdwpReplyPacket replyPacket = requestVM(JdwpCommandPacket.RT_SOURCE_FILE, this);
-			if (replyPacket.errorCode() == JdwpReplyPacket.ABSENT_INFORMATION)
+			if (replyPacket.errorCode() == JdwpReplyPacket.ABSENT_INFORMATION) {
 				throw new AbsentInformationException(JDIMessages.getString("ReferenceTypeImpl.Source_name_is_not_known_7")); //$NON-NLS-1$
-			else
-				defaultReplyErrorHandler(replyPacket.errorCode());
+			}
+			
+			defaultReplyErrorHandler(replyPacket.errorCode());
 		
 			DataInputStream replyData = replyPacket.dataInStream();
 			fSourceName = readString("source name", replyData); //$NON-NLS-1$
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/SourceDebugExtensionParser.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/SourceDebugExtensionParser.java
index c063c4d..fc5602c 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/SourceDebugExtensionParser.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/SourceDebugExtensionParser.java
@@ -66,9 +66,8 @@
 		public int nextLexem() throws AbsentInformationException {
 			if (fEOF) {
 				throw new AbsentInformationException(JDIMessages.getString("SourceDebugExtensionParser.0")); //$NON-NLS-1$
-			} else {
-				startWith();
-			}
+			} 
+			startWith();
 			return fLexemType;
 		}
 
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ValueImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ValueImpl.java
index 7b5513f..65cc499 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ValueImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ValueImpl.java
@@ -170,18 +170,16 @@
 				throw new InvalidTypeException(JDIMessages.getString("ValueImpl.Type_of_the_value_not_compatible_with_the_expected_type._1")); //$NON-NLS-1$
 			}
 			return null;
-		} else {
-			vm.checkVM(value);
-			TypeImpl valueType= (TypeImpl)value.type();
-			if ((type instanceof PrimitiveType) ^ (valueType instanceof PrimitiveType)) {
-				throw new InvalidTypeException(JDIMessages.getString("ValueImpl.Type_of_the_value_not_compatible_with_the_expected_type._1")); //$NON-NLS-1$
-			}
-			if (type instanceof PrimitiveType) {
-				return checkPrimitiveValue((PrimitiveValueImpl) value, (PrimitiveTypeImpl) valueType, (PrimitiveTypeImpl) type);
-			} else {
-				return (ValueImpl)value;
-			}
+		} 
+		vm.checkVM(value);
+		TypeImpl valueType= (TypeImpl)value.type();
+		if ((type instanceof PrimitiveType) ^ (valueType instanceof PrimitiveType)) {
+			throw new InvalidTypeException(JDIMessages.getString("ValueImpl.Type_of_the_value_not_compatible_with_the_expected_type._1")); //$NON-NLS-1$
 		}
+		if (type instanceof PrimitiveType) {
+			return checkPrimitiveValue((PrimitiveValueImpl) value, (PrimitiveTypeImpl) valueType, (PrimitiveTypeImpl) type);
+		} 
+		return (ValueImpl)value;
 	}
 
 	/**
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineManagerImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineManagerImpl.java
index 6f48f5c..0e9da09 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineManagerImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/VirtualMachineManagerImpl.java
@@ -129,10 +129,9 @@
 		try {
 			if (JDIDebugModel.getPreferences() != null) {
 				return JDIDebugModel.getPreferences().getInt(JDIDebugModel.PREF_REQUEST_TIMEOUT);
-			} else {
-				// JDI plug-in is not loaded
-				return JDIDebugModel.DEF_REQUEST_TIMEOUT;
-			}
+			} 
+			// JDI plug-in is not loaded
+			return JDIDebugModel.DEF_REQUEST_TIMEOUT;
 		} catch (NoClassDefFoundError e) {
 		}
 		// return the hard coded preference if the jdi debug plug-in does not exist
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketListeningConnectorImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketListeningConnectorImpl.java
index c71f190..f0081e9 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketListeningConnectorImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketListeningConnectorImpl.java
@@ -124,9 +124,8 @@
 		((SocketTransportImpl)fTransport).accept();
 		if (fTransport.isOpen()) {
 			return establishedConnection();
-		} else {
-			return null;
-		}
+		} 
+		return null;
 	}
 	
 	/**
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketTransportImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketTransportImpl.java
index 3185a0f..e66ee5f 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketTransportImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/SocketTransportImpl.java
@@ -60,10 +60,11 @@
 	 * @return Returns port number that is listened to. 
 	 */
 	public int listeningPort() {
-		if (fServerSocket != null)
+		if (fServerSocket != null) {
 			return fServerSocket.getLocalPort();
-		else
-			return 0;
+		}
+		
+		return 0;
 	}
 	
 	/**
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventQueueImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventQueueImpl.java
index 5330f40..bd43b72 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventQueueImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/event/EventQueueImpl.java
@@ -81,9 +81,8 @@
 			if (!genereatedVMDisconnectEvent) {
 				genereatedVMDisconnectEvent = true;
 				return new EventSetImpl(virtualMachineImpl(), new VMDisconnectEventImpl(virtualMachineImpl(), RequestID.nullID));
-			} else {
-				throw e;
-			}
+			} 
+			throw e;
 	 	}
 	}
 }
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/jdwp/JdwpCommandPacket.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/jdwp/JdwpCommandPacket.java
index 80296d1..9d0718d 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/jdwp/JdwpCommandPacket.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/jdwp/JdwpCommandPacket.java
@@ -308,8 +308,7 @@
 		int i = str.indexOf('_');
 		if (i < 0) {
 			return str;
-		} else {
-			return str.substring(i + 1);
-		}
+		} 
+		return str.substring(i + 1);
 	}
 }
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/jdwp/JdwpPacket.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/jdwp/JdwpPacket.java
index 6a75c90..7098bc9 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/jdwp/JdwpPacket.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/jdwp/JdwpPacket.java
@@ -91,10 +91,11 @@
 	 * @return Returns DataInputStream with reply data, or an empty stream if there is none.
 	 */
 	public DataInputStream dataInStream() {
-		if (fDataBuf != null)
+		if (fDataBuf != null) {
 			return new DataInputStream(new ByteArrayInputStream(fDataBuf));
-		else
-			return new DataInputStream(new ByteArrayInputStream(new byte[0]));
+		}
+		
+		return new DataInputStream(new ByteArrayInputStream(new byte[0]));
 	}
 
 	/**
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestImpl.java
index e7c81bb..dce1c41 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestImpl.java
@@ -142,10 +142,11 @@
 	 * @return Returns the value of the property with the specified key.
 	 */
 	public Object getProperty(Object key) {
-		if (fPropertyMap == null)
+		if (fPropertyMap == null) {
 			return null;
-		else
-			return fPropertyMap.get(key);
+		}
+		
+		return fPropertyMap.get(key);
 	}
 	
 	/**
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/JdwpCommandPacket.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/JdwpCommandPacket.java
index 6157137..4a68928 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/JdwpCommandPacket.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/JdwpCommandPacket.java
@@ -309,8 +309,7 @@
 		int i = str.indexOf('_');
 		if (i < 0) {
 			return str;
-		} else {
-			return str.substring(i + 1);
-		}
+		} 
+		return str.substring(i + 1);
 	}
 }
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/JdwpPacket.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/JdwpPacket.java
index aca97b9..b7ca11a 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/JdwpPacket.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/JdwpPacket.java
@@ -91,10 +91,11 @@
 	 * @return Returns DataInputStream with reply data, or an empty stream if there is none.
 	 */
 	public DataInputStream dataInStream() {
-		if (fDataBuf != null)
+		if (fDataBuf != null) {
 			return new DataInputStream(new ByteArrayInputStream(fDataBuf));
-		else
-			return new DataInputStream(new ByteArrayInputStream(new byte[0]));
+		}
+		
+		return new DataInputStream(new ByteArrayInputStream(new byte[0]));
 	}
 
 	/**
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/StringMatcher.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/StringMatcher.java
index 6535c86..a263540 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/StringMatcher.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/StringMatcher.java
@@ -183,10 +183,9 @@
 		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.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpoint.java
index 3eed40f..a4f0a95 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaBreakpoint.java
@@ -215,9 +215,8 @@
 		int index = name.indexOf('$');
 		if (index == -1) {
 			return name;
-		} else {
-			return name.substring(0, index);
 		}
+		return name.substring(0, index);
 	}	
 		
 	/**
@@ -254,14 +253,13 @@
 	public boolean handleEvent(Event event, JDIDebugTarget target) {
 		if (event instanceof ClassPrepareEvent) {
 			return handleClassPrepareEvent((ClassPrepareEvent)event, target);
-		} else {
-			ThreadReference threadRef= ((LocatableEvent)event).thread();
-			JDIThread thread= target.findThread(threadRef);	
-			if (thread == null || thread.isIgnoringBreakpoints()) {
-				return true;
-			}
-			return handleBreakpointEvent(event, target, thread);
-		}		
+		}
+		ThreadReference threadRef= ((LocatableEvent)event).thread();
+		JDIThread thread= target.findThread(threadRef);	
+		if (thread == null || thread.isIgnoringBreakpoints()) {
+			return true;
+		}
+		return handleBreakpointEvent(event, target, thread);		
 	}
 
 	/**
@@ -756,9 +754,8 @@
 	public String getTypeName() throws CoreException {
 		if (fInstalledTypeName == null) {
 			return ensureMarker().getAttribute(TYPE_NAME, null);
-		} else {
-			return fInstalledTypeName;
 		}
+		return fInstalledTypeName;
 	}
 	
 	/**
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaExceptionBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaExceptionBreakpoint.java
index b97eb6d..0d55fc1 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaExceptionBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaExceptionBreakpoint.java
@@ -285,12 +285,10 @@
 					}
 					if (included && !excluded) {
 						return !suspend(thread);
-					} else {
-						return true;
 					}
-				} else {
-					return !suspend(thread);
-				}
+					return true;
+				} 
+			return !suspend(thread);
 		}	
 		return true;
 	}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaLineBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaLineBreakpoint.java
index 22e6286..e9731d1 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaLineBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaLineBreakpoint.java
@@ -372,9 +372,8 @@
 				JDIDebugPlugin.log(exception);
 				return !suspendForEvent(event, thread);
 			}
-		} else {
-			return !suspendForEvent(event, thread); // Resume if suspend fails
-		}					
+		}
+		return !suspendForEvent(event, thread); // Resume if suspend fails					
 	}
 	
 	/**
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodBreakpoint.java
index 372add3..143b629 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodBreakpoint.java
@@ -424,20 +424,17 @@
 			Integer count = (Integer)event.request().getProperty(HIT_COUNT);
 			if (count != null && handleHitCount(event, count)) {
 				return true;
-			} else {
-				// no hit count
-				if (hasCondition()) {
-					try {
-						return handleConditionalBreakpointEvent(event, thread, target);
-					} catch (CoreException exception) {
-						// log error
-						return !suspendForEvent(event, thread);
-					}
-				} else {
-					return !suspendForEvent(event, thread); // Resume if suspend fails
-				}					
 			}
-			
+			// no hit count
+			if (hasCondition()) {
+				try {
+					return handleConditionalBreakpointEvent(event, thread, target);
+				} catch (CoreException exception) {
+					// log error
+					return !suspendForEvent(event, thread);
+				}
+			}
+			return !suspendForEvent(event, thread); // Resume if suspend fails					
 		} catch (CoreException e) {
 			JDIDebugPlugin.log(e);
 		}
@@ -467,14 +464,12 @@
 					JDIDebugPlugin.log(e);
 				}
 				return false;
-			}  else {
-				// count still > 0, keep running
-				return true;		
 			}
-		} else {
-			// hit count expired, keep running
-			return true;
+			// count still > 0, keep running
+			return true;		
 		}
+		// hit count expired, keep running
+		return true;
 	}
 	
 	/* (non-Javadoc)
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodEntryBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodEntryBreakpoint.java
index 108c0ae..8efc1dc 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodEntryBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaMethodEntryBreakpoint.java
@@ -153,9 +153,8 @@
 				BreakpointRequest req = type.virtualMachine().eventRequestManager().createBreakpointRequest(location);
 				configureRequest(req, target);
 				return req;
-			} else {
-				return null;
 			}
+			return null;
 		} catch (RuntimeException e) {
 			JDIDebugPlugin.log(e);
 			return null;
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaStratumLineBreakpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaStratumLineBreakpoint.java
index c41ec80..56bc94d 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaStratumLineBreakpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaStratumLineBreakpoint.java
@@ -248,17 +248,14 @@
 		if (pattern.charAt(0) == '*') {
 			if (pattern.length() == 1) {
 				return true;
-			} else {
-				return typeName.endsWith(pattern.substring(1));
 			}
-		} else {
-			int length= pattern.length();
-			if (pattern.charAt(length - 1) == '*') {
-				return typeName.startsWith(pattern.substring(0, length - 1));
-			} else {
-				return typeName.startsWith(pattern);
-			}
+			return typeName.endsWith(pattern.substring(1));
 		}
+		int length= pattern.length();
+		if (pattern.charAt(length - 1) == '*') {
+			return typeName.startsWith(pattern.substring(0, length - 1));
+		}
+		return typeName.startsWith(pattern);
 	}
 
 	/**
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaWatchpoint.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaWatchpoint.java
index fd1829a..a64bd30 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaWatchpoint.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/JavaWatchpoint.java
@@ -152,9 +152,8 @@
 			} 
 			registerRequest(modificationRequest, target);
 			return true;
-		} else {
-			notSupported(JDIDebugBreakpointMessages.getString("JavaWatchpoint.no_modification_watchpoints")); //$NON-NLS-1$
 		}
+		notSupported(JDIDebugBreakpointMessages.getString("JavaWatchpoint.no_modification_watchpoints")); //$NON-NLS-1$
 		return false;
 	}
 	
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/hcr/JavaHotCodeReplaceManager.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/hcr/JavaHotCodeReplaceManager.java
index 7962d21..b85f2da 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/hcr/JavaHotCodeReplaceManager.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/hcr/JavaHotCodeReplaceManager.java
@@ -732,20 +732,19 @@
 				if (frame.supportsDropToFrame()) {
 					affectedFrame= frame;
 					break;
-				} else {
-					// The frame we wanted to drop to cannot be popped.
-					// Set the affected frame to the next lowest poppable
-					// frame on the stack.
-					while (j > 0) {
-						j--;
-						frame= (JDIStackFrame) frames.get(j);
-						if (frame.supportsDropToFrame()) {
-							affectedFrame= frame;
-							break;
-						}
-					}
-					break;
 				}
+				// The frame we wanted to drop to cannot be popped.
+				// Set the affected frame to the next lowest poppable
+				// frame on the stack.
+				while (j > 0) {
+					j--;
+					frame= (JDIStackFrame) frames.get(j);
+					if (frame.supportsDropToFrame()) {
+						affectedFrame= frame;
+						break;
+					}
+				}
+				break;
 			}
 		}
 		return affectedFrame;
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/LogicalObjectStructureClassType.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/LogicalObjectStructureClassType.java
index b1511ab..4fbed13 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/LogicalObjectStructureClassType.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/logicalstructures/LogicalObjectStructureClassType.java
@@ -36,9 +36,8 @@
 					while (classType != null) {
 						if (classType.getName().equals(targetClass)) {
 							return true;
-						} else {
-							classType = classType.getSuperclass();
 						}
+						classType = classType.getSuperclass();
 					}
 				}
 			} catch (DebugException e) {
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIClassType.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIClassType.java
index 3a90d5c..31d845d 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIClassType.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIClassType.java
@@ -64,9 +64,8 @@
 			}
 			ObjectReference result = javaThread.newInstance(clazz, method, arguments);
 			return (IJavaObject)JDIValue.createValue(getDebugTarget(), result);
-		} else {
-			getDebugTarget().requestFailed(JDIDebugModelMessages.getString("JDIClassType.Type_is_not_a_class_type"), null); //$NON-NLS-1$
 		}
+		getDebugTarget().requestFailed(JDIDebugModelMessages.getString("JDIClassType.Type_is_not_a_class_type"), null); //$NON-NLS-1$
 		// execution will not fall through to here,
 		// as #requestFailed will throw an exception
 		return null;
@@ -93,9 +92,8 @@
 			}
 			Value result = javaThread.invokeMethod(clazz, null, method, arguments, false);
 			return JDIValue.createValue(getDebugTarget(), result);
-		} else {
-			getDebugTarget().requestFailed(JDIDebugModelMessages.getString("JDIClassType.Type_is_not_a_class_type"), null); //$NON-NLS-1$
 		}
+		getDebugTarget().requestFailed(JDIDebugModelMessages.getString("JDIClassType.Type_is_not_a_class_type"), null); //$NON-NLS-1$
 		// execution will not fall through to here,
 		// as #requestFailed will throw an exception
 		return null;
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugElement.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugElement.java
index 478f251..893c645 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugElement.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugElement.java
@@ -367,9 +367,8 @@
 		VirtualMachine vm = getVM();
 		if (vm == null) {
 			return null;
-		} else {
-			return vm.eventRequestManager();
 		}
+		return vm.eventRequestManager();
 	}
 	
 	/**
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java
index 07cf211..1331d8a 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java
@@ -1539,13 +1539,12 @@
 						break;
 				}
 				return null;
-			} else {
-				IJavaType[] types = new IJavaType[classes.size()];
-				for (int i = 0; i < types.length; i++) {
-					types[i] = JDIType.createType(this, (Type)classes.get(i));
-				}
-				return types;
 			}
+			IJavaType[] types = new IJavaType[classes.size()];
+			for (int i = 0; i < types.length; i++) {
+				types[i] = JDIType.createType(this, (Type)classes.get(i));
+			}
+			return types;
 		} catch (RuntimeException e) {
 			targetRequestFailed(MessageFormat.format("{0} occurred while retrieving class for name {1}", new String[]{e.toString(), name}), e); //$NON-NLS-1$
 			// execution will not reach this line, as
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIFieldVariable.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIFieldVariable.java
index 091756d..42c61e1 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIFieldVariable.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIFieldVariable.java
@@ -73,9 +73,8 @@
 	protected Value retrieveValue() {
 		if (getField().isStatic()) {
 			return (getField().declaringType().getValue(getField()));
-		} else {
-			return getObjectReference().getValue(getField());
-		}			
+		}
+		return getObjectReference().getValue(getField());			
 	}
 	
 	/**
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIObjectValue.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIObjectValue.java
index 23efeae..6156f96 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIObjectValue.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIObjectValue.java
@@ -150,18 +150,17 @@
 			Field field = ref.fieldByName(name);
 			if (field != null) {
 				return new JDIFieldVariable((JDIDebugTarget)getDebugTarget(), field, getUnderlyingObject());
-			} else {
-				Field enclosingThis= null;
-				Iterator fields= ref.fields().iterator();
-				while (fields.hasNext()) {
-					Field fieldTmp = (Field)fields.next();
-					if (fieldTmp.name().startsWith("this$")) { //$NON-NLS-1$
-						enclosingThis= fieldTmp;
-						break;
-					}
-				}
-				return ((JDIObjectValue)(new JDIFieldVariable((JDIDebugTarget)getDebugTarget(), enclosingThis, getUnderlyingObject())).getValue()).getField(name, false);
 			}
+			Field enclosingThis= null;
+			Iterator fields= ref.fields().iterator();
+			while (fields.hasNext()) {
+				Field fieldTmp = (Field)fields.next();
+				if (fieldTmp.name().startsWith("this$")) { //$NON-NLS-1$
+					enclosingThis= fieldTmp;
+					break;
+				}
+			}
+			return ((JDIObjectValue)(new JDIFieldVariable((JDIDebugTarget)getDebugTarget(), enclosingThis, getUnderlyingObject())).getValue()).getField(name, false);
 		} catch (RuntimeException e) {
 			targetRequestFailed(MessageFormat.format(JDIDebugModelMessages.getString("JDIObjectValue.exception_retrieving_field"), new String[]{e.toString()}), e); //$NON-NLS-1$
 		}
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java
index 0dbdad8..4c0e279 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java
@@ -1000,9 +1000,8 @@
 			Value v= getUnderlyingThread().getValue(p);
 			if (v instanceof IntegerValue) {
 				return ((IntegerValue)v).value();
-			} else {
-				requestFailed(JDIDebugModelMessages.getString("JDIThread.priority_not_an_integer"), null); //$NON-NLS-1$
 			}
+			requestFailed(JDIDebugModelMessages.getString("JDIThread.priority_not_an_integer"), null); //$NON-NLS-1$
 		} catch (RuntimeException e) {
 			targetRequestFailed(MessageFormat.format(JDIDebugModelMessages.getString("JDIThread.exception_retrieving_thread_priority"), new String[] {e.toString()}), e); //$NON-NLS-1$
 		}
@@ -1019,9 +1018,8 @@
 		List c= computeStackFrames();
 		if (c.isEmpty()) {
 			return null;
-		} else {
-			return (IStackFrame) c.get(0);
 		}
+		return (IStackFrame) c.get(0);
 	}
 
 	/**
@@ -1156,11 +1154,10 @@
 				}
 			}
 			return false;
-		} else {
-			// If the thread is not suspended, there's no way to 
-			// say for certain that it is running out of synch code
-			return false;
 		}
+		// If the thread is not suspended, there's no way to 
+		// say for certain that it is running out of synch code
+		return false;
 	}
 	
 	public boolean mayBeOutOfSynch() {
@@ -1946,10 +1943,9 @@
 					createSecondaryStepRequest();			
 					return true;		
 				// otherwise, we're done stepping
-				} else {
-					stepEnd();
-					return false;
 				}
+				stepEnd();
+				return false;
 			} catch (DebugException e) {
 				logError(e);
 				stepEnd();
@@ -2192,13 +2188,12 @@
 				if (numFrames <= getRemainingFrames()) {
 					stepEnd();
 					return false;
-				} else {
-					// reset running state and keep going
-					setRunning(true);
-					deleteStepRequest();
-					createSecondaryStepRequest();
-					return true;
 				}
+				// reset running state and keep going
+				setRunning(true);
+				deleteStepRequest();
+				createSecondaryStepRequest();
+				return true;
 			} catch (DebugException e) {
 				logError(e);
 				stepEnd();
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIValue.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIValue.java
index 9080dc7..0533dbb 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIValue.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIValue.java
@@ -125,10 +125,9 @@
 			}
 			name.append(')'); //$NON-NLS-1$
 			return name.toString();
-		} else {
-			// see bug 43285
-			return String.valueOf(fValue);
 		}
+		// see bug 43285
+		return String.valueOf(fValue);
 	}
 	
 	/**
@@ -154,9 +153,8 @@
 	public int hashCode() {
 		if (fValue == null) {
 			return getClass().hashCode();
-		} else {
-			return fValue.hashCode();
 		}
+		return fValue.hashCode();
 	}
 
 	/**
@@ -175,9 +173,8 @@
 				return false;
 			}
 			return fValue.equals(other);
-		} else {
-			return false;
-		}
+		} 
+		return false;
 	}	
 
 	/**
@@ -271,9 +268,8 @@
 	protected ArrayReference getArrayReference() {
 		if (isArray()) {
 			return (ArrayReference)fValue;
-		} else {
-			return null;
 		}
+		return null;
 	}
 
 	/**
@@ -307,9 +303,8 @@
 		try {
 			if (fValue != null) {
 				return fValue.type().signature();
-			} else {
-				return null;
 			}
+			return null;
 		} catch (RuntimeException e) {
 			targetRequestFailed(MessageFormat.format(JDIDebugModelMessages.getString("JDIValue.exception_retrieving_type_signature"), new String[] {e.toString()}), e); //$NON-NLS-1$
 			// execution will not reach this line, as
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIVariable.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIVariable.java
index 8040fb2..30bc74e 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIVariable.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIVariable.java
@@ -222,9 +222,8 @@
 	protected Value getLastKnownValue() {
 		if (fValue == null) {
 			return null;
-		} else {
-			return fValue.getUnderlyingValue();
-		}
+		} 
+		return fValue.getUnderlyingValue();
 	}
 	
 	/**