Removed unnecessary else clause

30 files changed, 171 insertions, 245 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/StringMatcher.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/StringMatcher.java
index 2c73475be..442dcdeb9 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/StringMatcher.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/StringMatcher.java
@@ -183,10 +183,9 @@ public class StringMatcher {
 		if (!fHasLeadingStar){
 			if(!regExpRegionMatches(text, start, current, 0, segLength)) {
 				return false;
-			} else {
-				++i;
-				tCurPos= tCurPos + segLength;
-			}
+			} 
+			++i;
+			tCurPos= tCurPos + segLength;
 		}
 		if ((fSegments.length == 1) && (!fHasLeadingStar) && (!fHasTrailingStar)) {
 			// only one segment to match, no wildcards specified
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java
index c8add686c..810d837da 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java
@@ -246,9 +246,8 @@ public abstract class AbstractDebugActionDelegate implements IWorkbenchWindowAct
 			ISelection s= getView().getViewSite().getSelectionProvider().getSelection();
 			if (s instanceof IStructuredSelection) {
 				return (IStructuredSelection)s;
-			} else {
-				return StructuredSelection.EMPTY;
-			}
+			} 
+			return StructuredSelection.EMPTY;
 		}
 		return fSelection;
 	}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AddToFavoritesAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AddToFavoritesAction.java
index 954b9ced7..4041d4119 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AddToFavoritesAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AddToFavoritesAction.java
@@ -85,10 +85,9 @@ public class AddToFavoritesAction extends SelectionListenerAction {
 		ILaunchConfiguration config = getLaunchConfiguration();
 		if (config == null) {
 			return false;
-		} else {
-			if (DebugUITools.isPrivate(config)) {
+		} 
+		if (DebugUITools.isPrivate(config)) {
 				return false;
-			}
 		}
 		
 		if (getGroup() != null) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorPromptStatusHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorPromptStatusHandler.java
index 9148c35f0..9e37d2a83 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorPromptStatusHandler.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorPromptStatusHandler.java
@@ -58,9 +58,7 @@ public class CompileErrorPromptStatusHandler implements IStatusHandler {
 		int returnValue = dialog.getReturnCode();
 		if (returnValue == IDialogConstants.OK_ID) {
 			return new Boolean(true);
-		} else {
-			return new Boolean(false);
 		}
-		
+		return new Boolean(false);
 	}
 }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java
