[incubator-hop] branch master updated: HOP-2369: Wrap here with isWeb()

[ha...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git


The following commit(s) were added to refs/heads/master by this push:
     new b13f305  HOP-2369: Wrap here with isWeb()
     new ac1e400  Merge pull request #516 from HiromuHota/HOP-2369
b13f305 is described below

commit b13f3059f134ce12f58eca2d556ac27163e9023a
Author: Hiromu Hota <hi...@gmail.com>
AuthorDate: Wed Dec 30 21:25:46 2020 -0800

    HOP-2369: Wrap here with isWeb()
    
    Browser in RAP does not implement back() and forward()
---
 ui/src/main/java/org/apache/hop/ui/core/dialog/ShowHelpDialog.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/src/main/java/org/apache/hop/ui/core/dialog/ShowHelpDialog.java b/ui/src/main/java/org/apache/hop/ui/core/dialog/ShowHelpDialog.java
index ff792c2..fca05bc 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/dialog/ShowHelpDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/dialog/ShowHelpDialog.java
@@ -27,6 +27,7 @@ import org.apache.hop.ui.core.PropsUi;
 import org.apache.hop.ui.core.gui.GuiResource;
 import org.apache.hop.ui.hopgui.HopGui;
 import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
+import org.apache.hop.ui.util.EnvironmentUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.browser.Browser;
 import org.eclipse.swt.browser.LocationEvent;
@@ -339,7 +340,10 @@ public class ShowHelpDialog extends Dialog {
           wBrowser.execute( PRINT_SCRIPT );
           fromPrint = false;
         }
-        setForwardBackEnable();
+        if (!EnvironmentUtils.getInstance().isWeb()) {
+          // Browser in RAP does not implement back() and forward()
+          setForwardBackEnable();
+        }
       }
     };