| commit | a455b628904c0a2d7665cfb7ed111bbbb1dd3e49 | [log] [tgz] |
|---|---|---|
| author | Philippe DUL <philippe.dul@thalesgroup.com> | Tue Mar 30 11:18:02 2021 +0200 |
| committer | Philippe DUL <philippe.dul@thalesgroup.com> | Tue Mar 30 11:22:03 2021 +0200 |
| tree | a2c32c62c96f18819c4bdcf2e3632a3d687c5d78 | |
| parent | 97bd6352dbb02168dd0ef28c496a6573d996bec0 [diff] |
[572437] Keep Backwards compatibility on predicate evaluation Change-Id: If002883f17665e5dd9de14daed057849c818d889 Signed-off-by: Philippe DUL <philippe.dul@thalesgroup.com>
diff --git a/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/CommonActivityExplorerPage.java b/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/CommonActivityExplorerPage.java index 6853d43..6a42019 100644 --- a/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/CommonActivityExplorerPage.java +++ b/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/CommonActivityExplorerPage.java
@@ -189,7 +189,7 @@ boolean result = ActivityExplorerActivator.getDefault().getPreferenceStore().getBoolean(getId()); result &= !WorkbenchActivityHelper.filterItem(this); if (predicate != null) { - result &= predicate.isOk(); + result &= predicate.isPageOk(this); } return result; }
diff --git a/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/OverviewActivityExplorerPage.java b/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/OverviewActivityExplorerPage.java index e18b9ca..d00d41f 100644 --- a/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/OverviewActivityExplorerPage.java +++ b/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/pages/OverviewActivityExplorerPage.java
@@ -262,7 +262,7 @@ // By default all Overview page are visible (cf. bug 485652) boolean result = true; if (predicate != null) { - result &= predicate.isOk(); + result &= predicate.isPageOk(this); } return result; }
diff --git a/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/predicates/IPredicate.java b/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/predicates/IPredicate.java index 817b85e..d0eb2e8 100644 --- a/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/predicates/IPredicate.java +++ b/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/api/editor/predicates/IPredicate.java
@@ -16,14 +16,14 @@ public interface IPredicate { public default boolean isOk() { - return true; + return false; } - - public default boolean isActivityOk(ExplorerActivity activity) { - return true; - } - public default boolean isPageOk(CommonActivityExplorerPage page) { - return true; + public default boolean isActivityOk(ExplorerActivity activity) { + return isOk(); + } + + public default boolean isPageOk(CommonActivityExplorerPage page) { + return isOk(); } }