Commit 87e130a1 authored by Nico Mack's avatar Nico Mack

Fixed minor bugs

parent 6a2d3b84
......@@ -51,7 +51,7 @@ public class Interpolator {
private static final String INTEGER_STEM = "[ +\\-0-9]\\{{}\\}"; //$NON-NLS-1$
private static final String DECIMALS_STEM = "\\.[0-9]\\{{}\\}"; //$NON-NLS-1$
private static final Pattern VARIABLE_PATTERN = Pattern.compile("\\$\\{([a-z0-9\\-_]+)(\\.(%[dbscxoefgt\\+\\.0-9]+))?\\}", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
private static final Pattern VARIABLE_PATTERN = Pattern.compile("\\${1,2}\\{([a-z0-9\\-_]+)(\\.(%[dbscxoefgt\\+\\.0-9]+))?\\}", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
private static final Pattern FORMAT_PATTERN = Pattern.compile("\\%((\\d*)(\\.(\\d+))?)([dbscxoefgt])", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
private static HashMap<String, Object> targetLookup = new HashMap<>();
......
......@@ -27,7 +27,6 @@ import lu.list.itis.dkd.tui.cps.variable.Variable;
import lu.list.itis.dkd.tui.event.conditional.Condition;
import lu.list.itis.dkd.tui.event.interaction.Interaction;
import lu.list.itis.dkd.tui.widget.builder.BaseDisplayWidgetBuilder;
import lu.list.itis.dkd.tui.widget.builder.DisplayWidgetBuilder;
import lu.list.itis.dkd.tui.widget.corona.ValueCorona;
import com.google.common.collect.Multimap;
......@@ -71,7 +70,7 @@ public class DisplayWidget extends StatefulWidget implements InputChangeListener
// ***************************************************************************
// ---------------------------------------------------------------------------
public DisplayWidget(BaseDisplayWidgetBuilder<DisplayWidgetBuilder> builder) {
public DisplayWidget(BaseDisplayWidgetBuilder<?> builder) {
super(builder);
this.setupDisplayDispatcher();
......
Markdown is supported
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