< prev index next >

test/jdk/java/text/testlib/HexDumpReader.java

Print this page
*** 1,7 ***
  /*
!  * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ---
  /*
!  * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 25,32 ***
  import java.io.ByteArrayInputStream;
  import java.io.File;
  import java.io.FileInputStream;
  import java.io.InputStream;
  import java.io.InputStreamReader;
  import java.util.ArrayList;
  import java.util.List;
  
  /**
   * HexDumpReader provides utility methods to read a hex dump text file
   * and convert to an InputStream.  The format supported by the methods
   * can be generated by the following command.
   *
   * $ od -vw -t x1 foo | sed -r -e 's/^[0-9]+ ?//' -e 's/ //g' -e '/^$/d'
   */
! public class HexDumpReader {
      public static InputStream getStreamFromHexDump(String fileName) {
          return getStreamFromHexDump(new File(System.getProperty("test.src", "."),
                                               fileName));
      }
  
      public static InputStream getStreamFromHexDump(File hexFile) {
          ByteArrayBuilder bab = new ByteArrayBuilder();
          int lineNo = 0;
          try (BufferedReader reader
                   = new BufferedReader(new InputStreamReader(new FileInputStream(hexFile),
!                                                             "us-ascii"))) {
              String line;
              while ((line = reader.readLine()) != null) {
                  lineNo++;
                  line = line.trim();
                  // Skip blank and comment lines.
--- 25,37 ---
  import java.io.ByteArrayInputStream;
  import java.io.File;
  import java.io.FileInputStream;
  import java.io.InputStream;
  import java.io.InputStreamReader;
+ import java.nio.charset.StandardCharsets;
  import java.util.ArrayList;
  import java.util.List;
  
  /**
   * HexDumpReader provides utility methods to read a hex dump text file
   * and convert to an InputStream.  The format supported by the methods
   * can be generated by the following command.
   *
   * $ od -vw -t x1 foo | sed -r -e 's/^[0-9]+ ?//' -e 's/ //g' -e '/^$/d'
   */
! public final class HexDumpReader {
+ 
+     // Utility class should not be instantiated
+     private HexDumpReader() {}
+ 
      public static InputStream getStreamFromHexDump(String fileName) {
          return getStreamFromHexDump(new File(System.getProperty("test.src", "."),
                                               fileName));
      }
  
      public static InputStream getStreamFromHexDump(File hexFile) {
          ByteArrayBuilder bab = new ByteArrayBuilder();
          int lineNo = 0;
          try (BufferedReader reader
                   = new BufferedReader(new InputStreamReader(new FileInputStream(hexFile),
!                 StandardCharsets.US_ASCII))) {
              String line;
              while ((line = reader.readLine()) != null) {
                  lineNo++;
                  line = line.trim();
                  // Skip blank and comment lines.
< prev index next >