Small style stuff

[zxing.git] / core / src / com / google / zxing / Result.java

diff --git a/core/src/com/google/zxing/Result.java b/core/src/com/google/zxing/Result.java
index 056d3d9..ee1af52 100644 (file)
--- a/core/src/com/google/zxing/Result.java
+++ b/core/src/com/google/zxing/Result.java
@@ -16,6 +16,7 @@
 
 package com.google.zxing;
 
+import java.util.Enumeration;
 import java.util.Hashtable;
 
 /**
@@ -27,14 +28,23 @@ public final class Result {
 
   private final String text;
   private final byte[] rawBytes;
-  private final ResultPoint[] resultPoints;
+  private ResultPoint[] resultPoints;
   private final BarcodeFormat format;
   private Hashtable resultMetadata;
+  private final long timestamp;
 
   public Result(String text,
                 byte[] rawBytes,
                 ResultPoint[] resultPoints,
                 BarcodeFormat format) {
+    this(text, rawBytes, resultPoints, format, System.currentTimeMillis());
+  }
+
+  public Result(String text,
+                byte[] rawBytes,
+                ResultPoint[] resultPoints,
+                BarcodeFormat format,
+                long timestamp) {
     if (text == null && rawBytes == null) {
       throw new IllegalArgumentException("Text and bytes are null");
     }
@@ -43,6 +53,7 @@ public final class Result {
     this.resultPoints = resultPoints;
     this.format = format;
     this.resultMetadata = null;
+    this.timestamp = timestamp;
   }
 
   /**
@@ -91,12 +102,42 @@ public final class Result {
     resultMetadata.put(type, value);
   }
 
+  public void putAllMetadata(Hashtable metadata) {
+    if (metadata != null) {
+      if (resultMetadata == null) {
+        resultMetadata = metadata;
+      } else {
+        Enumeration e = metadata.keys();
+        while (e.hasMoreElements()) {
+          ResultMetadataType key = (ResultMetadataType) e.nextElement();
+          Object value = metadata.get(key);
+          resultMetadata.put(key, value);
+        }
+      }
+    }
+  }
+
+  public void addResultPoints(ResultPoint[] newPoints) {
+    if (resultPoints == null) {
+      resultPoints = newPoints;
+    } else if (newPoints != null && newPoints.length > 0) {
+      ResultPoint[] allPoints = new ResultPoint[resultPoints.length + newPoints.length];
+      System.arraycopy(resultPoints, 0, allPoints, 0, resultPoints.length);
+      System.arraycopy(newPoints, 0, allPoints, resultPoints.length, newPoints.length);
+      resultPoints = allPoints;
+    }
+  }
+
+  public long getTimestamp() {
+    return timestamp;
+  }
+
   public String toString() {
     if (text == null) {
       return "[" + rawBytes.length + " bytes]";
     } else {
       return text;
-  }
+    }
   }
 
 }