Merge remote-tracking branch 'origin/master'

src/main/java/fr/soleil/archiving/hdbtdb/api/manager/ArchivingManagerApiRef.java

@@ -3,6 +3,23 @@
  */
 package fr.soleil.archiving.hdbtdb.api.manager;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.tango.utils.DevFailedUtils;
+
 import fr.esrf.Tango.DevFailed;
 import fr.esrf.Tango.ErrSeverity;
 import fr.esrf.TangoApi.ApiUtil;
@@ -31,22 +48,6 @@ import fr.soleil.archiving.hdbtdb.api.tools.LoadBalancedList;
 import fr.soleil.archiving.hdbtdb.api.tools.mode.Mode;
 import fr.soleil.database.connection.AbstractDataBaseConnector;
 import fr.soleil.tango.clientapi.TangoAttribute;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.tango.utils.DevFailedUtils;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
 
 /**
  * @author AYADI
@@ -187,8 +188,7 @@ public abstract class ArchivingManagerApiRef implements IArchivingManagerApiRef
      * @param attributeName
      * @return AttributeInfo
      */
-    public static AttributeInfo getAttributeInfo(final String attributeName, final boolean doRefresh) throws
-            DevFailed {
+    public static AttributeInfo getAttributeInfo(final String attributeName, final boolean doRefresh) throws DevFailed {
         AttributeInfo att_info = null;
         if (!doRefresh) {
             att_info = getBufferedAttributeInfo(attributeName);
@@ -468,7 +468,6 @@ public abstract class ArchivingManagerApiRef implements IArchivingManagerApiRef
         return count;
     }
 
-
     protected abstract String getHost();
 
     protected abstract String getUser();
@@ -537,7 +536,6 @@ public abstract class ArchivingManagerApiRef implements IArchivingManagerApiRef
         this.exportedArchiverList = exportedArchiverList;
     }
 
-
     private void initDbArchiverList() throws ArchivingException {
         if (archiverListRefresher != null && !archiverListRefresher.isCancelled()) {
             archiverListRefresher.cancel(true);
@@ -574,8 +572,7 @@ public abstract class ArchivingManagerApiRef implements IArchivingManagerApiRef
                                 .add((facility ? "//" + dbase.get_tango_host() + "/" : "") + reply.dev_name());
                     }
                 }
-                exportedArchiverList = runningDevicesListVector
-                        .toArray(new String[runningDevicesListVector.size()]);
+                exportedArchiverList = runningDevicesListVector.toArray(new String[runningDevicesListVector.size()]);
                 notExportedArchiverList = notRunningDevicesListVector
                         .toArray(new String[notRunningDevicesListVector.size()]);
                 LOGGER.debug("will manage {} archivers, {} are down", runningDevicesListVector,

src/main/java/fr/soleil/archiving/hdbtdb/api/tools/mode/ModeRoot.java

@@ -49,7 +49,7 @@ package fr.soleil.archiving.hdbtdb.api.tools.mode;
  * @see EventMode
  */
 
-class ModeRoot {
+public abstract class ModeRoot {
 
     public static final double SLOW_DRIFT_FIRST_VAL = -99999.99;
     protected int period = 0;