Changeset 1089 for trunk

Timestamp:

02/19/13 09:41:27 (12 years ago)

Author:

pharms

Message:

• prevent logging of the same GUI elements several times
• improved efficiency of hash code calculation
• improved efficiency of reuse of GUI elements

Location:

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

Files:

• HtmlDocument.java (modified) (3 diffs)
• HtmlMonitorOutputWriter.java (modified) (5 diffs)
• HtmlPageElement.java (modified) (3 diffs)
• HtmlServer.java (modified) (3 diffs)

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

@@ -45 +45 @@
     
     /**
+     * the hash code of this document
+     */
+    private int hashCode;
+    
+    /**
      * <p>
      * instantiates a new document element
@@ -74 +79 @@
             this.query = "?" + this.query;
         }
+        
+        this.hashCode = this.server.hashCode() + this.path.hashCode() +
+            (this.query != null ? this.query.hashCode() : 0) +
+            (this.title != null ? this.title.hashCode() : 0);
     }
 
@@ -138 +147 @@
     @Override
     public int hashCode() {
-        return server.hashCode() + path.hashCode() + (query != null ? query.hashCode() : 0) +
-            (title != null ? title.hashCode() : 0);
+        return hashCode;
     }
 

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

@@ -21 +21 @@
 import java.io.PrintWriter;
 import java.text.DecimalFormat;
+import java.util.HashSet;
+import java.util.Set;
 
 import de.ugoe.cs.util.StringTools;
@@ -62 +64 @@
 
     /**
-     * the is of the client of which all messages are logged through this writer
+     * the id of the client of which all messages are logged through this writer
      */
     private String clientId;
@@ -80 +82 @@
      */
     private long lastUpdate;
+    
+    /**
+     * the GUI elements, that were already logged and need therefore not be logged again into
+     * the same file
+     */
+    private Set<HtmlGUIElement> loggedGUIElements = new HashSet<HtmlGUIElement>();
 
     /**
@@ -215 +223 @@
      */
     private void dumpGuiStructure(HtmlGUIElement guiStructure) {
-        outputWriter.print("<component id=\"");
-        outputWriter.print(guiStructure.getId());
-        outputWriter.println("\">");
-        
-        if (guiStructure instanceof HtmlServer) {
-            dumpParam("host", ((HtmlServer) guiStructure).getName());
-            dumpParam("port", ((HtmlServer) guiStructure).getPort());
-        }
-        else if (guiStructure instanceof HtmlDocument) {
-            dumpParam("path", ((HtmlDocument) guiStructure).getPath());
-            dumpParam("query", ((HtmlDocument) guiStructure).getQuery());
-            dumpParam("title", ((HtmlDocument) guiStructure).getTitle());
-        }
-        else if (guiStructure instanceof HtmlPageElement) {
-            dumpParam("tagname", ((HtmlPageElement) guiStructure).getTagName());
-            dumpParam("htmlid", ((HtmlPageElement) guiStructure).getHtmlId());
-            dumpParam("index", ((HtmlPageElement) guiStructure).getIndex());
-        }
-        
-        dumpParam("parent", guiStructure.getParentId());
-        
-        outputWriter.println("</component>");
+        if (!loggedGUIElements.contains(guiStructure)) {
+            outputWriter.print("<component id=\"");
+            outputWriter.print(guiStructure.getId());
+            outputWriter.println("\">");
+        
+            if (guiStructure instanceof HtmlServer) {
+                dumpParam("host", ((HtmlServer) guiStructure).getName());
+                dumpParam("port", ((HtmlServer) guiStructure).getPort());
+            }
+            else if (guiStructure instanceof HtmlDocument) {
+                dumpParam("path", ((HtmlDocument) guiStructure).getPath());
+                dumpParam("query", ((HtmlDocument) guiStructure).getQuery());
+                dumpParam("title", ((HtmlDocument) guiStructure).getTitle());
+            }
+            else if (guiStructure instanceof HtmlPageElement) {
+                dumpParam("tagname", ((HtmlPageElement) guiStructure).getTagName());
+                dumpParam("htmlid", ((HtmlPageElement) guiStructure).getHtmlId());
+                dumpParam("index", ((HtmlPageElement) guiStructure).getIndex());
+            }
+            
+            dumpParam("parent", guiStructure.getParentId());
+        
+            outputWriter.println("</component>");
+        
+            loggedGUIElements.add(guiStructure);
+        }
         
         if (guiStructure.getChildren() != null) {
@@ -369 +381 @@
         outputWriter.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
         outputWriter.println("<session>");
+        
+        loggedGUIElements.clear();
     }
 

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

@@ -51 +51 @@
     
     /**
+     * the hash code of this document
+     */
+    private int hashCode;
+    
+    /**
      * <p>
      * instantiates a new element representing a tag in an HTML page
@@ -89 +94 @@
         this.htmlId = htmlId;
         this.index = index;
+        
+        this.hashCode = this.document.hashCode() + this.tagName.hashCode() +
+            (this.parent != null ? this.parent.hashCode() : 0) +
+            (this.htmlId != null ? this.htmlId.hashCode() : 0) +
+            (this.index != null ? this.index : 0);
     }
 
@@ -203 +213 @@
     @Override
     public int hashCode() {
-        return document.hashCode() + tagName.hashCode() + (parent != null ? parent.hashCode() : 0) +
-            (htmlId != null ? htmlId.hashCode() : 0) + (index != null ? index : 0);
+        return hashCode;
     }
 

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

@@ -35 +35 @@
     
     /**
+     * the hash code of this document
+     */
+    private int hashCode;
+    
+    /**
      * <p>
      * instantiates a new server element
@@ -57 +62 @@
         }
 
+        this.hashCode = this.name.hashCode() + this.port;
     }
 
@@ -113 +119 @@
     @Override
     public int hashCode() {
-        return name.hashCode() + port;
+        return hashCode;
     }