tmf: Make Analysis Requirements implement Predicates

[deliverable/tracecompass.git] / tmf / org.eclipse.tracecompass.tmf.core / src / org / eclipse / tracecompass / tmf / core / analysis / TmfAbstractAnalysisModule.java

diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAbstractAnalysisModule.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAbstractAnalysisModule.java
index d005443d417414fd777db43717b2788f0b7a4014..8107f3ddf657400507942652a3ed72ab2da632a1 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAbstractAnalysisModule.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAbstractAnalysisModule.java
@@ -211,7 +211,7 @@ public abstract class TmfAbstractAnalysisModule extends TmfComponent
     @Override
     public boolean canExecute(ITmfTrace trace) {
         for (TmfAnalysisRequirement requirement : getAnalysisRequirements()) {
-            if (!requirement.isFulfilled(trace)) {
+            if (!requirement.test(trace)) {
                 return false;
             }
         }
@@ -492,7 +492,7 @@ public abstract class TmfAbstractAnalysisModule extends TmfComponent
         StringBuilder builder = new StringBuilder();
         builder.append(NLS.bind(Messages.TmfAbstractAnalysisModule_AnalysisCannotExecute, getName()));
         for (TmfAnalysisRequirement requirement : getAnalysisRequirements()) {
-            if (!requirement.isFulfilled(trace)) {
+            if (!requirement.test(trace)) {
                 builder.append("\n\n"); //$NON-NLS-1$
                 builder.append(NLS.bind(Messages.TmfAnalysis_RequirementNotFulfilled, requirement.getType()));
                 builder.append("\n"); //$NON-NLS-1$