- no data in expressions bug correction

- minor code cleaning

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

@@ -103,9 +103,7 @@ public class ViewConfigurationAttributes {
     /**
      * Returns the spectrum attributes
      * 
-     * @param historic
-     *            to know in which database you want to check if the attributes
-     *            are spectrum or not.
+     * @param historic to know in which database you want to check if the attributes are spectrum or not.
      * @return The spectrum attributes
      * @throws ArchivingException
      */
@@ -127,8 +125,7 @@ public class ViewConfigurationAttributes {
     /**
      * Returns the string and state scalar attributes
      * 
-     * @param historic
-     *            to know in which database you want to check the attributes
+     * @param historic to know in which database you want to check the attributes
      * @return The string scalar attributes
      * @throws ArchivingException
      */
@@ -343,7 +340,6 @@ public class ViewConfigurationAttributes {
                                 }
                                 final ViewConfigurationAttribute attr = attributes.get(attributName.toLowerCase());
                                 if (attr != null) {
-
                                     switch (attr.getDataType(historic)) {
                                         case TangoConst.Tango_DEV_BOOLEAN:
                                         case TangoConst.Tango_DEV_CHAR:
@@ -417,11 +413,12 @@ public class ViewConfigurationAttributes {
                                                             dat.setTimedData(timedDatas);
                                                             variablesDatas[j] = dat;
                                                             break;
-                                                        }
-                                                    }
+                                                        } // end if (dataAttribute.getKey().equals(variablesNames[j]))
+                                                    } // end for (Map.Entry<String, Object> dataAttribute :
+                                                      // chartData.entrySet())
                                                     break;
-                                                }
-                                            }
+                                                } // end if (chart != null)
+                                            } // end if (chart != null)
 
                                         case TangoConst.Tango_DEV_STATE:
                                             final DbData[] splitedStateData = dataMap.get(attributName);
@@ -442,10 +439,6 @@ public class ViewConfigurationAttributes {
                                                                     0);
                                                             if (value != null) {
                                                                 final String state = TangoConst.Tango_DevStateName[(Integer) value];
-                                                                // final Object[] obj =
-                                                                // new Object[2];
-                                                                // obj[0] = state;
-                                                                // obj[1] = null;
                                                                 timedData.setValue(new String[] { state }, null);
                                                                 timedData.setTime(data.getTimedData()[k].getTime());
                                                                 timedDatas[k] = timedData;
@@ -458,7 +451,6 @@ public class ViewConfigurationAttributes {
                                                     break;
                                                 }
                                             }
-
                                         case TangoConst.Tango_DEV_STRING:
                                             final DbData[] splitedStringData = dataMap.get(attributName);
                                             if (splitedStringData != null) {
@@ -599,10 +591,6 @@ public class ViewConfigurationAttributes {
         return result;
     }
 
-    /**
-     * @param attrs
-     *            1 sept. 2005
-     */
     public void removeAttributesNotInList(final Map<String, ?> attrs) {
         List<String> toRemove = new ArrayList<>();
         for (final String next : attributes.keySet()) {
@@ -616,10 +604,6 @@ public class ViewConfigurationAttributes {
         toRemove.clear();
     }
 
-    /**
-     * @param attrs
-     *            1 sept. 2005
-     */
     public void addAttributes(final Map<String, ViewConfigurationAttribute> attrs) {
         for (Entry<String, ViewConfigurationAttribute> entry : attrs.entrySet()) {
             final String nextKey = entry.getKey().toLowerCase();

src/main/java/fr/soleil/mambo/thread/VCExtractionSwingWorker.java

@@ -21,6 +21,7 @@ import fr.soleil.mambo.containers.view.ViewActionPanel;
 import fr.soleil.mambo.containers.view.ViewAttributesGraphPanel;
 import fr.soleil.mambo.containers.view.ViewAttributesPanel;
 import fr.soleil.mambo.containers.view.ViewAttributesTreePanel;
+import fr.soleil.mambo.containers.view.ViewNumberScalarPanel;
 import fr.soleil.mambo.containers.view.ViewStringStateBooleanScalarPanel;
 import fr.soleil.mambo.data.view.ViewConfiguration;
 import fr.soleil.mambo.data.view.ViewConfigurationData;
@@ -171,11 +172,15 @@ public class VCExtractionSwingWorker extends ArchivingSwingWorker<Void, Transmit
                             logger.error(e.getMessage(), e);
                         }
                         int progress = 0;
+                        Map<String, DbData[]> expressionMap = null;
+                        boolean chartDataDone = false;
                         for (final AbstractViewCleanablePanel panel : panels) {
                             if (isCanceled()) {
                                 break;
                             }
-                            Map<String, DbData[]> expressionMap = null;
+                            if (panel instanceof ViewNumberScalarPanel) {
+                                chartDataDone = true;
+                            }
                             final int toAdd = panel.getAttributeWeight();
                             if (panel instanceof ViewStringStateBooleanScalarPanel) {
                                 expressionMap = new HashMap<>();
@@ -207,13 +212,13 @@ public class VCExtractionSwingWorker extends ArchivingSwingWorker<Void, Transmit
                                         panel.applyDataOutsideOfEDT(attribute, splitData);
                                         publish(new TransmitableData(attribute, panel, null, progress));
                                     }
-                                }
-                                if ((expressionMap != null) && (!isCanceled())) {
+                                } // end for (String attribute : attributes)
+                            } // end if ((attributes != null) && (!attributes.isEmpty()) && !isCanceled())
+                            if (chartDataDone && (expressionMap != null) && (!isCanceled())) {
                                 publish(new TransmitableData(Messages.getMessage("EXPRESSION_STRING"), null,
                                         expressionMap, progress));
                             }
-                            }
-                        }
+                        } // end for (final AbstractViewCleanablePanel panel : panels)
                     }
                 }
             }