|
1
|
=== modified file 'src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebDriver.java'
|
|
2
|
--- src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebDriver.java 2015-08-11 22:13:21 +0000
|
|
3
|
+++ src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebDriver.java 2015-08-12 16:35:18 +0000
|
|
4
|
@@ -22,8 +22,6 @@
|
|
5
|
|
|
6
|
// TODO: remove this, it is there to allow compilation
|
|
7
|
import java.awt.Font;
|
|
8
|
-import java.util.HashMap;
|
|
9
|
-import java.util.HashSet;
|
|
10
|
// don't import the entire logging package as it has naming conflicts with jetty
|
|
11
|
import java.util.logging.Level;
|
|
12
|
import java.util.logging.Logger;
|
|
13
|
@@ -220,7 +218,8 @@
|
|
14
|
*
|
|
15
|
* @return True iff it is the first usage of the given image.
|
|
16
|
*/
|
|
17
|
- public boolean addImageUsage(int imageHash, int windowId) {
|
|
18
|
+ public boolean addImageUsage(int imageHash, int windowId)
|
|
19
|
+ {
|
|
20
|
boolean newLoadedImage = false;
|
|
21
|
|
|
22
|
Set<Integer> usages = imageUsages.get(imageHash);
|
|
23
|
@@ -251,7 +250,8 @@
|
|
24
|
*
|
|
25
|
* @return The set of all unused images.
|
|
26
|
*/
|
|
27
|
- public Set<Integer> removeUnusedImages(int windowId) {
|
|
28
|
+ public Set<Integer> removeUnusedImages(int windowId)
|
|
29
|
+ {
|
|
30
|
Set<Integer> imagesToRemove = new HashSet<Integer>();
|
|
31
|
Set<Integer> images = ownedImages.remove(windowId);
|
|
32
|
if (images != null && !images.isEmpty())
|
|
33
|
|
|
34
|
=== modified file 'src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebEmulatedWindow.java'
|
|
35
|
--- src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebEmulatedWindow.java 2015-08-11 22:13:21 +0000
|
|
36
|
+++ src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebEmulatedWindow.java 2015-08-12 16:35:18 +0000
|
|
37
|
@@ -21,7 +21,7 @@
|
|
38
|
package com.goldencode.p2j.ui.client.gui.driver.web;
|
|
39
|
|
|
40
|
import java.awt.image.BufferedImage;
|
|
41
|
-import java.util.Set;
|
|
42
|
+import java.util.*;
|
|
43
|
|
|
44
|
|
|
45
|
import com.goldencode.p2j.ui.client.*;
|
|
46
|
|
|
47
|
=== modified file 'src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebSocket.java'
|
|
48
|
--- src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebSocket.java 2015-08-11 22:13:21 +0000
|
|
49
|
+++ src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebSocket.java 2015-08-12 16:35:18 +0000
|
|
50
|
@@ -137,7 +137,7 @@
|
|
51
|
*/
|
|
52
|
public void destroyWindow(int id, Integer[] cachedImages)
|
|
53
|
{
|
|
54
|
- byte[] message = new byte[9 + cachedImages.length << 2];
|
|
55
|
+ byte[] message = new byte[9 + cachedImages.length * 4];
|
|
56
|
|
|
57
|
message[0] = MSG_DESTROY_WINDOW;
|
|
58
|
writeMessageInt32(message, 1, id);
|
|
59
|
|
|
60
|
=== modified file 'src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.screen.js'
|
|
61
|
--- src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.screen.js 2015-08-11 22:13:21 +0000
|
|
62
|
+++ src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.screen.js 2015-08-12 16:35:18 +0000
|
|
63
|
@@ -521,7 +521,8 @@
|
|
64
|
{
|
|
65
|
imgData = loadedImages.get(key);
|
|
66
|
imgDataOffset = 0;
|
|
67
|
- } else
|
|
68
|
+ }
|
|
69
|
+ else
|
|
70
|
{
|
|
71
|
imgData = message;
|
|
72
|
imgDataOffset = idx + 22;
|
|
73
|
|