expression bug correction (TANGOARCH-832)

src/main/java/fr/soleil/mambo/data/view/ViewConfigurationAttribute.java

@@ -118,9 +118,13 @@ public class ViewConfigurationAttribute extends Attribute implements DBExtractio
             hasRead = recoveredData[READ_INDEX] != null;
             hasWrite = recoveredData[WRITE_INDEX] != null;
             String nameId = hasRead ? recoveredData[READ_INDEX].getName() : recoveredData[WRITE_INDEX].getName();
+            String name = nameId;
             nameId = nameId.toLowerCase();
-            final ViewConfigurationAttributePlotProperties plotPropertie = properties.getPlotProperties();
-            final String displayName = plotPropertie.getCurve().getName();
+            final ViewConfigurationAttributePlotProperties plotProperties = properties.getPlotProperties();
+            String displayName = plotProperties.getCurve().getName();
+            if ((displayName == null) || (displayName.trim().isEmpty())) {
+                displayName = name;
+            }
             if (hasWrite) {
                 setAttributeDataView(chart, displayName, nameId, true, hasRead);
             }

src/main/java/fr/soleil/mambo/data/view/ViewConfigurationAttributes.java

@@ -233,7 +233,7 @@ public class ViewConfigurationAttributes {
                             final int index = variable.indexOf(ViewConfigurationAttribute.SUFFIX_READ);
                             attributName = variable.substring(0, index);
                         }
-                        final ViewConfigurationAttribute attr = attributes.get(attributName);
+                        final ViewConfigurationAttribute attr = attributes.get(attributName.toLowerCase());
                         if (attr != null) {
                             final Integer dataType = dataTypes.get(attr);
                             if (dataType != null) {
@@ -357,7 +357,8 @@ public class ViewConfigurationAttributes {
                                                 if (chartData != null) {
                                                     for (Map.Entry<String, Object> dataAttribute : chartData
                                                             .entrySet()) {
-                                                        if (dataAttribute.getKey().equals(variablesNames[j])) {
+                                                        if (dataAttribute.getKey()
+                                                                .equalsIgnoreCase(variablesNames[j])) {
                                                             Object points = dataAttribute.getValue();
                                                             int[] shape = ArrayUtils.recoverShape(points);
                                                             NullableTimedData[] timedDatas = null;
@@ -421,7 +422,7 @@ public class ViewConfigurationAttributes {
                                             } // end if (chart != null)
 
                                         case TangoConst.Tango_DEV_STATE:
-                                            final DbData[] splitedStateData = dataMap.get(attributName);
+                                            final DbData[] splitedStateData = dataMap.get(attributName.toLowerCase());
                                             if (splitedStateData != null) {
                                                 DbData data = null;
                                                 if (isRead) {
@@ -452,7 +453,7 @@ public class ViewConfigurationAttributes {
                                                 }
                                             }
                                         case TangoConst.Tango_DEV_STRING:
-                                            final DbData[] splitedStringData = dataMap.get(attributName);
+                                            final DbData[] splitedStringData = dataMap.get(attributName.toLowerCase());
                                             if (splitedStringData != null) {
                                                 if (isRead) {
                                                     variablesDatas[j] = splitedStringData[0];