Merge pull request #19 from epics-base/updated_pvdata

Updated pvdata

Author: shroffk

pvDataJava/pom.xml

@@ -42,4 +42,17 @@
     	<connection>https://github.com/epics-base/pvDataJava</connection>
     	<developerConnection>https://github.com/epics-base/pvDataJava</developerConnection>
     </scm>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>epics-util</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>

pvDataJava/src/org/epics/pvdata/copy/package.html

@@ -18,5 +18,7 @@
      </dd>
 </dl>
 
+
+</p>
 </body>
 </html>

pvDataJava/src/org/epics/pvdata/factory/AbstractPVArray.java

@@ -10,6 +10,8 @@
 import org.epics.pvdata.pv.ArrayData;
 import org.epics.pvdata.pv.PVArray;
 import org.epics.pvdata.pv.SerializableControl;
+import org.epics.util.array.CollectionNumbers;
+import org.epics.util.array.ListNumber;
 
 /**
  * Abstract base class for any PVArray field.
@@ -116,6 +118,22 @@ protected int internalPut(int offset, int len, Object from, int fromOffset) {
         return len;      
     }
 
+    public void put(int offset, ListNumber list) {
+    	if (super.isImmutable())
+        	throw new IllegalStateException("field is immutable");
+ 
+        int newLength = offset + list.size();
+        if (newLength > length)
+        {
+        	checkLength(newLength);
+        	setCapacity(newLength);
+        	length = newLength;
+        }
+        
+        CollectionNumbers.toList(getValue()).setAll(offset, list);
+        super.postPut();
+    }
+
     private void checkLength(int len)
     {
     	Array.ArraySizeType type = getArray().getArraySizeType();

pvDataJava/src/org/epics/pvdata/factory/BasePVByteArray.java

@@ -12,6 +12,8 @@
 import org.epics.pvdata.pv.PVByteArray;
 import org.epics.pvdata.pv.ScalarArray;
 import org.epics.pvdata.pv.SerializableControl;
+import org.epics.util.array.ArrayByte;
+import org.epics.util.array.CollectionNumbers;
 
 
 /**
@@ -71,6 +73,11 @@ protected int getFromBuffer(ByteBuffer buffer, DeserializableControl control, in
     public int get(int offset, int len, ByteArrayData data) {
     	return internalGet(offset, len, data);
     }
+
+    @Override
+    public ArrayByte get() {
+        return CollectionNumbers.unmodifiableListByte(value);
+    }
 
     /* (non-Javadoc)
      * @see org.epics.pvdata.pv.PVByteArray#put(int, int, byte[], int)

pvDataJava/src/org/epics/pvdata/factory/BasePVDoubleArray.java

@@ -12,6 +12,9 @@
 import org.epics.pvdata.pv.PVDoubleArray;
 import org.epics.pvdata.pv.ScalarArray;
 import org.epics.pvdata.pv.SerializableControl;
+import org.epics.util.array.ArrayDouble;
+import org.epics.util.array.CollectionNumbers;
+import org.epics.util.array.ListNumber;
 
 
 /**
@@ -73,6 +76,11 @@ protected int getFromBuffer(ByteBuffer buffer, DeserializableControl control, in
     public int get(int offset, int len, DoubleArrayData data) {
     	return internalGet(offset, len, data);
     }
+
+    @Override
+    public ArrayDouble get() {
+        return CollectionNumbers.unmodifiableListDouble(value);
+    }
 
     /* (non-Javadoc)
      * @see org.epics.pvdata.pv.PVDoubleArray#put(int, int, double[], int)
@@ -82,7 +90,6 @@ public int put(int offset, int len, double[] from, int fromOffset) {
     	return internalPut(offset, len, from, fromOffset);
     }
 
-
     /* (non-Javadoc)
      * @see org.epics.pvdata.pv.PVDoubleArray#shareData(double[])
      */

pvDataJava/src/org/epics/pvdata/factory/BasePVFloatArray.java

@@ -12,6 +12,8 @@
 import org.epics.pvdata.pv.PVFloatArray;
 import org.epics.pvdata.pv.ScalarArray;
 import org.epics.pvdata.pv.SerializableControl;
