Update VEnumArray to allow indices with no label string and short[]

Author: shroffk

epics-vtype/vtype/src/main/java/org/epics/vtype/IVEnumArray.java

@@ -5,22 +5,23 @@
 
 import org.epics.util.array.ArrayInteger;
 import org.epics.util.array.ListInteger;
+import org.epics.util.array.ListNumber;
 
 /**
- * Immutable {@code VEnum} implementation.
+ * Immutable {@code VEnumArray} implementation.
  *
  * @author carcassi, shroffk, kasemir
  */
 public class IVEnumArray extends VEnumArray {
 
     private final Alarm alarm;
     private final Time time;
-    private final ListInteger indices;
+    private final ListNumber indices;
     private final EnumDisplay enumDisplay;
 
     private final List<String> labels;
 
-    IVEnumArray(ListInteger indices, EnumDisplay enumDisplay, Alarm alarm, Time time) {
+    IVEnumArray(ListNumber indices, EnumDisplay enumDisplay, Alarm alarm, Time time) {
         VType.argumentNotNull("enumDisplay", enumDisplay);
         this.enumDisplay = enumDisplay;
 
@@ -32,8 +33,8 @@ public class IVEnumArray extends VEnumArray {
         for (int i = 0; i < indices.size(); i++) {
             int index = indices.getInt(i);
             if (index < 0 || index >= enumDisplay.getChoices().size()) {
-                throw new IndexOutOfBoundsException("VEnumArray element " + i + " has index " + index
-                        + " outside of permitted options " + enumDisplay.getChoices());
+                labels.add("VEnumArray element " + i + " has index " + index + " outside of permitted options "
+                        + enumDisplay.getChoices());
             }
             labels.add(enumDisplay.getChoices().get(index));
         }
@@ -63,7 +64,7 @@ public List<String> getData() {
     }
 
     @Override
-    public ListInteger getIndexes() {
+    public ListNumber getIndexes() {
         return indices;
     }
 

epics-vtype/vtype/src/main/java/org/epics/vtype/VEnumArray.java

@@ -3,11 +3,16 @@
 import java.util.List;
 
 import org.epics.util.array.ListInteger;
+import org.epics.util.array.ListNumber;
+import org.epics.util.array.ListShort;
 
+/**
+ * Scalar enum array with alarm, timestamp, and display information.
+ */
 public abstract class VEnumArray extends Array implements AlarmProvider, TimeProvider {
 
     /**
-     * 
+     * Return the enum label values
      */
     @Override
     public abstract List<String> getData();
@@ -17,7 +22,7 @@ public abstract class VEnumArray extends Array implements AlarmProvider, TimePro
      *
      * @return an array of indexes
      */
-    public abstract ListInteger getIndexes();
+    public abstract ListNumber getIndexes();
 
     /** @return the enum display information, i.e. choices */
     public abstract EnumDisplay getDisplay();
@@ -33,4 +38,16 @@ public abstract class VEnumArray extends Array implements AlarmProvider, TimePro
     public static VEnumArray of(ListInteger data, EnumDisplay enumDisplay, Alarm alarm, Time time) {
         return new IVEnumArray(data, enumDisplay, alarm, time);
     }
+
+    /**
+     * Return an instance of the VEnumArray
+     * @param data the indices
+     * @param enumDisplay the enum display labels
+     * @param alarm the alarm
+     * @param time new time
+     * @return {@link VEnumArray} instance of VEnumArray
+     */
+    public static VEnumArray of(ListShort data, EnumDisplay enumDisplay, Alarm alarm, Time time) {
+        return new IVEnumArray(data, enumDisplay, alarm, time);
+    }
 }