PVAlarm,PVTimeStamp,Display,Control: only update fields that have changed

Author: mrkraimer

pvDataJava/.travis.yml

@@ -0,0 +1,10 @@
+sudo: required
+language: java
+jdk: oraclejdk8
+
+script:
+  - mvn clean verify
+
+after_failure:
+ - find ./ -type d -name "surefire-reports" -print0 | xargs -0 -I {} find {} -iname "*.txt" -type f | xargs cat
+ - find . -type f -name "*.log" -print0 -exec cat {} \;

pvDataJava/README.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 pvaDataJava
 ==========
 
@@ -40,3 +41,6 @@ e.g.
 
 from the directory containing the jar.
 
+=======
+# pvDataJava [![Build Status](https://travis-ci.org/epics-base/pvDataJava.svg?branch=master)](https://travis-ci.org/epics-base/pvDataJava)
+>>>>>>> 81ade9b8f2fdbfc1c12b415154e9b7808a35dc1a

pvDataJava/src/org/epics/pvdata/property/PVAlarmFactory.java

@@ -96,10 +96,25 @@ public boolean set(Alarm alarm) {
             throw new IllegalStateException(notAttached);
         }
         if(pvSeverity.isImmutable() || pvMessage.isImmutable()) return false;
-        pvSeverity.put(alarm.getSeverity().ordinal());
-        pvStatus.put(alarm.getStatus().ordinal());
-        pvMessage.put(alarm.getMessage());
-        return true;
+        Alarm current = new Alarm();
+        get(current);
+        boolean returnValue = false;
+        if(current.getSeverity()!=alarm.getSeverity())
+        {
+            pvSeverity.put(alarm.getSeverity().ordinal());
+            returnValue = true;
+        }
+        if(current.getStatus()!=alarm.getStatus())
+        {
+            pvStatus.put(alarm.getStatus().ordinal());
+            returnValue = true;
+        }
+        if(current.getMessage()!=alarm.getMessage())
+        {
+            pvMessage.put(alarm.getMessage());
+            returnValue = true;
+        }
+        return returnValue; 
     }
 
 }

pvDataJava/src/org/epics/pvdata/property/PVControlFactory.java

@@ -92,10 +92,25 @@ public boolean set(Control control) {
             throw new IllegalStateException(notAttached);
         }
         if(pvLow.isImmutable() || pvHigh.isImmutable()) return false;
-        pvLow.put(control.getLow());
-        pvHigh.put(control.getHigh());
-        pvMinStep.put(control.getMinStep());
-        return true;
+        Control current = new Control();
+        get(current);
+        boolean returnValue = false;
+        if(current.getLow()!=control.getLow())
+        {
+            pvLow.put(control.getLow());
+            returnValue = true;
+        }    
+        if(current.getHigh()!=control.getHigh())
+        {
+            pvHigh.put(control.getHigh());
+            returnValue = true;
+        } 
+        if(current.getMinStep()!=control.getMinStep())
+        {
+            pvMinStep.put(control.getMinStep());
+            returnValue = true;
+        }    
+        return returnValue;                            
     }
 
 }

pvDataJava/src/org/epics/pvdata/property/PVDisplayFactory.java

@@ -108,11 +108,34 @@ public boolean set(Display display) {
         }
         if(pvDescription.isImmutable() || pvFormat.isImmutable() || pvUnits.isImmutable()) return false;
         if(pvLow.isImmutable() || pvHigh.isImmutable()) return false;
-        pvDescription.put(display.getDescription());
-        pvFormat.put(display.getFormat());
-        pvUnits.put(display.getUnits());
-        pvLow.put(display.getLow());
-        pvHigh.put(display.getHigh());
-        return true;
+        Display current = new Display();
+        get(current);
+        boolean returnValue = false;
+        if(current.getDescription()!=display.getDescription())
+        {
+            pvDescription.put(display.getDescription());
+            returnValue = true;
+        }    
+        if(current.getFormat()!=display.getFormat())
+        {
+            pvFormat.put(display.getFormat());
+            returnValue = true;
+        }    
+        if(current.getUnits()!=display.getUnits())
+        {
+            pvUnits.put(display.getUnits());
+            returnValue = true;
+        }    
+        if(current.getLow()!=display.getLow())
+        {
+            pvLow.put(display.getLow());
+            returnValue = true;
+        }    
+        if(current.getHigh()!=display.getHigh())
+        {
+            pvHigh.put(display.getHigh());
+            returnValue = true;
+        }    
+        return returnValue;                            
     }
 }

pvDataJava/src/org/epics/pvdata/property/PVTimeStampFactory.java

@@ -93,10 +93,25 @@ public boolean set(TimeStamp timeStamp) {
             throw new IllegalStateException(notAttached);
         }
         if(pvSecs.isImmutable() || pvNano.isImmutable()) return false;
-        pvSecs.put(timeStamp.getSecondsPastEpoch());
-        pvUserTag.put(timeStamp.getUserTag());
-        pvNano.put(timeStamp.getNanoseconds());
-        return true;
+        TimeStamp current = TimeStampFactory.create();
+        get(current);
+        boolean returnValue = false;
+        if(current.getSecondsPastEpoch()!=timeStamp.getSecondsPastEpoch())
+        {
+            pvSecs.put(timeStamp.getSecondsPastEpoch());
+            returnValue = true;
+        }
+        if(current.getNanoseconds()!=timeStamp.getNanoseconds())
+        {
+            pvSecs.put(timeStamp.getSecondsPastEpoch());
+            returnValue = true;
+        }
+        if(current.getUserTag()!=timeStamp.getUserTag())
+        {
+            pvUserTag.put(timeStamp.getUserTag());
+            returnValue = true;
+        }
+        return returnValue;
     }