From f284fa0e8002193b8d9e9472146988d001911081 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Mon, 11 Sep 2017 23:05:42 +0200 Subject: [PATCH 1/4] [BUGFIX] Solving currentThread null return Solves issue #222 --- src/main/java/org/parabot/core/asm/redirect/ThreadRedirect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/parabot/core/asm/redirect/ThreadRedirect.java b/src/main/java/org/parabot/core/asm/redirect/ThreadRedirect.java index 0c60ec3..22dda99 100644 --- a/src/main/java/org/parabot/core/asm/redirect/ThreadRedirect.java +++ b/src/main/java/org/parabot/core/asm/redirect/ThreadRedirect.java @@ -24,7 +24,7 @@ public class ThreadRedirect { } public static Thread currentThread(){ - return null; + return new Thread(); } public static void join(Thread t) throws InterruptedException{ From 724d98a6e0a60c2a60c40e562698017556addca7 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Mon, 11 Sep 2017 23:09:26 +0200 Subject: [PATCH 2/4] [BUGFIX] Solving issues with Travis building --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4b0e919..26f51f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,9 @@ language: java +dist: trusty + jdk: - - oraclejdk7 + - openjdk7 - oraclejdk8 before_install: @@ -65,4 +67,4 @@ deploy: repo: Parabot/Parabot branch: - master - jdk: 'oraclejdk7' \ No newline at end of file + jdk: 'openjdk7' \ No newline at end of file From f667850121b0ba8723c4a9b1da8e15116ec2fb4a Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Mon, 11 Sep 2017 23:13:43 +0200 Subject: [PATCH 3/4] [BUGFIX] Solved issue with returning null image --- .../java/org/parabot/core/asm/redirect/ToolkitRedirect.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/parabot/core/asm/redirect/ToolkitRedirect.java b/src/main/java/org/parabot/core/asm/redirect/ToolkitRedirect.java index 1bafabc..c0844e6 100644 --- a/src/main/java/org/parabot/core/asm/redirect/ToolkitRedirect.java +++ b/src/main/java/org/parabot/core/asm/redirect/ToolkitRedirect.java @@ -40,11 +40,11 @@ public class ToolkitRedirect { } public static Image createImage(Toolkit t,byte[] b){ - return null; + return Toolkit.getDefaultToolkit().createImage(b); } public static Image createImage(Toolkit t, String s){ - return null; + return Toolkit.getDefaultToolkit().createImage(s); } public static Image getImage(Toolkit t,URL u){ From 0834ff205798809f2eb9389f04b9e33968bbb3a7 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Mon, 11 Sep 2017 23:14:12 +0200 Subject: [PATCH 4/4] [BUGFIX] Using the given Toolkit and not default Toolkit --- .../java/org/parabot/core/asm/redirect/ToolkitRedirect.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/parabot/core/asm/redirect/ToolkitRedirect.java b/src/main/java/org/parabot/core/asm/redirect/ToolkitRedirect.java index c0844e6..bb01d54 100644 --- a/src/main/java/org/parabot/core/asm/redirect/ToolkitRedirect.java +++ b/src/main/java/org/parabot/core/asm/redirect/ToolkitRedirect.java @@ -40,11 +40,11 @@ public class ToolkitRedirect { } public static Image createImage(Toolkit t,byte[] b){ - return Toolkit.getDefaultToolkit().createImage(b); + return t.createImage(b); } public static Image createImage(Toolkit t, String s){ - return Toolkit.getDefaultToolkit().createImage(s); + return t.createImage(s); } public static Image getImage(Toolkit t,URL u){