Changeset 402 for trunk/JavaHelperLib/src/de/ugoe/cs/util/FileTools.java

Timestamp:

03/20/12 11:52:15 (13 years ago)

Author:

sherbold

Message:

• modified de.ugoe.cs.util.FileTools? such that it does not always choose \r\n as carriage return, but instead the variant used by the operating system, i.e., \n with Linux and Macs, \r\n with Windows

File:

• trunk/JavaHelperLib/src/de/ugoe/cs/util/FileTools.java (modified) (2 diffs)

trunk/JavaHelperLib/src/de/ugoe/cs/util/FileTools.java

@@ -31 +31 @@
          * <p>
          * Returns an array of the lines contained in a file. The line separator is
-         * "\r\n".
+         * {@link StringTools#ENDLINE}.
          * </p>
          * 
@@ -45 +45 @@
         public static String[] getLinesFromFile(String filename)
                         throws IOException, FileNotFoundException {
-                return getLinesFromFile(filename, true);
+                boolean carriageReturn = true;
+                if( StringTools.ENDLINE.equals("\n") ) {
+                        carriageReturn = false;
+                }
+                return getLinesFromFile(filename, carriageReturn);
         }