Skip to content
Snippets Groups Projects
Commit 36e3d255 authored by Raphael GIRARDOT's avatar Raphael GIRARDOT
Browse files

expression bug correction (TANGOARCH-917)

parent 5f9cae85
Branches
No related tags found
No related merge requests found
......@@ -732,25 +732,28 @@ public class ExpressionTab extends ExpressionOption {
final int writable = attr.getDataWritable(historic);
final String readKey = ViewConfigurationAttribute.SUFFIX_READ;
final String writeKey = ViewConfigurationAttribute.SUFFIX_WRITE;
// TANGOARCH-917: id to lower case
String name = attr.getCompleteName();
String lowerName = name == null ? name : name.toLowerCase();
switch (writable) {
case AttrWriteType._READ:
dataViewsName.add(attr.getProperties().getPlotProperties().getCurve().getName()
+ readKey);
dataViewsId.add(attr.getCompleteName() + readKey);
dataViewsId.add(lowerName + readKey);
break;
case AttrWriteType._WRITE:
dataViewsName.add(attr.getProperties().getPlotProperties().getCurve().getName()
+ writeKey);
dataViewsId.add(attr.getCompleteName() + writeKey);
dataViewsId.add(lowerName + writeKey);
break;
case AttrWriteType._READ_WITH_WRITE:
case AttrWriteType._READ_WRITE:
dataViewsName.add(attr.getProperties().getPlotProperties().getCurve().getName()
+ readKey);
dataViewsId.add(attr.getCompleteName() + readKey);
dataViewsId.add(lowerName + readKey);
dataViewsName.add(attr.getProperties().getPlotProperties().getCurve().getName()
+ writeKey);
dataViewsId.add(attr.getCompleteName() + writeKey);
dataViewsId.add(lowerName + writeKey);
break;
}
}
......
......@@ -244,7 +244,13 @@ public class ViewConfigurationXMLHelper {
List<String> variables = new ArrayList<String>(3);
StringTokenizer st = new StringTokenizer(variablesAttr, ExpressionAttribute.VARIABLES_PROPERTY_DELIMITER);
while (st.hasMoreTokens()) {
variables.add(st.nextToken().trim());
// TANGOARCH-917: id to lower case
String var = st.nextToken().trim();
if (var != null && (var.endsWith(ViewConfigurationAttribute.SUFFIX_READ)
|| var.endsWith(ViewConfigurationAttribute.SUFFIX_WRITE))) {
var = var.toLowerCase();
}
variables.add(var);
}
String xAttr = expressionProperties.get(ExpressionAttribute.X_PROPERTY_XML_TAG);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment