From 439033e9b0a8c2613acd4326b2b7b1f71ba48969 Mon Sep 17 00:00:00 2001
From: Katy Saintin <katy.saintin@synchrotron-soleil.fr>
Date: Tue, 18 Jan 2022 18:18:43 +0000
Subject: [PATCH] CEA : Update Irfu plugins according to last version of Comete
Library
---
DataBrowserPlugins/IrfuPlugin/pom.xml | 18 ++++++++++++------
.../irfu/epics/AbstractEpicsDataSource.java | 2 +-
.../cea/irfu/epics/EpicsBooleanDataSource.java | 2 +-
.../irfu/epics/EpicsDataSourceProducer.java | 16 ++++++++--------
.../cea/irfu/epics/EpicsDoubleDataSource.java | 2 +-
.../cea/irfu/epics/EpicsFloatDataSource.java | 2 +-
.../cea/irfu/epics/EpicsIntegerDataSource.java | 2 +-
.../main/java/fr/cea/irfu/epics/EpicsKey.java | 8 ++++----
.../cea/irfu/epics/EpicsParameterAccessor.java | 4 ++--
.../cea/irfu/epics/EpicsShortDataSource.java | 2 +-
.../java/fr/cea/irfu/moonarch/MoonArchKey.java | 2 +-
.../impl/epics/EpicsDataSourceBrowser.java | 8 ++++----
.../impl/epics/EpicsDataSourceSeeker.java | 10 +++++-----
13 files changed, 42 insertions(+), 36 deletions(-)
diff --git a/DataBrowserPlugins/IrfuPlugin/pom.xml b/DataBrowserPlugins/IrfuPlugin/pom.xml
index 4bab72b..6c079e2 100644
--- a/DataBrowserPlugins/IrfuPlugin/pom.xml
+++ b/DataBrowserPlugins/IrfuPlugin/pom.xml
@@ -83,7 +83,7 @@
</dependency>
<!-- MOONArch library -->
<dependency>
- <groupId>heps.epics</groupId>
+ <groupId>fr.cea.irfu.epics</groupId>
<artifactId>moonarch-appliance</artifactId>
<version>0.0.3</version>
</dependency>
@@ -143,6 +143,12 @@
<dependency>
<groupId>heps.muscade</groupId>
<artifactId>muscade-clientapi</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>heps.epics</groupId>
+ <artifactId>CafeJava</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -159,13 +165,13 @@
<!-- <Epics api> -->
<!-- plc portal parser to get constant -->
<dependency>
- <groupId>heps.epics</groupId>
- <artifactId>plcparser</artifactId>
- <version>2.2.5</version>
+ <groupId>fr.cea.irfu.epics</groupId>
+ <artifactId>PLCParserTool</artifactId>
+ <version>2.2.6-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>heps.epics</groupId>
- <artifactId>CafeJava</artifactId>
+ <groupId>fr.cea.irfu.epics</groupId>
+ <artifactId>CAFEJava</artifactId>
<version>0.0.7</version>
</dependency>
<dependency>
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/AbstractEpicsDataSource.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/AbstractEpicsDataSource.java
index 65e0a4c..351e979 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/AbstractEpicsDataSource.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/AbstractEpicsDataSource.java
@@ -11,10 +11,10 @@
******************************************************************************/
package fr.cea.irfu.epics;
+import fr.cea.irfu.epics.cafejava.client.ProcessVariableManager;
import fr.cea.irfu.interfaces.AbstractIrfuDataSource;
import fr.cea.irfu.interfaces.ParameterAccessor;
import fr.soleil.data.service.IKey;
-import heps.epics.ca.client.ProcessVariableManager;
public abstract class AbstractEpicsDataSource<T> extends AbstractIrfuDataSource<T> {
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsBooleanDataSource.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsBooleanDataSource.java
index f0e9ac7..6b2ef63 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsBooleanDataSource.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsBooleanDataSource.java
@@ -11,9 +11,9 @@
******************************************************************************/
package fr.cea.irfu.epics;
+import fr.cea.irfu.epics.cafejava.common.CafeUtil;
import fr.soleil.data.service.GenericDescriptor;
import fr.soleil.data.service.IKey;
-import heps.epics.ca.common.CafeUtil;
public class EpicsBooleanDataSource extends AbstractEpicsDataSource<Boolean> {
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsDataSourceProducer.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsDataSourceProducer.java
index 92a8d60..3d6947f 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsDataSourceProducer.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsDataSourceProducer.java
@@ -16,19 +16,19 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import fr.cea.irfu.epics.cafejava.client.ProcessVariableManager;
+import fr.cea.irfu.epics.cafejava.interfaces.DataType;
+import fr.cea.irfu.epics.cafejava.interfaces.ICafeArrayProcessVariable;
+import fr.cea.irfu.epics.cafejava.interfaces.ICafeProcessVariable;
+import fr.cea.irfu.epics.cafejava.interfaces.ICafeProcessVariableListener;
+import fr.cea.irfu.epics.cafejava.interfaces.IRecord;
+import fr.cea.irfu.epics.cafejava.interfaces.ISimpleRecord;
+import fr.cea.irfu.epics.cafejava.interfaces.IocEvent;
import fr.soleil.data.exception.UnhandledDataTypeException;
import fr.soleil.data.service.IConstantSourceProducer;
import fr.soleil.data.service.IDataSourceProducer;
import fr.soleil.data.service.IKey;
import fr.soleil.data.source.AbstractDataSource;
-import heps.epics.ca.client.ProcessVariableManager;
-import heps.epics.ca.interfaces.DataType;
-import heps.epics.ca.interfaces.ICafeArrayProcessVariable;
-import heps.epics.ca.interfaces.ICafeProcessVariable;
-import heps.epics.ca.interfaces.ICafeProcessVariableListener;
-import heps.epics.ca.interfaces.IRecord;
-import heps.epics.ca.interfaces.ISimpleRecord;
-import heps.epics.ca.interfaces.IocEvent;
public class EpicsDataSourceProducer
implements IDataSourceProducer, IConstantSourceProducer, ICafeProcessVariableListener {
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsDoubleDataSource.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsDoubleDataSource.java
index 0ff58c2..cbc429d 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsDoubleDataSource.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsDoubleDataSource.java
@@ -11,9 +11,9 @@
******************************************************************************/
package fr.cea.irfu.epics;
+import fr.cea.irfu.epics.cafejava.common.CafeUtil;
import fr.soleil.data.service.GenericDescriptor;
import fr.soleil.data.service.IKey;
-import heps.epics.ca.common.CafeUtil;
public class EpicsDoubleDataSource extends AbstractEpicsDataSource<Double> {
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsFloatDataSource.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsFloatDataSource.java
index db50821..db082da 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsFloatDataSource.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsFloatDataSource.java
@@ -11,9 +11,9 @@
******************************************************************************/
package fr.cea.irfu.epics;
+import fr.cea.irfu.epics.cafejava.common.CafeUtil;
import fr.soleil.data.service.GenericDescriptor;
import fr.soleil.data.service.IKey;
-import heps.epics.ca.common.CafeUtil;
public class EpicsFloatDataSource extends AbstractEpicsDataSource<Float> {
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsIntegerDataSource.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsIntegerDataSource.java
index 6b9498d..8357545 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsIntegerDataSource.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsIntegerDataSource.java
@@ -11,9 +11,9 @@
******************************************************************************/
package fr.cea.irfu.epics;
+import fr.cea.irfu.epics.cafejava.common.CafeUtil;
import fr.soleil.data.service.GenericDescriptor;
import fr.soleil.data.service.IKey;
-import heps.epics.ca.common.CafeUtil;
public class EpicsIntegerDataSource extends AbstractEpicsDataSource<Integer> {
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsKey.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsKey.java
index 3ea5c2a..edcdcec 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsKey.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsKey.java
@@ -17,12 +17,12 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import fr.cea.irfu.epics.cafejava.interfaces.DataType;
+import fr.cea.irfu.epics.cafejava.interfaces.IRecord;
+import fr.cea.irfu.epics.cafejava.interfaces.ISimpleRecord;
+import fr.cea.irfu.epics.cafejava.ioc.FieldEnumeration.RecordType;
import fr.cea.irfu.interfaces.IrfuKey;
import fr.soleil.data.service.IKey;
-import heps.epics.ca.interfaces.DataType;
-import heps.epics.ca.interfaces.IRecord;
-import heps.epics.ca.interfaces.ISimpleRecord;
-import heps.epics.ca.ioc.FieldEnumeration.RecordType;
public class EpicsKey extends IrfuKey {
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsParameterAccessor.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsParameterAccessor.java
index 6fcb25c..20deaa4 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsParameterAccessor.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsParameterAccessor.java
@@ -11,9 +11,9 @@
******************************************************************************/
package fr.cea.irfu.epics;
+import fr.cea.irfu.epics.cafejava.client.ProcessVariableManager;
+import fr.cea.irfu.epics.cafejava.interfaces.ICafeProcessVariable;
import fr.cea.irfu.interfaces.ParameterAccessor;
-import heps.epics.ca.client.ProcessVariableManager;
-import heps.epics.ca.interfaces.ICafeProcessVariable;
public class EpicsParameterAccessor implements ParameterAccessor {
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsShortDataSource.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsShortDataSource.java
index ad93567..ecac41a 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsShortDataSource.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsShortDataSource.java
@@ -11,9 +11,9 @@
******************************************************************************/
package fr.cea.irfu.epics;
+import fr.cea.irfu.epics.cafejava.common.CafeUtil;
import fr.soleil.data.service.GenericDescriptor;
import fr.soleil.data.service.IKey;
-import heps.epics.ca.common.CafeUtil;
public class EpicsShortDataSource extends AbstractEpicsDataSource<Short> {
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/moonarch/MoonArchKey.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/moonarch/MoonArchKey.java
index d078f3c..ef4c131 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/moonarch/MoonArchKey.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/moonarch/MoonArchKey.java
@@ -15,9 +15,9 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+import fr.cea.irfu.epics.cafejava.interfaces.DataType;
import fr.cea.irfu.interfaces.IrfuKey;
import fr.soleil.data.service.IKey;
-import heps.epics.ca.interfaces.DataType;
import heps.epics.moonarch.interfaces.IPVData;
import heps.epics.moonarch.interfaces.MoonArchiverException;
import heps.epics.moonarch.model.MoonArchiverAPI;
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/org/cdma/gui/databrowser/impl/epics/EpicsDataSourceBrowser.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/org/cdma/gui/databrowser/impl/epics/EpicsDataSourceBrowser.java
index 7f37722..76c7da9 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/org/cdma/gui/databrowser/impl/epics/EpicsDataSourceBrowser.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/org/cdma/gui/databrowser/impl/epics/EpicsDataSourceBrowser.java
@@ -23,13 +23,13 @@ import org.cdma.gui.databrowser.view.tree.SourceTreeNode;
import fr.cea.irfu.epics.EpicsDataSourceProducer;
import fr.cea.irfu.epics.EpicsKey;
+import fr.cea.irfu.epics.cafejava.interfaces.ISimpleRecord;
import fr.soleil.comete.definition.widget.util.ITreeNode;
import fr.soleil.data.service.DataSourceProducerProvider;
import fr.soleil.data.service.HistoryKey;
import fr.soleil.data.service.IKey;
import fr.soleil.data.service.PolledRefreshingStrategy;
import fr.soleil.data.source.HistoryDataSourceProducer;
-import heps.epics.ca.interfaces.ISimpleRecord;
public class EpicsDataSourceBrowser extends AbstractDataSourceProducerBrowser {
@@ -203,8 +203,8 @@ public class EpicsDataSourceBrowser extends AbstractDataSourceProducerBrowser {
}
if (record != null) {
- heps.epics.ca.interfaces.DataType dataType = record.getDataType();
- if (dataType == heps.epics.ca.interfaces.DataType.STRING) {
+ fr.cea.irfu.epics.cafejava.interfaces.DataType dataType = record.getDataType();
+ if (dataType == fr.cea.irfu.epics.cafejava.interfaces.DataType.STRING) {
format = DataFormat.TEXT;
} else {
if (record.isBoolean()) {
@@ -275,7 +275,7 @@ public class EpicsDataSourceBrowser extends AbstractDataSourceProducerBrowser {
IKey deviceKey = EpicsKey.getDeviceKey(key);
String deviceName = EpicsKey.getKeyName(deviceKey);
String paramName = EpicsKey.getKeyName(key);
- heps.epics.ca.interfaces.DataType dataType = EpicsKey.getFormat(key);
+ fr.cea.irfu.epics.cafejava.interfaces.DataType dataType = EpicsKey.getFormat(key);
informations.put(LABEL_INFO + "Host", host);
informations.put(LABEL_INFO + "Device", deviceName);
informations.put(LABEL_INFO + "Name", paramName);
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/org/cdma/gui/databrowser/impl/epics/EpicsDataSourceSeeker.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/org/cdma/gui/databrowser/impl/epics/EpicsDataSourceSeeker.java
index 99662b9..336c0ac 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/org/cdma/gui/databrowser/impl/epics/EpicsDataSourceSeeker.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/org/cdma/gui/databrowser/impl/epics/EpicsDataSourceSeeker.java
@@ -34,12 +34,12 @@ import org.cdma.gui.databrowser.interfaces.IDataSourceBrowser;
import org.jdesktop.swingx.prompt.PromptSupport;
import fr.cea.irfu.epics.EpicsKey;
+import fr.cea.irfu.epics.cafejava.client.ProcessVariableManager;
+import fr.cea.irfu.epics.cafejava.interfaces.IRecord;
+import fr.cea.irfu.epics.cafejava.interfaces.ISimpleRecord;
+import fr.cea.irfu.epics.plcparsertool.interfaces.IPlcIoc;
+import fr.cea.irfu.epics.plcparsertool.model.ioc.PlcParserApi;
import fr.soleil.data.service.IKey;
-import heps.epics.ca.client.ProcessVariableManager;
-import heps.epics.ca.interfaces.IRecord;
-import heps.epics.ca.interfaces.ISimpleRecord;
-import heps.epics.plcparser.interfaces.IPlcIoc;
-import heps.epics.plcparser.model.ioc.PlcParserApi;
public class EpicsDataSourceSeeker extends AbstractFileDataSourceSeeker {
private static JPanel containPane = null;
--
GitLab