Change the code so that it compiles.

ControlSystemStudio · Aug 30, 2023 · ba6e17f · ba6e17f
1 parent 1051d46
commit ba6e17f
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...y/convert-edm/src/main/java/org/csstudio/display/converter/edm/widgets/ConverterBase.java b/...y/convert-edm/src/main/java/org/csstudio/display/converter/edm/widgets/ConverterBase.java
@@ -83,14 +83,14 @@ public ConverterBase(final EdmConverter converter, final Widget parent, final Ed
             final String expression = "pv0>=" + t.getVisMin() + " && pv0<" + t.getVisMax();
             WidgetProperty<Boolean> val = vis_prop.clone();
             val.setValue(!t.isVisInvert());
-            exprs.add(new RuleInfo.ExprInfoValue<>(expression, val));
+            exprs.add(new RuleInfo.ExpressionInfo<>(expression, true, val));
 
             // Else: Hide (unless inverted)
             val = vis_prop.clone();
             val.setValue(t.isVisInvert());
-            exprs.add(new RuleInfo.ExprInfoValue<>("true", val));
+            exprs.add(new RuleInfo.ExpressionInfo<>("true", true, val));
 
-            rules.add(new RuleInfo("EDM visibility", vis_prop.getName(), false, exprs, pvs));
+            rules.add(new RuleInfo("EDM visibility", vis_prop.getName(), false, exprs));
             widget.propRules().setValue(rules);
         }
 
@@ -147,11 +147,11 @@ public static void convertColor(final EdmColor edm,
                 final WidgetColor color = convertStaticColor(edm_color);
                 final WidgetProperty<WidgetColor> prop_col = prop.clone();
                 prop_col.setValue(color);
-                exprs.add(new RuleInfo.ExprInfoValue<>(expression, prop_col));
+                exprs.add(new RuleInfo.ExpressionInfo<>(expression, false, prop_col));
             }
 
             final String name = "EDM " + (edm.getName() == null ? "color" : edm.getName());
-            rules.add(new RuleInfo(name, prop.getName(), false, exprs, pvs));
+            rules.add(new RuleInfo(name, prop.getName(), false, exprs));
             widget.propRules().setValue(rules);
 
             return;