*** empty log message ***

17 files changed, 48 insertions, 73 deletions

diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java
index 0802cb29d..0ce13face 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java
@@ -141,12 +141,11 @@ public final class BaseHelpSystem {
 				getInstance().internalBrowser = BrowserManager.getInstance()
 						.createBrowser(false);
 			return getInstance().internalBrowser;
-		} else {
-			if (getInstance().browser == null)
-				getInstance().browser = BrowserManager.getInstance()
-						.createBrowser(true);
-			return getInstance().browser;
 		}
+		if (getInstance().browser == null)
+			getInstance().browser = BrowserManager.getInstance()
+					.createBrowser(true);
+		return getInstance().browser;
 	}
 
 	public static synchronized HelpDisplay getHelpDisplay() {
@@ -420,9 +419,8 @@ public final class BaseHelpSystem {
 				if ((i + 1) < args.length
 						&& "rtl".equalsIgnoreCase(args[i + 1])) { //$NON-NLS-1$
 					return true;
-				} else {
-					return false;
 				}
+				return false;
 			}
 		}
 
@@ -440,10 +438,8 @@ public final class BaseHelpSystem {
 				|| locale.startsWith("he") || locale.startsWith("iw") //$NON-NLS-1$//$NON-NLS-2$
 				|| locale.startsWith("ur")) { //$NON-NLS-1$
 			return true;
-		} else {
-			return false;
 		}
