Ver código fonte

Remove dead code regarding an uninitialized file writer.

Timur Sağlam 5 anos atrás
pai
commit
c431c9841b
1 arquivos alterados com 2 adições e 28 exclusões
  1. 2 28
      jplag/src/main/java/jplag/JPlag.java

+ 2 - 28
jplag/src/main/java/jplag/JPlag.java

@@ -7,7 +7,6 @@ import static jplag.options.Verbosity.QUIET;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -37,7 +36,6 @@ public class JPlag implements ProgramI {
     private ComparisonStrategy comparisonStrategy;
     private GreedyStringTiling gSTiling = new GreedyStringTiling(this); // Contains the comparison logic.
     private final JPlagOptions options;
-    private FileWriter writer = null;
 
     // ERROR REPORTING:
     private String currentSubmissionName = "<Unknown submission>"; // TODO PB: This should be moved to parseSubmissions(...)
@@ -86,7 +84,6 @@ public class JPlag implements ProgramI {
         errorVector = null; // errorVector is not needed anymore
         System.gc();
         JPlagResult result = comparisonStrategy.compareSubmissions(submissions, baseCodeSubmission);
-        closeWriter();
         return result;
     }
 
@@ -139,9 +136,9 @@ public class JPlag implements ProgramI {
     public void print(String message, String longMessage) {
         if (options.getVerbosity() == PARSER) {
             if (longMessage != null) {
-                myWrite(longMessage);
+                System.out.println(longMessage);
             } else if (message != null) {
-                myWrite(message);
+                System.out.println(message);
             }
         }
         if (options.getVerbosity() == QUIET) {
@@ -195,17 +192,6 @@ public class JPlag implements ProgramI {
         System.out.println("Basecode directory \"" + baseCodePath + "\" will be used");
     }
 
-    private void closeWriter() {
-        try {
-            if (writer != null) {
-                writer.close();
-            }
-        } catch (IOException ex) {
-            ex.printStackTrace();
-        }
-        writer = null;
-    }
-
     private Vector<Submission> filterValidSubmissions(Vector<Submission> submissions) {
         return submissions.stream().filter(submission -> !submission.hasErrors).collect(Collectors.toCollection(Vector::new));
     }
@@ -312,18 +298,6 @@ public class JPlag implements ProgramI {
         return submissions;
     }
 
-    private void myWrite(String str) {
-        if (writer != null) {
-            try {
-                writer.write(str);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        } else {
-            System.out.print(str);
-        }
-    }
-
     /**
      * TODO PB: Find a better way to separate parseSubmissions(...) and parseBaseCodeSubmission(...)
      */