Progress #14

hereon-wpi · May 22, 2021 · d22e885 · d22e885
1 parent d6a3d9a
commit d22e885
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 20 deletions.
diff --git a/src/main/java/hzg/wpn/tango/DataFormatServer.java b/src/main/java/hzg/wpn/tango/DataFormatServer.java
@@ -110,6 +110,7 @@ public String getNxPath() throws Exception {
     @Attribute
     public void setNxPath(String nxPath) throws Exception {
         String clientId = getClientId();
+        //TODO aroundInvoke?
         if(NexusWriterHelper.hasMapping("external:" + nxPath)) {
             nxPath = NexusWriterHelper.toNxPath("external:" + nxPath);
         }
@@ -396,13 +397,12 @@ public void delete() throws Exception {
         }
     }
 
-    private class DoubleWriter implements NexusWriter {
+    private class DoubleWriter extends NexusWriter {
         private double v;
-        private String nxPath;
 
         private DoubleWriter(double v, String nxPath) {
+            super(nxPath);
             this.v = v;
-            this.nxPath = nxPath;
         }
 
         @Override
@@ -415,13 +415,12 @@ public void write(NxFile file) throws IOException {
         }
     }
 
-    private class FloatWriter implements NexusWriter {
+    private class FloatWriter extends NexusWriter {
         private float v;
-        private String nxPath;
 
         private FloatWriter(float v, String nxPath) {
+            super(nxPath);
             this.v = v;
-            this.nxPath = nxPath;
         }
 
         @Override
@@ -434,13 +433,12 @@ public void write(NxFile file) throws IOException {
         }
     }
 
-    private class IntegerWriter implements NexusWriter {
+    private class IntegerWriter extends NexusWriter {
         private int v;
-        private String nxPath;
 
         private IntegerWriter(int v, String nxPath) {
+            super(nxPath);
             this.v = v;
-            this.nxPath = nxPath;
         }
 
         @Override
@@ -453,14 +451,13 @@ public void write(NxFile file) throws IOException {
         }
     }
 
-    private class LongWriter implements NexusWriter {
-        private long v;
-        private String nxPath;
+    private class LongWriter extends NexusWriter {
+        long v;
 
 
         private LongWriter(long v, String nxPath) {
+            super(nxPath);
             this.v = v;
-            this.nxPath = nxPath;
         }
 
         @Override
@@ -473,13 +470,12 @@ public void write(NxFile file) throws IOException {
         }
     }
 
-    private class StringWriter implements NexusWriter {
+    private class StringWriter extends NexusWriter {
         private String v;
-        private String nxPath;
 
         private StringWriter(String v, String nxPath) {
+            super(nxPath);
             this.v = v;
-            this.nxPath = nxPath;
         }
 
         @Override
@@ -509,6 +505,7 @@ public void run() {
             } catch (IOException | LibpniioException e) {
                 DataFormatServer.this.logger.error(e.getMessage(), e);
                 deviceManager.pushStateChangeEvent(DeviceState.ALARM);
+                deviceManager.pushStatusChangeEvent(String.format("Failed to write a value into %s in %s due to %s", writer.nxPath ,nxFile.getFileName(), e.getMessage()));
             }
         }
     }

diff --git a/src/main/java/hzg/wpn/tango/GenericBlob.java b/src/main/java/hzg/wpn/tango/GenericBlob.java
@@ -20,18 +20,20 @@
  * @author Igor Khokhriakov <[email protected]>
  * @since 11.07.2015
  */
-public class GenericBlob implements NexusWriter {
+public class GenericBlob extends NexusWriter {
     private final Logger logger = LoggerFactory.getLogger(GenericBlob.class);
 
     public final List<Element> elements = new ArrayList<>();
     private final boolean append;
 
 
     public GenericBlob(boolean append) {
+        super(null);
         this.append = append;
     }
 
     public GenericBlob(PipeBlob blob) throws DevFailed {
+        super(null);
         this.append = blob.get(0).extractBooleanArray()[0];
 
 

diff --git a/src/main/java/hzg/wpn/tango/NexusWriter.java b/src/main/java/hzg/wpn/tango/NexusWriter.java
@@ -8,6 +8,12 @@
  * @author Igor Khokhriakov <[email protected]>
  * @since 13.07.2015
  */
-public interface NexusWriter {
-    void write(NxFile file) throws IOException;
+public abstract class NexusWriter {
+    final String nxPath;
+
+    public NexusWriter(String nxPath) {
+        this.nxPath = nxPath;
+    }
+
+    abstract void write(NxFile file) throws IOException;
 }
diff --git a/src/main/java/hzg/wpn/tango/StatusServerBlob.java b/src/main/java/hzg/wpn/tango/StatusServerBlob.java
@@ -16,13 +16,14 @@
  * @author Igor Khokhriakov <[email protected]>
  * @since 11.07.2015
  */
-public class StatusServerBlob implements NexusWriter {
+public class StatusServerBlob extends NexusWriter {
     private final Logger logger = LoggerFactory.getLogger(GenericBlob.class);
 
     public GenericBlob values = new GenericBlob(true);
     public GenericBlob times = new GenericBlob(true);
 
     public StatusServerBlob(PipeBlob blob) throws DevFailed {
+        super(null);
         for (PipeDataElement dataElement : blob) {
             PipeBlob innerBlob = dataElement.extractPipeBlob();
             String name = innerBlob.getName();