Fixed error reported in #357 for hex viewer not displaying correct hex values.

Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java

@@ -299,7 +299,6 @@ public class DataContentViewerHex extends javax.swing.JPanel implements DataCont
         currentPage = page;
         long offset = (currentPage - 1) * pageLength;
         
-        
         // change the cursor to "waiting cursor" for this operation
         this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
 
@@ -344,13 +343,13 @@ public class DataContentViewerHex extends javax.swing.JPanel implements DataCont
         // set the output view
         if (errorText == null) {
             int showLength = bytesRead < pageLength ? bytesRead : (int) pageLength;
-            outputViewPane.setText(DataConversion.byteArrayToHex(data, showLength, offset, outputViewPane.getFont()));
+            outputViewPane.setText(DataConversion.byteArrayToHex(data, showLength, offset));
         }
         else {
             outputViewPane.setText(errorText);
         }
 
-        outputViewPane.moveCaretPosition(0);
+        outputViewPane.setCaretPosition(0);
         this.setCursor(null);
     }
 

Core/src/org/sleuthkit/autopsy/datamodel/DataConversion.java

@@ -20,79 +20,106 @@ package org.sleuthkit.autopsy.datamodel;
 
 import java.awt.Font;
 import java.util.Arrays;
+import java.util.Formatter;
 
 /**
  * Helper methods for converting data.
  */
 public class DataConversion {
 
-    public static String byteArrayToHex(byte[] array, int length, long offset, Font font) {
+    final private static char[] hexArray = "0123456789ABCDEF".toCharArray();
+    
+    /**
+     * Return the hex-dump layout of the passed in byte array.
+     * Deprecated because we don't need font
+     * @param array Data to display
+     * @param length Amount of data in array to display
+     * @param arrayOffset Offset of where data in array begins as part of a bigger file (used for arrayOffset column)
+     * @param font Font that will be used to display the text
+     * @return  
+     */
+    @Deprecated
+    public static String byteArrayToHex(byte[] array, int length, long arrayOffset, Font font) {
+        return byteArrayToHex(array, length, arrayOffset);
+    }
+    
+    /**
+     * Return the hex-dump layout of the passed in byte array.
+     * @param array Data to display
+     * @param length Amount of data in array to display
+     * @param arrayOffset Offset of where data in array begins as part of a bigger file (used for arrayOffset column)
+     * @return  
+     */
+    public static String byteArrayToHex(byte[] array, int length, long arrayOffset) {
         if (array == null) {
             return "";
-        } else {
+        } 
-            String base = new String(array, 0, length);
+        else {
+            StringBuilder outputStringBuilder = new StringBuilder();
             
-            StringBuilder buff = new StringBuilder();
+            // loop through the file in 16-byte increments 
-            int count = 0;
+            for (int curOffset = 0; curOffset < length; curOffset += 16) {
-            int extra = base.length() % 16;
+                // how many bytes are we displaying on this line
-            String sub = "";
+                int lineLen = 16;
-            char subchar;
+                if (length - curOffset < 16) {
+                    lineLen = length - curOffset;
+                }
                 
-            //commented out code can be used as a base for generating hex length based on
+                // print the offset column
-            //offset/length/file size
+                //outputStringBuilder.append("0x");
-            //String hex = Long.toHexString(length + offset);
+                outputStringBuilder.append(String.format("0x%08x: ", arrayOffset + curOffset));
-            //double hexMax = Math.pow(16, hex.length());
+                //outputStringBuilder.append(": ");
-            double hexMax = Math.pow(16, 6);
+
-            while (count < base.length() - extra) {
+                // print the hex columns                
-                buff.append("0x");
-                buff.append(Long.toHexString((long) (offset + count + hexMax)).substring(1));
-                buff.append(": ");
                 for (int i = 0; i < 16; i++) {
-                    buff.append(Integer.toHexString((((int) base.charAt(count + i)) & 0xff) + 256).substring(1).toUpperCase());
+                    if (i < lineLen) {        
-                    buff.append("  ");
+                        int v = array[curOffset + i] & 0xFF;
+                        outputStringBuilder.append(hexArray[v >>> 4]);
+                        outputStringBuilder.append(hexArray[v & 0x0F]);
+                    }
+                    else {
+                        outputStringBuilder.append("  ");
+                    }
+                    
+                    // someday we'll offer the option of these two styles...
+                    if (true) {
+                        outputStringBuilder.append(" ");
+                        if (i % 4 == 3) {
+                            outputStringBuilder.append(" ");
+                        }
                         if (i == 7) {
-                        buff.append("  ");
+                            outputStringBuilder.append(" ");
+                        }
+                    }
+                    // xxd style
+                    else {
+                        if (i % 2 == 1) {
+                            outputStringBuilder.append(" ");
                         }
                     }
-                sub = base.substring(count, count + 16);
-                for (int i = 0; i < 16; i++) {
-                    subchar = sub.charAt(i);
-                    if (!font.canDisplay(subchar)) {
-                        sub.replace(subchar, '.');
                 }
                 
-                    // replace all unprintable characters with "."
+                outputStringBuilder.append("  ");
-                    int dec = (int) subchar;
+
+                // print the ascii columns
+                String ascii = new String(array, curOffset, lineLen);                
+                for (int i = 0; i < 16; i++) {
+                    char c = ' ';
+                    if (i < lineLen) {
+                        c = ascii.charAt(i);
+                        int dec = (int) c;
+                        
                         if (dec < 32 || dec > 126) {
-                        sub = sub.replace(subchar, '.');
+                            c = '.';
                         }
                     }
-                buff.append("  " + sub + "\n");
+                    outputStringBuilder.append(c);    
-                count += 16;
+                }
                 
+                outputStringBuilder.append("\n");
             }
-            if (base.length() % 16 != 0) {
+           
-                buff.append("0x" + Long.toHexString((long) (offset + count + hexMax)).substring(1) + ": ");
+            return outputStringBuilder.toString();
-            }
-            for (int i = 0; i < 16; i++) {
-                if (i < extra) {
-                    buff.append(Integer.toHexString((((int) base.charAt(count + i)) & 0xff) + 256).substring(1) + "  ");
-                } else {
-                    buff.append("    ");
-                }
-                if (i == 7) {
-                    buff.append("  ");
-                }
-            }
-            sub = base.substring(count, count + extra);
-            for (int i = 0; i < extra; i++) {
-                subchar = sub.charAt(i);
-                if (!font.canDisplay(subchar)) {
-                    sub.replace(subchar, '.');
-                }
-            }
-            buff.append("  " + sub);
-            return buff.toString();
         }
     }