+import org.epics.util.array.ArrayFloat;
+import org.epics.util.array.CollectionNumbers;
 
 
 /**
@@ -73,6 +75,11 @@ protected int getFromBuffer(ByteBuffer buffer, DeserializableControl control, in
     public int get(int offset, int len, FloatArrayData data) {
     	return internalGet(offset, len, data);
     }
+
+    @Override
+    public ArrayFloat get() {
+        return CollectionNumbers.unmodifiableListFloat(value);
+    }
 
     /* (non-Javadoc)
      * @see org.epics.pvdata.pv.PVFloatArray#put(int, int, float[], int)

pvDataJava/src/org/epics/pvdata/factory/BasePVIntArray.java

@@ -12,6 +12,8 @@
 import org.epics.pvdata.pv.PVIntArray;
 import org.epics.pvdata.pv.ScalarArray;
 import org.epics.pvdata.pv.SerializableControl;
+import org.epics.util.array.ArrayInteger;
+import org.epics.util.array.CollectionNumbers;
 
 
 /**
@@ -73,6 +75,11 @@ protected int getFromBuffer(ByteBuffer buffer, DeserializableControl control, in
     public int get(int offset, int len, IntArrayData data) {
     	return internalGet(offset, len, data);
     }
+
+    @Override
+    public ArrayInteger get() {
+        return CollectionNumbers.unmodifiableListInt(value);
+    }
 
     /* (non-Javadoc)
      * @see org.epics.pvdata.pv.PVIntArray#put(int, int, int[], int)

pvDataJava/src/org/epics/pvdata/factory/BasePVLongArray.java

@@ -12,6 +12,8 @@
 import org.epics.pvdata.pv.PVLongArray;
 import org.epics.pvdata.pv.ScalarArray;
 import org.epics.pvdata.pv.SerializableControl;
+import org.epics.util.array.ArrayLong;
+import org.epics.util.array.CollectionNumbers;
 
 
 /**
@@ -73,6 +75,11 @@ protected int getFromBuffer(ByteBuffer buffer, DeserializableControl control, in
     public int get(int offset, int len, LongArrayData data) {
     	return internalGet(offset, len, data);
     }
+
+    @Override
+    public ArrayLong get() {
+        return CollectionNumbers.unmodifiableListLong(value);
+    }
 
     /* (non-Javadoc)
      * @see org.epics.pvdata.pv.PVLongArray#put(int, int, long[], int)

pvDataJava/src/org/epics/pvdata/factory/BasePVShortArray.java

@@ -12,6 +12,8 @@
 import org.epics.pvdata.pv.ScalarArray;
 import org.epics.pvdata.pv.SerializableControl;
 import org.epics.pvdata.pv.ShortArrayData;
+import org.epics.util.array.ArrayShort;
+import org.epics.util.array.CollectionNumbers;
 
 
 /**
@@ -73,6 +75,11 @@ protected int getFromBuffer(ByteBuffer buffer, DeserializableControl control, in
     public int get(int offset, int len, ShortArrayData data) {
     	return internalGet(offset, len, data);
     }
+
+    @Override
+    public ArrayShort get() {
+        return CollectionNumbers.unmodifiableListShort(value);
+    }
 
     /* (non-Javadoc)
      * @see org.epics.pvdata.pv.PVShortArray#put(int, int, short[], int)

pvDataJava/src/org/epics/pvdata/factory/BasePVUByteArray.java

@@ -12,6 +12,8 @@
 import org.epics.pvdata.pv.PVUByteArray;
 import org.epics.pvdata.pv.ScalarArray;
 import org.epics.pvdata.pv.SerializableControl;
+import org.epics.util.array.ArrayUByte;
+import org.epics.util.array.CollectionNumbers;
 
 
 /**
@@ -71,6 +73,11 @@ protected int getFromBuffer(ByteBuffer buffer, DeserializableControl control, in
     public int get(int offset, int len, ByteArrayData data) {
     	return internalGet(offset, len, data);
     }
+
+    @Override
+    public ArrayUByte get() {
+        return CollectionNumbers.unmodifiableListUByte(value);
+    }
 
     /* (non-Javadoc)
      * @see org.epics.pvdata.pv.PVUByteArray#put(int, int, byte[], int)