index 6d0e9ee36..8e359cd25 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java
@@ -570,9 +570,8 @@ public class LaunchConfigurationManager implements ILaunchListener {
 		List list = (List)fLaunchShortcutsByPerspective.get(perpsective); 
 		if (list == null) {
 			return new ArrayList();
-		} else {
-			return filterShortcuts(list, category);
-		}
+		} 
+		return filterShortcuts(list, category);
 	}
 	
 	/**
@@ -663,9 +662,8 @@ public class LaunchConfigurationManager implements ILaunchListener {
 	public LaunchGroupExtension getDefaultLanuchGroup(String mode) {
 		if (mode.equals(ILaunchManager.DEBUG_MODE)) {
 			return getLaunchGroup(IDebugUIConstants.ID_DEBUG_LAUNCH_GROUP);
-		} else {
-			return getLaunchGroup(IDebugUIConstants.ID_RUN_LAUNCH_GROUP);
 		}
+		return getLaunchGroup(IDebugUIConstants.ID_RUN_LAUNCH_GROUP);
 	}
 	
 	/**
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java
index d5bb0d880..a24e1a3d3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java
@@ -131,9 +131,8 @@ public class LaunchConfigurationPresentationManager {
 			IStatus status = new Status(IStatus.ERROR, IDebugUIConstants.PLUGIN_ID, IDebugUIConstants.INTERNAL_ERROR,
 			 MessageFormat.format(LaunchConfigurationsMessages.getString("LaunchConfigurationPresentationManager.No_tab_group_defined_for_launch_configuration_type_{0}_3"), (new String[] {type.getIdentifier()})), null);  //$NON-NLS-1$
 			 throw new CoreException(status);
-		} else {
-			return ext.newTabGroup();
-		}		
+		} 
+		return ext.newTabGroup();		
 	}
 	
 	/**
@@ -176,9 +175,8 @@ public class LaunchConfigurationPresentationManager {
 			IStatus status = new Status(IStatus.ERROR, IDebugUIConstants.PLUGIN_ID, IDebugUIConstants.INTERNAL_ERROR,
 			 MessageFormat.format(LaunchConfigurationsMessages.getString("LaunchConfigurationPresentationManager.No_tab_group_defined_for_launch_configuration_type_{0}_3"), (new String[] {type.getIdentifier()})), null); //$NON-NLS-1$
 			 throw new CoreException(status);
-		} else {
-			return ext.getHelpContextId();
-		}		
+		} 
+		return ext.getHelpContextId();		
 	}
 }
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java
index 971e24476..ec59270dd 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java
@@ -389,9 +389,8 @@ public class LaunchConfigurationTabGroupViewer extends Viewer {
 	public ISelection getSelection() {
 		if (getActiveTab() == null) {
 			return new StructuredSelection();
-		} else {
-			return new StructuredSelection(getActiveTab());
-		}
+		} 
+		return new StructuredSelection(getActiveTab());
 	}
 
 	/**
@@ -446,9 +445,8 @@ public class LaunchConfigurationTabGroupViewer extends Viewer {
 		if (input == null) {
 			if (fInput == null) {
 				return;
-			} else {
-				inputChanged(input);
 			}
+			inputChanged(input);
 		} else {
 			if (!input.equals(fInput)) {
 				inputChanged(input);
@@ -966,9 +964,8 @@ public class LaunchConfigurationTabGroupViewer extends Viewer {
 		ILaunchConfigurationTab activeTab = getActiveTab();
 		if (activeTab == null) {
 			return null;
-		} else {
-			message = activeTab.getErrorMessage();
-		}
+		} 
+		message = activeTab.getErrorMessage();
 		if (message != null) {
 			return message;
 		}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTreeContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTreeContentProvider.java
index f91914597..757927e94 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTreeContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTreeContentProvider.java
@@ -107,9 +107,8 @@ public class LaunchConfigurationTreeContentProvider implements ITreeContentProvi
 	public boolean hasChildren(Object element) {
 		if (element instanceof ILaunchConfiguration) {
 			return false;
-		} else {
-			return getChildren(element).length > 0;
-		}
+		} 
+		return getChildren(element).length > 0;
 	}
 
 	/**
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
index c26a7d813..393a3809f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
@@ -505,9 +505,8 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
 		Shell shell = getShell();
 		if (shell != null) {
 			return shell.getDisplay();
-		} else {
-			return Display.getDefault();
-		}
+		} 
+		return Display.getDefault();
 	}
 		
 	/**
@@ -951,9 +950,8 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
  	public ILaunchConfigurationTab[] getTabs() {
  		if (getTabGroup() == null) {
  			return null;
- 		} else {
- 			return getTabGroup().getTabs();
- 		}
+ 		} 
+ 		return getTabGroup().getTabs();
  	} 	
  	
 	/**
@@ -963,9 +961,8 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
 	private boolean canDiscardCurrentConfig() {				
 		if (getTabViewer().isDirty()) {
 			return showUnsavedChangesDialog();
-		} else {
-			return true;
 		}
+		return true;
 	}
 	
 	/**
@@ -977,9 +974,8 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
 	private boolean showUnsavedChangesDialog() {
 		if (getTabViewer().canSave()) {
 			return showSaveChangesDialog();
-		} else {
-			return showDiscardChangesDialog();
 		}
+		return showDiscardChangesDialog();
 	}
 	
 	/**
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchHistory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchHistory.java
index b43283cd2..c66752d20 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchHistory.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchHistory.java
@@ -370,10 +370,9 @@ public class LaunchHistory implements ILaunchListener, ILaunchConfigurationListe
 				if (fav) {
 					addFavorite(configuration);
 					return true;
-				} else {
-					removeFavorite(configuration);
-					return false;
-				}
+				} 
+				removeFavorite(configuration);
+				return false;
 			} else if (favoriteGroups.contains(getLaunchGroup().getIdentifier())) {
 				addFavorite(configuration);
 				return true;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/WorkingSetComparator.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/WorkingSetComparator.java
index e817ec726..32fe159b0 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/WorkingSetComparator.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/WorkingSetComparator.java
@@ -30,9 +30,8 @@ public class WorkingSetComparator implements Comparator {
 		if (one == null || two == null) {
 			if (one == two) {
 				return 0;
-			} else {
-				return -1;
 			}
+			return -1;
 		}
 		if (one.startsWith("${working_set:") && two.startsWith("${working_set:")) {		  //$NON-NLS-1$//$NON-NLS-2$
 			IWorkingSet workingSet1 = RefreshTab.getWorkingSet(one);
@@ -40,16 +39,14 @@ public class WorkingSetComparator implements Comparator {
 			if (workingSet1 == null || workingSet2 == null) {
 				if (workingSet1 == workingSet2) {
 					return 0;
-				} else {
-					return -1;
 				}
+				return -1;
 			}
 			if (workingSet1.equals(workingSet2)) {
 				return 0;
 			}
 			return -1;
-		} else {
-			return one.compareTo(two);
-		}
+		} 
+		return one.compareTo(two);
 	}
 }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/AddContainerAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/AddContainerAction.java
index 65fbaac5b..b640b0d9c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/AddContainerAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/AddContainerAction.java
@@ -46,8 +46,7 @@ public class AddContainerAction extends SourceContainerAction {
 	protected boolean updateSelection(IStructuredSelection selection) {
 		if(selection == null || selection.isEmpty()) {
 			return true;
-		} else {
-			return getViewer().getTree().getSelection()[0].getParentItem()==null;
-		}
+		} 
+		return getViewer().getTree().getSelection()[0].getParentItem()==null;
 	}
 }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleDocumentPartitioner.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleDocumentPartitioner.java
index 0d8adeb12..cd5206be4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleDocumentPartitioner.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleDocumentPartitioner.java
@@ -321,20 +321,19 @@ public class ConsoleDocumentPartitioner implements IDocumentPartitioner, IDocume
 	public ITypedRegion[] computePartitioning(int offset, int length) {
 		if (offset == 0 && length == fDocument.getLength()) {
 			return (ITypedRegion[])fPartitions.toArray(new ITypedRegion[fPartitions.size()]);
-		} else {
-			int end = offset + length;
-			List list = new ArrayList();
-			for (int i = 0; i < fPartitions.size(); i++) {
-				ITypedRegion partition = (ITypedRegion)fPartitions.get(i);
-				int partitionStart = partition.getOffset();
-				int partitionEnd = partitionStart + partition.getLength();
-				if ((offset >= partitionStart && offset <= partitionEnd) ||
-					(offset < partitionStart && end >= partitionStart)) {
-						list.add(partition);
-				} 
-			}
-			return (ITypedRegion[])list.toArray(new ITypedRegion[list.size()]);
+		} 
+		int end = offset + length;
+		List list = new ArrayList();
+		for (int i = 0; i < fPartitions.size(); i++) {
+			ITypedRegion partition = (ITypedRegion)fPartitions.get(i);
+			int partitionStart = partition.getOffset();
+			int partitionEnd = partitionStart + partition.getLength();
+			if ((offset >= partitionStart && offset <= partitionEnd) ||
+				(offset < partitionStart && end >= partitionStart)) {
+					list.add(partition);
+			} 
 		}
+		return (ITypedRegion[])list.toArray(new ITypedRegion[list.size()]);
 	}
 
 	/**
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleViewer.java
index a5aef77a4..4d421050a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleViewer.java
@@ -475,10 +475,9 @@ public class ConsoleViewer extends TextViewer implements IPropertyChangeListener
 			if (link != null) {
 				if (link.equals(fHyperLink)) {
 					return;
-				} else {
-					linkEntered(link);
-					return;
-				}
+				} 
+				linkEntered(link);
+				return;
 			}
 		}
 		if (fHyperLink != null) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java
index a99b175cf..2b3296f63 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java
@@ -105,9 +105,8 @@ public class ProcessConsole extends AbstractConsole implements IDebugEventSetLis
 		
 		if (process.isTerminated()) {
 			return MessageFormat.format(ConsoleMessages.getString("ProcessConsole.0"), new String[]{label}); //$NON-NLS-1$
-		} else {
-			return label;
-		}
+		} 
+		return label;
 	}
 
 	/**
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePage.java
index b67b5c3ed..49015eea9 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePage.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePage.java
@@ -404,16 +404,15 @@ public class ProcessConsolePage implements IPageBookViewPage, ISelectionListener
 		IProcess process = getProcess();
 		if (process == null) {
 			return null;
+		} 
+		IDebugTarget target = (IDebugTarget)process.getAdapter(IDebugTarget.class);
+		ISelection selection = null;
+		if (target == null) {
+			selection = new StructuredSelection(process);
 		} else {
-			IDebugTarget target = (IDebugTarget)process.getAdapter(IDebugTarget.class);
-			ISelection selection = null;
-			if (target == null) {
-				selection = new StructuredSelection(process);
-			} else {
-				selection = new StructuredSelection(target);
-			}
-			return new ShowInContext(null, selection);
+			selection = new StructuredSelection(target);
 		}
+		return new ShowInContext(null, selection);
 	}
 	
 	/* (non-Javadoc)
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionInformationControl.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionInformationControl.java
index bfc4a4f65..135423197 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionInformationControl.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionInformationControl.java
@@ -113,18 +113,15 @@ public class ExpressionInformationControl extends PopupInformationControl {
 		VariablesView expressionsView = (VariablesView)page.findView(IDebugUIConstants.ID_EXPRESSION_VIEW);
 		if (expressionsView != null && expressionsView.isVisible()) {
 			return expressionsView;
-		} else {
-			VariablesView variablesView = (VariablesView)page.findView(IDebugUIConstants.ID_VARIABLE_VIEW);
-			if (variablesView != null && variablesView.isVisible()) {
-				return variablesView;
-			} else {
-				if (expressionsView != null) {
-					return expressionsView;
-				} else {
-					return variablesView;
-				}
-			}
 		}
+		VariablesView variablesView = (VariablesView)page.findView(IDebugUIConstants.ID_VARIABLE_VIEW);
+		if (variablesView != null && variablesView.isVisible()) {
+			return variablesView;
+		}
+		if (expressionsView != null) {
+			return expressionsView;
+		} 
+		return variablesView;
 	}
 
 	/*
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/PopupInformationControl.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/PopupInformationControl.java
index 2df81adf6..5a6a88227 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/PopupInformationControl.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/PopupInformationControl.java
@@ -180,15 +180,14 @@ public abstract class PopupInformationControl implements IInformationControl, II
 		Point persistedSize = getInitialSize();
 		if (persistedSize != null) {
 			return persistedSize;
-		} else {
-			Point computedSize = shell.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
-			
-			if (maxWidth > 0 && computedSize.x > maxWidth)
-				computedSize.x = maxWidth;
-			if (maxHeight > 0 && computedSize.y > maxHeight)
-				computedSize.y = maxHeight;
-			return computedSize;
 		}
+		
+		Point computedSize = shell.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
+		if (maxWidth > 0 && computedSize.x > maxWidth)
+			computedSize.x = maxWidth;
+		if (maxHeight > 0 && computedSize.y > maxHeight)
+			computedSize.y = maxHeight;
+		return computedSize;
 	}
 	
 	/* (non-Javadoc)
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryAction.java
index bf8cd3f0f..87063efed 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryAction.java
@@ -86,12 +86,9 @@ abstract public class AbstractMemoryAction extends Action
 				
 				return topTap;
 			}
-			else
-			{
-				return null;
-			}
-		}
-		else
 			return null;
+		}
+		
+		return null;
 	}
 }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractTableViewTabLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractTableViewTabLabelProvider.java
index 50dbcb8bc..65c9381af 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractTableViewTabLabelProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractTableViewTabLabelProvider.java
@@ -73,10 +73,10 @@ abstract public class AbstractTableViewTabLabelProvider extends LabelProvider im
 			// if memory in the range has changed, return delta icon
 			int startOffset = (columnIndex-1)*fViewTab.getColumnSize();
 			int endOffset = startOffset + fViewTab.getColumnSize() - 1;
-			if (((MemoryViewLine)element).isRangeChange(startOffset, endOffset))
+			if (((MemoryViewLine)element).isRangeChange(startOffset, endOffset)) {
 				return DebugPluginImages.getImage(IInternalDebugUIConstants.IMG_OBJECT_MEMORY_CHANGED);
-			else
-				return DebugPluginImages.getImage(IInternalDebugUIConstants.IMG_OBJECT_MEMORY);	
+			}
+			return DebugPluginImages.getImage(IInternalDebugUIConstants.IMG_OBJECT_MEMORY);	
 		}
 	}
 	
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlockViewSynchronizer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlockViewSynchronizer.java
index ecd930ae4..c9b51ef12 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlockViewSynchronizer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlockViewSynchronizer.java
@@ -66,11 +66,8 @@ public class MemoryBlockViewSynchronizer implements IMemoryBlockViewSynchronizer
 		{
 			return;
 		}
-		else
-		{
-			SynchronizeInfo info = (SynchronizeInfo)fSynchronizeInfo.get(key);
-			info.removeSynchronizedView(view);				
-		}
+		SynchronizeInfo info = (SynchronizeInfo)fSynchronizeInfo.get(key);
+		info.removeSynchronizedView(view);				
 	}
 
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewCellModifier.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewCellModifier.java
index 733051b93..5b2f9c0c2 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewCellModifier.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewCellModifier.java
@@ -63,26 +63,23 @@ public class MemoryViewCellModifier implements ICellModifier
 			}
 			
 			MemoryViewLine line = (MemoryViewLine)element;
-			if (MemoryViewLine.P_ADDRESS.equals(property))
+			if (MemoryViewLine.P_ADDRESS.equals(property)) {
 			   return false;
-			else
-			{
-				int offset = Integer.valueOf(property, 16).intValue();
-				int end = offset + fViewTab.getColumnSize();
-				
+			}
+			int offset = Integer.valueOf(property, 16).intValue();
+			int end = offset + fViewTab.getColumnSize();
 			
-				for (int i=offset; i<end; i++)
+			for (int i=offset; i<end; i++)
+			{
+				MemoryByte oneByte = line.getByte(i);
+//				if (((oneByte.flags & MemoryByte.VALID) != MemoryByte.VALID) || 
+//					((oneByte.flags & MemoryByte.READONLY) == MemoryByte.READONLY))
+				if ((oneByte.flags & MemoryByte.READONLY) == MemoryByte.READONLY)
 				{
-					MemoryByte oneByte = line.getByte(i);
-//					if (((oneByte.flags & MemoryByte.VALID) != MemoryByte.VALID) || 
-//						((oneByte.flags & MemoryByte.READONLY) == MemoryByte.READONLY))
-					if ((oneByte.flags & MemoryByte.READONLY) == MemoryByte.READONLY)
-					{
-						canModify = false;
-					}
+					canModify = false;
 				}
-				return canModify;
-			}	
+			}
+			return canModify;
 		}
 		catch (NumberFormatException e)
 		{
@@ -106,39 +103,34 @@ public class MemoryViewCellModifier implements ICellModifier
 		{
 			if (MemoryViewLine.P_ADDRESS.equals(property))
 			   return line.getAddress();
-			else
-			{	
-				int offset = Integer.valueOf(property, 16).intValue();
-				int end = offset + fViewTab.getColumnSize();
-				
+			
+			int offset = Integer.valueOf(property, 16).intValue();
+			int end = offset + fViewTab.getColumnSize();
+			
 
-				//Ask for label provider
-				MemoryByte[] memory = line.getBytes(offset, end);
+			//Ask for label provider
+			MemoryByte[] memory = line.getBytes(offset, end);
 
-				IBaseLabelProvider labelProvider = ((MemoryViewTab)fViewTab).getTableViewer().getLabelProvider();
-				if(labelProvider instanceof AbstractTableViewTabLabelProvider)
-				{	
+			IBaseLabelProvider labelProvider = ((MemoryViewTab)fViewTab).getTableViewer().getLabelProvider();
+			if(labelProvider instanceof AbstractTableViewTabLabelProvider)
+			{	
+				
+				if (line.isAvailable(offset, end))
+				{
+					// ask the renderer for a string representation of the bytes
+					offset  = Integer.valueOf(property, 16).intValue();
+					AbstractMemoryRenderer renderer = ((AbstractTableViewTabLabelProvider)labelProvider).getRenderer();
+					
+					BigInteger address = new BigInteger(((MemoryViewLine)element).getAddress(), 16);
+					address = address.add(BigInteger.valueOf(offset)); 
 					
-					if (line.isAvailable(offset, end))
-					{
-						// ask the renderer for a string representation of the bytes
-						offset  = Integer.valueOf(property, 16).intValue();
-						AbstractMemoryRenderer renderer = ((AbstractTableViewTabLabelProvider)labelProvider).getRenderer();
-						
-						BigInteger address = new BigInteger(((MemoryViewLine)element).getAddress(), 16);
-						address = address.add(BigInteger.valueOf(offset)); 
-						
-						return renderer.getString(fViewTab.getRenderingId(), address, memory, line.getPaddedString());
-					}
-					else
-					{
-						// if the range is not available, just return padded string
-						return line.getPaddedString(offset, end);
-					}
+					return renderer.getString(fViewTab.getRenderingId(), address, memory, line.getPaddedString());
 				}
-				
-				return ""; //$NON-NLS-1$
+				// if the range is not available, just return padded string
+				return line.getPaddedString(offset, end);
 			}
+				
+			return ""; //$NON-NLS-1$
 		}
 		catch (NumberFormatException e)
 		{
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewContentProvider.java
index c80e9f014..ee455482b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewContentProvider.java
@@ -606,10 +606,10 @@ public class MemoryViewContentProvider extends BasicDebugViewContentProvider {
 			newBaseAddress = new BigInteger("0"); //$NON-NLS-1$
 		}
 		
-		if (newBaseAddress.compareTo(fBaseAddress) != 0)
+		if (newBaseAddress.compareTo(fBaseAddress) != 0) {
 			return true;
-		else
-			return false;			
+		}
+		return false;			
 	}
 	
 	public void forceRefresh()
@@ -789,14 +789,8 @@ public class MemoryViewContentProvider extends BasicDebugViewContentProvider {
 			{
 				return false;
 			}
-			else
-			{
-				return true;
-			}
-		}
-		else
-		{
 			return true;
 		}
+		return true;
 	}
 }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewLine.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewLine.java
index 2d9ad64b0..2007881ba 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewLine.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewLine.java
@@ -56,11 +56,11 @@ public class MemoryViewLine extends Object {
 		if (fBytes == null)
 			return null;
 		
-		if (offset < fBytes.length)
+		if (offset < fBytes.length) {
 			return fBytes[offset];
-		else
-			return null;	
-			
+		}
+		
+		return null;		
 	}
 	
 	public MemoryByte[] getBytes(int start, int end)
@@ -244,10 +244,10 @@ public class MemoryViewLine extends Object {
 			return false;
 		
 		// if the string representation is not the same, this line has changed
-		if (oldData.getRawMemoryString().equals(getRawMemoryString()))
+		if (oldData.getRawMemoryString().equals(getRawMemoryString())) {
 			return false;
-		else
-			return true;
+		}
+		return true;
 	}
 	
 	/**
@@ -264,10 +264,10 @@ public class MemoryViewLine extends Object {
 			ret |= fBytes[i].flags;
 		}
 		
-		if ((ret&MemoryByte.CHANGED) == MemoryByte.CHANGED)
+		if ((ret&MemoryByte.CHANGED) == MemoryByte.CHANGED) {
 			return true;
-		else
-			return false;
+		}
+		return false;
 	}
 	
 	public void unmarkDeltas()
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTab.java
index 06c0256a8..5e06d4a16 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTab.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTab.java
@@ -249,10 +249,7 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 			{
 				return ((IMemoryBlockModelPresentation)presentation).getTabLabel(blk, getRenderingId()); 
 			}
-			else
-			{
-				return null;
-			}
+			return null;
 		}
 
 		/* (non-Javadoc)
@@ -266,10 +263,7 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 			{
 				return ((IMemoryBlockModelPresentation)presentation).getColumnLabels(blk, bytesPerLine, columnSize); 
 			}
-			else
-			{
-				return new String[0];
-			}
+			return new String[0];
 		}
 
 		/* (non-Javadoc)
@@ -283,10 +277,7 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 			{
 				return ((IMemoryBlockModelPresentation)presentation).getAddressPresentation(blk, address); 
 			}
-			else
-			{
-				return null;
-			}
+			return null;
 		}
 	}
 
@@ -1180,10 +1171,7 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 			
 			return bigInt;
 		}
-		else
-		{
-			return BigInteger.valueOf(0);
-		}
+		return BigInteger.valueOf(0);
 	}
 
 	/**
@@ -1721,10 +1709,10 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 		if(fTextViewer == null)
 			return false;
 		
-		if (fTabItem.getControl() == fTextViewer.getControl())
+		if (fTabItem.getControl() == fTextViewer.getControl()) {
 			return true;
-		else
-			return false;
+		}
+		return false;
 	}
 	
 	public void displayTable()
@@ -2051,10 +2039,10 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 	 */
 	public String getTabLabel()
 	{
-		if (fTabItem != null)
+		if (fTabItem != null) {
 			return fTabItem.getText();
-		else
-			return null;	
+		}
+		return null;	
 	}
 	
 	/* (non-Javadoc)
@@ -2278,10 +2266,7 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 		{
 			return true;
 		}
-		else
-		{
-			return false;
-		}
+		return false;
 	}
 
 	/**
@@ -2471,10 +2456,8 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 			
 			return false;
 		}
-		else
-		{
-			return false;
-		}
+		
+		return false;
 	}
 	
 	private Object getSynchronizedProperty(String propertyId)
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java
index 04bccfa8a..ca8d4616c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java
@@ -61,10 +61,11 @@ public class MemoryViewUtil {
 		if (debugTarget.isTerminated() && debugTarget.isDisconnected())
 			return false;
 		
-		if (memRetrieval.supportsStorageRetrieval())
+		if (memRetrieval.supportsStorageRetrieval()) {
 			return true;
-		else
-			return false;
+		}
+		
+		return false;
 	}	
 
 	
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SynchronizeInfo.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SynchronizeInfo.java
index 778f34f9a..f78e8953e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SynchronizeInfo.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SynchronizeInfo.java
@@ -100,17 +100,14 @@ public class SynchronizeInfo
 		public boolean isValidProperty(String property){
 			if (fFilters == null)
 				return true;
-			else
+			for (int i=0; i<fFilters.length; i++)
 			{
-				for (int i=0; i<fFilters.length; i++)
+				if (fFilters[i].equals(property))
 				{
-					if (fFilters[i].equals(property))
-					{
-						return true;
-					}
+					return true;
 				}
-				return false;
-			}		
+			}
+			return false;
 		}
 
 		/**
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersViewerState.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersViewerState.java
index c25b516e0..d8739f410 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersViewerState.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersViewerState.java
@@ -78,9 +78,7 @@ public class RegistersViewerState extends AbstractViewerState {
 			if ( element == null ) {
 				return null;
 			} 
-			else {
-				parent = element;
-			}
+			parent = element;
 		}
 		return element;
 	}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ViewerState.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ViewerState.java
index 6505cf01d..08d12ae5e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ViewerState.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ViewerState.java
@@ -70,9 +70,8 @@ public class ViewerState extends AbstractViewerState {
 			}
 			if (variable == null) {
 				return null;
-			} else {
-				parent = variable;
-			}
+			} 
+			parent = variable;
 		}
 		return variable;
 	}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/RefreshTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/RefreshTab.java
index 926d31758..e5dd85e11 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/RefreshTab.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/RefreshTab.java
@@ -467,26 +467,24 @@ public class RefreshTab extends AbstractLaunchConfigurationTab {
 			IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
 			if (resource == null) {
 				throw new CoreException(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.INTERNAL_ERROR, MessageFormat.format(StringSubstitutionMessages.getString("RefreshTab.38"), new String[]{pathString}), null)); //$NON-NLS-1$
-			} else {
-				return new IResource[]{resource};
-			}
+			} 
+			return new IResource[]{resource};
 		} else if (scope.startsWith("${working_set:")) { //$NON-NLS-1$
 			IWorkingSet workingSet =  getWorkingSet(scope);
 			if (workingSet == null) {
 				throw new CoreException(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.INTERNAL_ERROR, StringSubstitutionMessages.getString("RefreshTab.39"), null)); //$NON-NLS-1$
-			} else {
-				IAdaptable[] elements = workingSet.getElements();
-				IResource[] resources = new IResource[elements.length];
-				for (int i = 0; i < elements.length; i++) {
-					IAdaptable adaptable = elements[i];
-					if (adaptable instanceof IResource) {
-						resources[i] = (IResource) adaptable;
-					} else {
-						resources[i] = (IResource) adaptable.getAdapter(IResource.class);
-					}
+			} 
+			IAdaptable[] elements = workingSet.getElements();
+			IResource[] resources = new IResource[elements.length];
+			for (int i = 0; i < elements.length; i++) {
+				IAdaptable adaptable = elements[i];
+				if (adaptable instanceof IResource) {
+					resources[i] = (IResource) adaptable;
+				} else {
+					resources[i] = (IResource) adaptable.getAdapter(IResource.class);
 				}
-				return resources;				
 			}
+			return resources;				
 		} else if(scope.equals("${workspace}")) { //$NON-NLS-1$
 			return new IResource[]{ResourcesPlugin.getWorkspace().getRoot()};
 		} else {