=== modified file 'src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebDriver.java'
--- src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebDriver.java	2015-08-11 22:13:21 +0000
+++ src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebDriver.java	2015-08-12 16:35:18 +0000
@@ -22,8 +22,6 @@
 
 // TODO: remove this, it is there to allow compilation
 import java.awt.Font;
-import java.util.HashMap;
-import java.util.HashSet;
 // don't import the entire logging package as it has naming conflicts with jetty
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -220,7 +218,8 @@
     * 
     * @return   True iff it is the first usage of the given image.
     */
-   public boolean addImageUsage(int imageHash, int windowId) {
+   public boolean addImageUsage(int imageHash, int windowId)
+   {
       boolean newLoadedImage = false;
       
       Set<Integer> usages = imageUsages.get(imageHash);
@@ -251,7 +250,8 @@
     * 
     * @return The set of all unused images.
     */
-   public Set<Integer> removeUnusedImages(int windowId) {
+   public Set<Integer> removeUnusedImages(int windowId)
+   {
       Set<Integer> imagesToRemove = new HashSet<Integer>();
       Set<Integer> images = ownedImages.remove(windowId);
       if (images != null && !images.isEmpty())

=== modified file 'src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebEmulatedWindow.java'
--- src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebEmulatedWindow.java	2015-08-11 22:13:21 +0000
+++ src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebEmulatedWindow.java	2015-08-12 16:35:18 +0000
@@ -21,7 +21,7 @@
 package com.goldencode.p2j.ui.client.gui.driver.web;
 
 import java.awt.image.BufferedImage;
-import java.util.Set;
+import java.util.*;
 
 
 import com.goldencode.p2j.ui.client.*;

=== modified file 'src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebSocket.java'
--- src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebSocket.java	2015-08-11 22:13:21 +0000
+++ src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebSocket.java	2015-08-12 16:35:18 +0000
@@ -137,7 +137,7 @@
     */
    public void destroyWindow(int id, Integer[] cachedImages)
    {
-      byte[] message = new byte[9 + cachedImages.length << 2];
+      byte[] message = new byte[9 + cachedImages.length * 4];
       
       message[0] = MSG_DESTROY_WINDOW;
       writeMessageInt32(message, 1, id);

=== modified file 'src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.screen.js'
--- src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.screen.js	2015-08-11 22:13:21 +0000
+++ src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.screen.js	2015-08-12 16:35:18 +0000
@@ -521,7 +521,8 @@
                {
                   imgData = loadedImages.get(key);
                   imgDataOffset = 0;
-               } else
+               }
+               else
                {
                   imgData = message;
                   imgDataOffset = idx + 22;