Changeset 1872 for trunk

Timestamp:

02/04/15 16:14:11 (10 years ago)

Author:

dmay

Message:

Redo some XML parts that were hardcoded before. Also escape XML strings when necessary. This should be enough to make borg calendar replays work without manual intervention.

File:

• trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/commands/CMDgenerateJacaretoReplay.java (modified) (5 diffs)

trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/commands/CMDgenerateJacaretoReplay.java

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.plugin.jfc.commands;
 
+import org.apache.commons.lang.StringEscapeUtils;
+
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -343 +347 @@
 
         int index = 1;
-        for( List<Event> sequence : sequences ) {
-            writeJacaretoXML(sequence, filename+"_"+index, classpath, basepath, classpathext);
+        for (List<Event> sequence : sequences) {
+            writeJacaretoXML(sequence, filename + "_" + index, classpath, basepath, classpathext);
             index++;
         }
@@ -420 +424 @@
             + "uuid=\"" + UUID.randomUUID() + "\" />"
         );
-        writeLine(writer,
-                  "<SystemInfo procTime=\"0\" duration=\"0\" screenWidth=\"2646\" screenHeight=\"1024\" javaVersion=\"1.7.0_65\" "
-                  + "lookAndFeel=\"" + UIManager.getLookAndFeel().getClass().getName() + "\" "
-                  + "uuid=\"720f430f-52cf-4d8b-9fbe-58434f766efe\" />");
+        GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
+        writeLine(writer, "<SystemInfo "
+            + "procTime=\"0\" "
+            + "duration=\"0\" " 
+            + "screenWidth=\"" + gd.getDisplayMode().getWidth() + "\" "
+            + "screenHeight=\"" + gd.getDisplayMode().getHeight() + "\" "
+            + "javaVersion=\"" + System.getProperty("java.version") + "\" "
+            + "lookAndFeel=\"" + UIManager.getLookAndFeel().getClass().getName() + "\" "
+            + "uuid=\"" + UUID.randomUUID() + "\" />"
+        );
         writeLine(writer,
                   "<KeyboardState procTime=\"0\" duration=\"0\" isNumLockOn=\"false\" isScrollLockOn=\"false\" isCapsLockOn=\"false\" applyIsNumLockOn=\"true\" applyIsScrollLockOn=\"true\" applyIsCapsLockOn=\"true\" uuid=\"28146f79-9fc7-49f9-b4a8-5866a7625683\" />");
@@ -516 +526 @@
             }
             else {
-                Console.traceln(Level.WARNING, "No handler for event \"" + event +
-                    "\". Skipped.");
+                Console.traceln(Level.WARNING, "No handler for event \"" + event + "\". Skipped.");
             }
         }
@@ -823 +832 @@
             + "uuid=\"" + UUID.randomUUID() + "\" "
             + "ID=\"1001\" "
-            + "command=" + target.getName() + " "
+            + "command=" + StringEscapeUtils.escapeXml(target.getName()) + " "
             + "modifiers=\"" + getButtonModifier(info) + "\" />"
         );