From aa3881e7be6775a7b52c97f9f427046059865acd Mon Sep 17 00:00:00 2001
From: Arnaud Jelmoni <arnaud.jelmoni@keyconsulting.fr>
Date: Fri, 12 Mar 2021 15:32:04 +0000
Subject: [PATCH] Remonte AttributeLigh/Heavy
---
.../fr/soleil/bensikin/data/context/Context.java | 14 +++++++-------
.../fr/soleil/bensikin/data/snapshot/Snapshot.java | 8 ++++----
.../bensikin/data/snapshot/SnapshotAttribute.java | 4 ++--
.../snapshot/SnapshotAttributeDeltaAbsValue.java | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/fr/soleil/bensikin/data/context/Context.java b/src/main/java/fr/soleil/bensikin/data/context/Context.java
index 9879b14..6b35212 100644
--- a/src/main/java/fr/soleil/bensikin/data/context/Context.java
+++ b/src/main/java/fr/soleil/bensikin/data/context/Context.java
@@ -75,12 +75,12 @@ import javax.swing.JOptionPane;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import fr.soleil.archiving.common.api.tools.AttributeHeavy;
+import fr.soleil.archiving.common.api.tools.AttributeLight;
import fr.soleil.archiving.gui.tools.GUIUtilities;
import fr.soleil.archiving.snap.api.manager.ISnapManager;
import fr.soleil.archiving.snap.api.tools.Condition;
import fr.soleil.archiving.snap.api.tools.Criterions;
-import fr.soleil.archiving.snap.api.tools.SnapAttributeHeavy;
-import fr.soleil.archiving.snap.api.tools.SnapAttributeLight;
import fr.soleil.archiving.snap.api.tools.SnapConst;
import fr.soleil.archiving.snap.api.tools.SnapContext;
import fr.soleil.archiving.snap.api.tools.SnapshotLight;
@@ -188,7 +188,7 @@ public class Context implements Comparable<Context> {
if (cont.getId() == 0) {
throw new SnapshotingException(Messages.getLogMessage("LOAD_CONTEXT_ATTRIBUTES_KO"));
} else {
- final SnapAttributeHeavy[] sah = source.findContextAttributes(cont, searchCriterions);
+ final AttributeHeavy[] sah = source.findContextAttributes(cont, searchCriterions);
this.setContextAttributes(sah);
}
}
@@ -265,7 +265,7 @@ public class Context implements Comparable<Context> {
*
* @param sah The attributes to convert
*/
- private void setContextAttributes(final SnapAttributeHeavy[] sah) {
+ private void setContextAttributes(final AttributeHeavy[] sah) {
if (sah == null) {
return;
}
@@ -275,7 +275,7 @@ public class Context implements Comparable<Context> {
final ContextAttribute[] tab = new ContextAttribute[numberOfAttributes];
for (int i = 0; i < numberOfAttributes; i++) {
- final SnapAttributeHeavy currentInAttribute = sah[i];
+ final AttributeHeavy currentInAttribute = sah[i];
final ContextAttribute currentOutAttribute = new ContextAttribute(_contextAttributes);
currentOutAttribute.setName(currentInAttribute.getAttribute_name());
@@ -494,13 +494,13 @@ public class Context implements Comparable<Context> {
// TO REMOVE
// setting the attributes list of the context to save
- final ArrayList<SnapAttributeLight> attributeList = new ArrayList<SnapAttributeLight>();
+ final ArrayList<AttributeLight> attributeList = new ArrayList<AttributeLight>();
enumer = model.getTreeAttributes().iterator();
while (enumer.hasNext()) {
final String nextKey_s = enumer.next();
final ContextAttribute ca = model.getAttribute(nextKey_s);
final String attribute_complete_name = ca.getCompleteName();
- final SnapAttributeLight currentAttr = new SnapAttributeLight(attribute_complete_name);
+ final AttributeLight currentAttr = new AttributeLight(attribute_complete_name);
attributeList.add(currentAttr);
}
context.setAttributeList(attributeList);
diff --git a/src/main/java/fr/soleil/bensikin/data/snapshot/Snapshot.java b/src/main/java/fr/soleil/bensikin/data/snapshot/Snapshot.java
index 1500cc5..c5675eb 100644
--- a/src/main/java/fr/soleil/bensikin/data/snapshot/Snapshot.java
+++ b/src/main/java/fr/soleil/bensikin/data/snapshot/Snapshot.java
@@ -83,12 +83,12 @@ import fr.esrf.Tango.AttrWriteType;
import fr.esrf.Tango.DevFailed;
import fr.esrf.TangoApi.AttributeInfoEx;
import fr.esrf.TangoApi.DeviceAttribute;
+import fr.soleil.archiving.common.api.tools.AttributeLight;
import fr.soleil.archiving.gui.tools.GUIUtilities;
import fr.soleil.archiving.snap.api.manager.ISnapManager;
import fr.soleil.archiving.snap.api.tools.Condition;
import fr.soleil.archiving.snap.api.tools.Criterions;
import fr.soleil.archiving.snap.api.tools.SnapAttributeExtract;
-import fr.soleil.archiving.snap.api.tools.SnapAttributeLight;
import fr.soleil.archiving.snap.api.tools.SnapConst;
import fr.soleil.archiving.snap.api.tools.SnapContext;
import fr.soleil.archiving.snap.api.tools.SnapshotLight;
@@ -1181,8 +1181,8 @@ public class Snapshot implements Comparable<Snapshot> {
return snapContext;
}
- private List<SnapAttributeLight> getAsAttributeList() {
- final List<SnapAttributeLight> attributeList = new ArrayList<SnapAttributeLight>();
+ private List<AttributeLight> getAsAttributeList() {
+ final List<AttributeLight> attributeList = new ArrayList<AttributeLight>();
final SnapshotAttribute[] attrs = getSnapshotAttributes().getSnapshotAttributes();
if (attrs == null) {
@@ -1192,7 +1192,7 @@ public class Snapshot implements Comparable<Snapshot> {
for (final SnapshotAttribute next : attrs) {
final String attribute_complete_name = next.getAttributeCompleteName();
- final SnapAttributeLight currentAttr = new SnapAttributeLight(attribute_complete_name);
+ final AttributeLight currentAttr = new AttributeLight(attribute_complete_name);
attributeList.add(currentAttr);
}
diff --git a/src/main/java/fr/soleil/bensikin/data/snapshot/SnapshotAttribute.java b/src/main/java/fr/soleil/bensikin/data/snapshot/SnapshotAttribute.java
index a14199b..36c6154 100644
--- a/src/main/java/fr/soleil/bensikin/data/snapshot/SnapshotAttribute.java
+++ b/src/main/java/fr/soleil/bensikin/data/snapshot/SnapshotAttribute.java
@@ -67,9 +67,9 @@ import fr.esrf.Tango.AttrDataFormat;
import fr.esrf.Tango.AttrWriteType;
import fr.esrf.TangoApi.AttributeProxy;
import fr.esrf.TangoDs.TangoConst;
+import fr.soleil.archiving.common.api.tools.AttributeLight;
import fr.soleil.archiving.gui.tools.GUIUtilities;
import fr.soleil.archiving.snap.api.tools.SnapAttributeExtract;
-import fr.soleil.archiving.snap.api.tools.SnapAttributeLight;
import fr.soleil.bensikin.options.Options;
import fr.soleil.bensikin.options.sub.SnapshotOptions;
import fr.soleil.bensikin.xml.BensikinXMLLine;
@@ -482,7 +482,7 @@ public class SnapshotAttribute {
* @return The result conversion
*/
SnapAttributeExtract toSnapAttributeExtrac() {
- final SnapAttributeLight snapAttributeLight = new SnapAttributeLight();
+ final AttributeLight snapAttributeLight = new AttributeLight();
snapAttributeLight.setAttributeCompleteName(attributeCompleteName);
snapAttributeLight.setAttributeId(attributeId);
diff --git a/src/main/java/fr/soleil/bensikin/data/snapshot/SnapshotAttributeDeltaAbsValue.java b/src/main/java/fr/soleil/bensikin/data/snapshot/SnapshotAttributeDeltaAbsValue.java
index 9d089b4..8e3d19d 100644
--- a/src/main/java/fr/soleil/bensikin/data/snapshot/SnapshotAttributeDeltaAbsValue.java
+++ b/src/main/java/fr/soleil/bensikin/data/snapshot/SnapshotAttributeDeltaAbsValue.java
@@ -154,7 +154,7 @@ public class SnapshotAttributeDeltaAbsValue extends SnapshotAttributeValue {
* other types is a string that says whether there is a difference.
* @return 29 juin 2005
*/
- private NullableData<Boolean> getScalarDeltaAbsValue(SnapshotAttributeWriteAbsValue writeAbsValue,
+ private NullableData<Boolean> getScalarDeltaAbsValue(SnapshotAttributeWriteAbsValue writeAbsValue,
SnapshotAttributeReadAbsValue readAbsValue, boolean manageAllTypes) {
Object ret;
Boolean nullElements = Boolean.FALSE;
--
GitLab