Refactoring: moving an auxiliary class from the top level to inner class

aquawoman22 · May 17, 2014 · d65bad2 · d65bad2
1 parent 953007b
commit d65bad2
Showing 1 changed file with 46 additions and 47 deletions.
diff --git a/java/server/src/org/openqa/selenium/remote/server/log/SessionLogsToFileRepository.java b/java/server/src/org/openqa/selenium/remote/server/log/SessionLogsToFileRepository.java
@@ -32,53 +32,6 @@
 import java.util.Map;
 import java.util.logging.LogRecord;
 
-class LogFile {
-  private String logName;
-  private ObjectOutputStream logWriter;
-  private ObjectInputStream logReader;
-
-  public LogFile(String logName) {
-    this.logName = logName;
-  }
-
-  public void openLogWriter() throws IOException {
-    logWriter = new ObjectOutputStream(new FileOutputStream(logName));
-  }
-
-  public void closeLogWriter() throws IOException {
-    if (logWriter != null) {
-      logWriter.close();
-    }
-  }
-
-  public void openLogReader() throws IOException {
-    logReader = new ObjectInputStream(new FileInputStream(logName));
-  }
-
-  public void closeLogReader() throws IOException {
-    if (logReader != null) {
-      logReader.close();
-    }
-  }
-
-  public ObjectOutputStream getLogWriter() {
-    return logWriter;
-  }
-
-  public ObjectInputStream getLogReader() {
-    return logReader;
-  }
-
-  public void removeLogFile() throws IOException {
-    if (logName != null) {
-      closeLogReader();
-      closeLogWriter();
-      new File(logName).delete();
-    }
-  }
-}
-
-
 public class SessionLogsToFileRepository {
   private Map<SessionId, LogFile> sessionToLogFileMap;
 
@@ -173,4 +126,50 @@ public void removeLogFile(SessionId sessionId) {
       throw new RuntimeException(e);
     }
   }
+
+  static class LogFile {
+    private String logName;
+    private ObjectOutputStream logWriter;
+    private ObjectInputStream logReader;
+
+    public LogFile(String logName) {
+      this.logName = logName;
+    }
+
+    public void openLogWriter() throws IOException {
+      logWriter = new ObjectOutputStream(new FileOutputStream(logName));
+    }
+
+    public void closeLogWriter() throws IOException {
+      if (logWriter != null) {
+        logWriter.close();
+      }
+    }
+
+    public void openLogReader() throws IOException {
+      logReader = new ObjectInputStream(new FileInputStream(logName));
+    }
+
+    public void closeLogReader() throws IOException {
+      if (logReader != null) {
+        logReader.close();
+      }
+    }
+
+    public ObjectOutputStream getLogWriter() {
+      return logWriter;
+    }
+
+    public ObjectInputStream getLogReader() {
+      return logReader;
+    }
+
+    public void removeLogFile() throws IOException {
+      if (logName != null) {
+        closeLogReader();
+        closeLogWriter();
+        new File(logName).delete();
+      }
+    }
+  }
 }