diff options
author | Dejan Gloszic | 2005-04-28 15:36:05 +0000 |
---|---|---|
committer | Dejan Gloszic | 2005-04-28 15:36:05 +0000 |
commit | b4003520abb9d7a349e36af7375a80e043b7c1ae (patch) | |
tree | 40b7feed12ace73794ec6cb6a12c6c45cdbf48d3 /org.eclipse.help.base/src/org/eclipse/help/internal/browser | |
parent | 3ccc4e36028f2e656ae24ec4fb4c902b3e8e97d8 (diff) | |
download | eclipse.platform.ua-b4003520abb9d7a349e36af7375a80e043b7c1ae.tar.gz eclipse.platform.ua-b4003520abb9d7a349e36af7375a80e043b7c1ae.tar.xz eclipse.platform.ua-b4003520abb9d7a349e36af7375a80e043b7c1ae.zip |
*** empty log message ***
Diffstat (limited to 'org.eclipse.help.base/src/org/eclipse/help/internal/browser')
3 files changed, 8 insertions, 14 deletions
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) { |