Commit 2eff656f authored by Johannes Eder's avatar Johannes Eder
Browse files

fixed compile error in filter in dynamic tree content provider

Issue-Ref: 4015
Issue-Url: https://af3-developer.fortiss.org/issues/4015

Signed-off-by: Johannes Eder's avatarJohannes Eder <eder@fortiss.org>
parent da09af53
CustomSimulationFXViewBase.java a317294d59100c37bc71f13095ae5b4cccfcc779 GREEN CustomSimulationFXViewBase.java a317294d59100c37bc71f13095ae5b4cccfcc779 GREEN
DataStateTableViewFX.java 5e859a314697cf780a3a92b652d5defcf6cabf70 GREEN DataStateTableViewFX.java 226d370e9e41ebec72c2410c487a873c500e0ed6 GREEN
GraphicalSimulationFXView.java c866c394e3fe951234112c1ddc69de79e94e9546 GREEN GraphicalSimulationFXView.java c866c394e3fe951234112c1ddc69de79e94e9546 GREEN
GraphicalStructureSimulationFXView.java dc7becae629b8704af3d9e593f2228c0667375c2 GREEN GraphicalStructureSimulationFXView.java dc7becae629b8704af3d9e593f2228c0667375c2 GREEN
InputOutputTableFXView.java 60d363ba5fa16fd8892c42f9199769f47f4a45e3 GREEN InputOutputTableFXView.java 60d363ba5fa16fd8892c42f9199769f47f4a45e3 GREEN
......
...@@ -20,7 +20,6 @@ import static org.fortiss.af3.expression.language.evaluation.NoVal.NOVAL; ...@@ -20,7 +20,6 @@ import static org.fortiss.af3.expression.language.evaluation.NoVal.NOVAL;
import static org.fortiss.tooling.kernel.ui.util.MessageUtilsExtended.showErrorInUIThread; import static org.fortiss.tooling.kernel.ui.util.MessageUtilsExtended.showErrorInUIThread;
import java.util.Collection; import java.util.Collection;
import java.util.function.Predicate;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.fortiss.af3.component.model.behavior.common.DataStateVariable; import org.fortiss.af3.component.model.behavior.common.DataStateVariable;
...@@ -124,19 +123,6 @@ public final class DataStateTableViewFX extends SimulationFXViewBase { ...@@ -124,19 +123,6 @@ public final class DataStateTableViewFX extends SimulationFXViewBase {
protected boolean filter(Object element, String filterValue) { protected boolean filter(Object element, String filterValue) {
return true; return true;
} }
/** {@inheritDoc} */
@Override
protected Predicate<Object> getFilterPredicate(String filterValue) {
// this override is needed, because super implementation does not
// call filter(Object, String) when filter value is null.
if(filterValue == null || "".equals(filterValue)) {
return (o) -> {
return filter(o, null);
};
}
return super.getFilterPredicate(filterValue);
}
} }
/** {@link DynamicTreeUIProviderBase} for the library view. */ /** {@link DynamicTreeUIProviderBase} for the library view. */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment