#15 adding equals and hash & making the vImageType configurable

Author: shroffk

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

@@ -4,6 +4,8 @@
  */
 package org.epics.vtype;
 
+import java.util.Objects;
+
 import org.epics.util.array.ListNumber;
 
 /**
@@ -33,18 +35,17 @@ public abstract class VImage extends VType implements AlarmProvider, TimeProvide
      * @return ListNumber image data
      */
     public abstract ListNumber getData();
-    
+
     /**
-     * Describes the type in which the data is stored
-     * {@link VImageDataType}
+     * Describes the type in which the data is stored {@link VImageDataType}
      * 
-     * @return image data type 
+     * @return image data type
      */
     public abstract VImageDataType getDataType();
 
     /**
-     * Returns the image type, The image type describes the mechanism in which
-     * the data is encoded and how it can be converted to something that can be
+     * Returns the image type, The image type describes the mechanism in which the
+     * data is encoded and how it can be converted to something that can be
      * rendered.
      * 
      * @return the image type {@link VImageType}
@@ -53,14 +54,50 @@ public abstract class VImage extends VType implements AlarmProvider, TimeProvide
 
     /**
      * Creates a new VImage.
-     * 
+     *
      * @param value the value
      * @param alarm the alarm
      * @param time the time
      * @param display the display
-     * @return the new value
+     * @return the new Image
      */
-    public static VImage of(int height, int width, final ListNumber data, VImageDataType imageDataType, Alarm alarm, Time time) {
-        return new IVImage(height, width, data, imageDataType, VImageType.TYPE_3BYTE_BGR, alarm, time);
+    public static VImage of(int height, int width, final ListNumber data, VImageDataType imageDataType, VImageType vImageType, Alarm alarm, Time time) {
+        return new IVImage(height, width, data, imageDataType, vImageType, alarm, time);
+    }
+
+    @Override
+    public final boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+
+        if (obj instanceof VImage) {
+            VImage other = (VImage) obj;
+
+            return getClass().equals(other.getClass()) 
+                    && getHeight() == other.getHeight()
+                    && getWidth() == other.getWidth()
+                    && getData().equals(other.getData())
+                    && getDataType().equals(other.getDataType())
+                    && getVImageType().equals(other.getVImageType())
+                    && getAlarm().equals(other.getAlarm())
+                    && getTime().equals(other.getTime());
+        }
+
+        return false;
     }
+
+    @Override
+    public final int hashCode() {
+        int hash = 7;
+        hash = 23 * hash + Objects.hashCode(getHeight());
+        hash = 23 * hash + Objects.hashCode(getWidth());
+        hash = 23 * hash + Objects.hashCode(getData());
+        hash = 23 * hash + Objects.hashCode(getDataType());
+        hash = 23 * hash + Objects.hashCode(getVImageType());
+        hash = 23 * hash + Objects.hashCode(getAlarm());
+        hash = 23 * hash + Objects.hashCode(getTime());
+        return hash;
+    }
+
 }

epics-vtype/vtype/src/test/java/org/epics/vtype/VImageTest.java

@@ -27,6 +27,7 @@ public void of() {
             img = ImageIO.read(VType.class.getResource("Tulips.jpg"));
             vImage = VImage.of(img.getHeight(), img.getWidth(),
                     ArrayByte.of(((DataBufferByte) img.getRaster().getDataBuffer()).getData()), VImageDataType.pvByte,
+                    VImageType.TYPE_3BYTE_BGR,
                     Alarm.none(), Time.now());
             BufferedImage vImg = toImage(vImage);
             for (int x = 0; x < vImage.getWidth(); x++) {
@@ -49,8 +50,7 @@ public void of() {
 
     private static BufferedImage toImage(VImage vImage) {
         if (vImage.getVImageType() == VImageType.TYPE_3BYTE_BGR) {
-            BufferedImage image = new BufferedImage(vImage.getWidth(), vImage.getHeight(),
-                    BufferedImage.TYPE_3BYTE_BGR);
+            BufferedImage image = new BufferedImage(vImage.getWidth(), vImage.getHeight(), BufferedImage.TYPE_3BYTE_BGR);
             ListNumber data = vImage.getData();
             for (int i = 0; i < data.size(); i++) {
                 ((DataBufferByte) image.getRaster().getDataBuffer()).getData()[i] = data.getByte(i);