-
+		return false;
 	}
 
 	public static boolean isRTL() {
@@ -459,7 +455,7 @@ public final class BaseHelpSystem {
 		try {
 			Class c = bundle.loadClass(className);
 			Object o = c.newInstance();
-			Runnable runnable = null;
+			//Runnable runnable = null;
 			if (o != null && o instanceof ILiveHelpAction) {
 				ILiveHelpAction helpExt = (ILiveHelpAction) o;
 				if (arg != null)
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java
index 2bf59ba1f..fce77aeb1 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java
@@ -86,9 +86,8 @@ public class HelpApplication implements IPlatformRunnable, IExecutableExtension
 		releaseLock();
 		if (status == STATUS_RESTARTING) {
 			return EXIT_RESTART;
-		} else {
-			return EXIT_OK;
 		}
+		return EXIT_OK;
 	}
 	/**
 	 * @see IExecutableExtension
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java
index 95f7e61a8..81b7004ae 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java
@@ -264,9 +264,8 @@ public class BrowserManager {
 		}
 		if (isEmbeddedBrowserPresent() && !alwaysUseExternal) {
 			return internalBrowserDesc.getID();
-		} else {
-			return getCurrentBrowserID();
 		}
+		return getCurrentBrowserID();
 	}
 
 	/**
@@ -334,11 +333,9 @@ public class BrowserManager {
 		if (external) {
 			return new CurrentBrowser(createBrowserAdapter(true),
 					getCurrentBrowserID(), true);
-		} else {
-			return new CurrentBrowser(createBrowserAdapter(alwaysUseExternal),
-					getCurrentInternalBrowserID(), false);
-
 		}
+		return new CurrentBrowser(createBrowserAdapter(alwaysUseExternal),
+				getCurrentInternalBrowserID(), false);
 	}
 
 	/**
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CurrentBrowser.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CurrentBrowser.java
index 4d0111d99..f76417d21 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CurrentBrowser.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CurrentBrowser.java
@@ -73,10 +73,9 @@ public class CurrentBrowser implements IBrowser {
 		checkDefaultAdapter();
 		if (newBrowserAdapterId == null) {
 			return browserAdapter.isSetLocationSupported();
-		} else {
-			return browserAdapter.isSetLocationSupported()
-					|| newBrowserAdapter.isSetLocationSupported();
 		}
+		return browserAdapter.isSetLocationSupported()
+				|| newBrowserAdapter.isSetLocationSupported();
 	}
 	/**
 	 * @see org.eclipse.help.browser.IBrowser#isSetSizeSupported()
@@ -85,10 +84,9 @@ public class CurrentBrowser implements IBrowser {
 		checkDefaultAdapter();
 		if (newBrowserAdapterId == null) {
 			return browserAdapter.isSetSizeSupported();
-		} else {
-			return browserAdapter.isSetSizeSupported()
-					|| newBrowserAdapter.isSetSizeSupported();
 		}
+		return browserAdapter.isSetSizeSupported()
+				|| newBrowserAdapter.isSetSizeSupported();
 	}
 	/**
 	 * @see org.eclipse.help.browser.IBrowser#setLocation(int, int)
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaFactory.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaFactory.java
index 56710f7bf..66c73c76e 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaFactory.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaFactory.java
@@ -43,9 +43,8 @@ public class MozillaFactory implements IBrowserFactory, IExecutableExtension {
 			int ret = pr.exitValue();
 			if (ret == 0) {
 				return !errorsInOutput(outputs, errors);
-			} else {
-				return false;
 			}
+			return false;
 		} catch (InterruptedException e) {
 			return false;
 		} catch (IOException e) {
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/AnalyzerDescriptor.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/AnalyzerDescriptor.java
index 19fe210e5..cea656292 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/AnalyzerDescriptor.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/AnalyzerDescriptor.java
@@ -105,24 +105,22 @@ public class AnalyzerDescriptor {
 						.createExecutableExtension("class"); //$NON-NLS-1$
 				if (!(analyzer instanceof Analyzer))
 					continue;
-				else {
-					String pluginId = configElements[i].getNamespace();
-					String pluginVersion = (String) Platform
-							.getBundle(pluginId).getHeaders().get(
-									Constants.BUNDLE_VERSION);
-					this.luceneAnalyzer = (Analyzer) analyzer;
-					this.id = pluginId + "#" + pluginVersion; //$NON-NLS-1$
-					this.lang = locale;
-					if (HelpBasePlugin.PLUGIN_ID.equals(pluginId)) {
-						// The analyzer is contributed by help plugin.
-						// Continue in case there is another analyzer for the
-						// same locale
-						// let another analyzer take precendence over one from
-						// help
-					} else {
-						// the analyzer does not come from help
-						return this.luceneAnalyzer;
-					}
+				String pluginId = configElements[i].getNamespace();
+				String pluginVersion = (String) Platform
+						.getBundle(pluginId).getHeaders().get(
+								Constants.BUNDLE_VERSION);
+				this.luceneAnalyzer = (Analyzer) analyzer;
+				this.id = pluginId + "#" + pluginVersion; //$NON-NLS-1$
+				this.lang = locale;
+				if (HelpBasePlugin.PLUGIN_ID.equals(pluginId)) {
+					// The analyzer is contributed by help plugin.
+					// Continue in case there is another analyzer for the
+					// same locale
+					// let another analyzer take precendence over one from
+					// help
+				} else {
+					// the analyzer does not come from help
+					return this.luceneAnalyzer;
 				}
 			} catch (CoreException ce) {
 				HelpBasePlugin.logError(
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/HTMLDocParser.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/HTMLDocParser.java
index 496e33e37..c342db5cd 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/HTMLDocParser.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/HTMLDocParser.java
@@ -233,9 +233,8 @@ public class HTMLDocParser {
 							// head element closed, we are too far, stop
 							// processing input
 							return null;
-						} else {
-							stateElement = STATE_ELEMENT_START;
 						}
+						stateElement = STATE_ELEMENT_START;
 						break;
 					default : // STATE_META_IN :
 						switch (token) {
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchManager.java
index 76a121979..0e29ab54b 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchManager.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchManager.java
@@ -160,12 +160,10 @@ public class SearchManager implements ITocsChangedListener {
 				pm.worked(1);
 				pm.done();
 				return;
-			} else {
-				if (pm instanceof SearchProgressMonitor) {
-					((SearchProgressMonitor) pm).started();
-				}
 			}
-			//
+			if (pm instanceof SearchProgressMonitor) {
+				((SearchProgressMonitor) pm).started();
+			}
 			updateIndex(pm, index, progressDistrib);
 		} finally {
 			progressDistrib.removeMonitor(pm);
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneHelp.java b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneHelp.java
index dc243d836..628036d2d 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneHelp.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneHelp.java
@@ -59,9 +59,8 @@ public class StandaloneHelp extends EclipseController {
 
 			if (help.executeCommand(helpCommand)) {
 				return;
-			} else {
-				printMainUsage();
 			}
+			printMainUsage();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneInfocenter.java b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneInfocenter.java
index 9c89e30ca..c91bdb4fe 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneInfocenter.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneInfocenter.java
@@ -59,9 +59,8 @@ public class StandaloneInfocenter extends EclipseController {
 			
 			if (infocenter.executeCommand(helpCommand)) {
 				return;
-			} else {
-				printMainUsage();
 			}
+			printMainUsage();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableHelpResource.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableHelpResource.java
index ca813f5a9..ce45f282d 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableHelpResource.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableHelpResource.java
@@ -37,8 +37,7 @@ public abstract class AdaptableHelpResource
 	public Object getAdapter(Class adapter) {
 		if (adapter == IHelpResource.class)
 			return element;
-		else
-			return null;
+		return null;
 	}
 
 	public abstract void saveState(Element element);
@@ -80,8 +79,7 @@ public abstract class AdaptableHelpResource
 	public int hashCode() {
 		if (element == null)
 			return -1;
-		else
-			return element.hashCode();
+		return element.hashCode();
 	}
 
 	/**
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableToc.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableToc.java
index bf2582598..d25e18c4d 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableToc.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableToc.java
@@ -33,8 +33,7 @@ public class AdaptableToc extends AdaptableHelpResource {
 	public Object getAdapter(Class adapter) {
 		if (adapter == IToc.class)
 			return element;
-		else
-			return super.getAdapter(adapter);
+		return super.getAdapter(adapter);
 	}
 
 	public AdaptableHelpResource[] getChildren() {
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTocsArray.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTocsArray.java
index 44d2e5265..0edc04e66 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTocsArray.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTocsArray.java
@@ -37,8 +37,7 @@ public class AdaptableTocsArray implements IAdaptable {
 	public Object getAdapter(Class adapter) {
 		if (adapter == IToc[].class)
 			return element;
-		else
-			return null;
+		return null;
 	}
 
 	public IAdaptable[] getChildren() {
@@ -97,8 +96,7 @@ public class AdaptableTocsArray implements IAdaptable {
 	public int hashCode() {
 		if (element == null)
 			return -1;
-		else
-			return element.hashCode();
+		return element.hashCode();
 	}
 }
 
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTopic.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTopic.java
index 810aee19f..784e5c05a 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTopic.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTopic.java
@@ -38,8 +38,7 @@ public class AdaptableTopic extends AdaptableHelpResource {
 	public Object getAdapter(Class adapter) {
 		if (adapter == ITopic.class)
 			return element;
-		else
-			return super.getAdapter(adapter);
+		return super.getAdapter(adapter);
 	}
 
 	public AdaptableHelpResource[] getChildren() {
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetManager.java
index 274b73aba..4d9088355 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetManager.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetManager.java
@@ -368,8 +368,7 @@ public class WorkingSetManager implements IHelpWorkingSetManager,
 			IAdaptable[] topics = toc.getChildren();
 			if (index < 0 || index >= topics.length)
 				return null;
-			else
-				return (AdaptableTopic) topics[index];
+			return (AdaptableTopic) topics[index];
 		}
 
 		return null;
diff --git a/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java b/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java
index 72357555e..fd4677e83 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java
@@ -717,7 +717,7 @@ public class HelpIndexBuilder {
 
 	private Element[] getTocExtensions(Document doc) {
 		ArrayList list = new ArrayList();
-		Node root = doc.getDocumentElement();
+		//Node root = doc.getDocumentElement();
 		NodeList children = doc.getElementsByTagName("extension"); //$NON-NLS-1$
 		for (int i = 0; i < children.getLength(); i++) {
 			Node child = children.item(i);
diff --git a/org.eclipse.help.base/src/org/eclipse/help/search/InfoCenter.java b/org.eclipse.help.base/src/org/eclipse/help/search/InfoCenter.java
index 4b90b4896..dd743257c 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/search/InfoCenter.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/search/InfoCenter.java
@@ -123,8 +123,8 @@ public final class InfoCenter implements ISearchEngine {
 				url = url + "/"; //$NON-NLS-1$
 			if (frames) {
 				return url + "topic" + href; //$NON-NLS-1$
-			} else
-				return url + "topic" + href + "&noframes=true"; //$NON-NLS-1$ //$NON-NLS-2$
+			}
+			return url + "topic" + href + "&noframes=true"; //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}