Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2020-01-27 10:29:37 +0000
committerLars Vogel2020-01-31 09:48:42 +0000
commit54d560df9c757c55230a1e5a9d84bcf333873d06 (patch)
tree0deb672da389b29a681024fb7b7753f49f963929
parent9662494b01770a849faca114468be8f807e69ca6 (diff)
downloadeclipse.platform.ua-54d560df9c757c55230a1e5a9d84bcf333873d06.tar.gz
eclipse.platform.ua-54d560df9c757c55230a1e5a9d84bcf333873d06.tar.xz
eclipse.platform.ua-54d560df9c757c55230a1e5a9d84bcf333873d06.zip
Use short-circuit logic for or checks in ua
Change-Id: Idc28a9dd0ae60e96f7ed63d52814181dd4d74820 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
-rw-r--r--org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/FormIntroPartImplementation.java2
-rw-r--r--org.eclipse.ui.intro/src/org/eclipse/ui/intro/config/CustomizableIntroPart.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/FormIntroPartImplementation.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/FormIntroPartImplementation.java
index 67c162c2c..e77e56271 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/FormIntroPartImplementation.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/FormIntroPartImplementation.java
@@ -283,7 +283,7 @@ public class FormIntroPartImplementation extends
public void dynamicStandbyStateChanged(boolean standby,
boolean isStandbyPartNeeded) {
// handle action enablement first
- if (isStandbyPartNeeded | standby) {
+ if (isStandbyPartNeeded || standby) {
homeAction.setEnabled(false);
forwardAction.setEnabled(false);
backAction.setEnabled(false);
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/intro/config/CustomizableIntroPart.java b/org.eclipse.ui.intro/src/org/eclipse/ui/intro/config/CustomizableIntroPart.java
index b5c51630a..678fd6183 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/intro/config/CustomizableIntroPart.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/intro/config/CustomizableIntroPart.java
@@ -260,7 +260,7 @@ public final class CustomizableIntroPart extends IntroPart implements
restoreStandby = false;
boolean isStandbyPartNeeded = isStandbyPartNeeded();
- isStandbyPartNeeded = isStandbyPartNeeded | restoreStandby;
+ isStandbyPartNeeded = isStandbyPartNeeded || restoreStandby;
try {
if (standbyPart == null && standby && isStandbyPartNeeded)

Back to the top