Changeset 50

Timestamp:

12/10/09 03:59:38 (15 years ago)

Author:

mszubert

Message:

Newline character removed from framstick genotypes.
Reading from input streams refactored (and optimized).

File:

• java/ecj/framsticks/FramsticksUtils.java (modified) (4 diffs)

java/ecj/framsticks/FramsticksUtils.java

@@ -4 +4 @@
 import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.FileWriter;
+import java.io.IOException;
 import java.io.InputStreamReader;
 
@@ -83 +85 @@
 
         private String executeCommand(String command) {
-                String line;
-                String result = "";
-                
                 if (debug) {
                         System.err.println("Executing command : " + command);
                 }
                 
+                String result = new String();
                 try {
                         File f = new File(directoryPath);
                         Process p = Runtime.getRuntime().exec(directoryPath + command, null, f);
                         BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream()));
-                        while ((line = input.readLine()) != null) {
-                                result += (line + '\n');
-                        }
-                        input.close();
+                        result = readInput(input);
                 } catch (Exception ex) {
                         ex.printStackTrace();
@@ -105 +102 @@
                         System.err.println("Result : " + result);
                 }
-                
+
                 return result;
         }
@@ -120 +117 @@
 
         private String readFromFile(String filePath) {
-                String line;
-                String result = "";
+                String result = new String();
                 try {
                         BufferedReader input = new BufferedReader(new FileReader(filePath));
+                        result = readInput(input);
+                } catch (FileNotFoundException e) {
+                        e.printStackTrace();
+                }
+                return result;
+        }
+        
+        private String readInput(BufferedReader input) {
+                StringBuilder result = new StringBuilder();
+                
+                try {
+                        String line;
                         while ((line = input.readLine()) != null) {
-                                result += (line + '\n');
+                                result.append(line + '\n');
                         }
                         input.close();
-                } catch (Exception ex) {
+                } catch (IOException ex) {
                         ex.printStackTrace();
                 }
 
-                return result;
+                //Delete last newline character
+                if (result.length() > 0) {
+                        return result.substring(0, result.length() - 1);
+                } else {
+                        return result.toString();
+                }
         }