Changeset 1268 for trunk

Timestamp:

07/25/13 15:08:58 (11 years ago)

Author:

pharms

Message:

• removed find bugs warnings

Location:

trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor

Files:

• HtmlMonitorOutputWriter.java (modified) (1 diff)
• HtmlMonitorServlet.java (modified) (2 diffs)

trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorOutputWriter.java

@@ -415 +415 @@
      * </p>
      *
-     * @param file
-     * @param clientLogDir
+     * @param oldLogDir the old log directory
+     * @param newLogDir the new log directory
      */
     private void handleOldLogFiles(File oldLogDir, File newLogDir) {
         if (oldLogDir.exists() && oldLogDir.isDirectory()) {
+            boolean allFilesRenamed = true;
             for (File oldLogFile : oldLogDir.listFiles()) {
-                oldLogFile.renameTo(new File(newLogDir, oldLogFile.getName()));
+                allFilesRenamed &= oldLogFile.renameTo(new File(newLogDir, oldLogFile.getName()));
             }
             
-            oldLogDir.delete();
+            if (allFilesRenamed) {
+                if (!oldLogDir.delete()) {
+                    Console.printerrln("could not move old file directory structure to new one");
+                }
+            }
         }
     }

trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorServlet.java

@@ -24 +24 @@
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -554 +555 @@
         if (!result) {
             Console.printerrln(eventType + " event has invalid parameters");
-            Console.printerrln("coordinates: " + coordinates);
+            Console.printerrln("coordinates: " + Arrays.toString(coordinates));
             Console.printerrln("key: " + key);
-            Console.printerrln("scrollPosition: " + scrollPosition);
+            Console.printerrln("scrollPosition: " + Arrays.toString(scrollPosition));
             Console.printerrln("selectedValue: " + selectedValue);
         }