Merge branch 'development' of github.com:Parabot/Parabot into release/2.6.7

# Conflicts:
#	src/main/java/org/parabot/core/asm/redirect/ThreadRedirect.java
#	src/main/java/org/parabot/core/asm/redirect/ToolkitRedirect.java
This commit is contained in:
JKetelaar
2017-09-12 00:11:53 +02:00
4 changed files with 26 additions and 6 deletions
@@ -8,9 +8,22 @@ import java.io.InputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.ProtectionDomain;
public class ClassRedirect {
public static ProtectionDomain getProtectionDomain(final Class<?> clazz) {
System.err.println(clazz.getName() + " getProtectionDomain request granted.");
return AccessController.doPrivileged(new PrivilegedAction<ProtectionDomain>() {
public ProtectionDomain run() {
return clazz.getProtectionDomain();
}
});
}
public static Object newInstance(Class<?> c) throws IllegalAccessException, InstantiationException {
if (validStack()) {
return c.newInstance();
@@ -23,7 +23,7 @@ public class ThreadRedirect {
}
public static Thread currentThread() {
return null;
return new Thread();
}
public static void join(Thread t) throws InterruptedException {
@@ -5,6 +5,7 @@ import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.Transferable;
import java.awt.datatransfer.UnsupportedFlavorException;
import java.awt.image.ImageProducer;
import java.io.IOException;
import java.net.URL;
@@ -40,11 +41,15 @@ public class ToolkitRedirect {
}
public static Image createImage(Toolkit t, byte[] b) {
return null;
return t.createImage(b);
}
public static Image createImage(Toolkit t, String s) {
return null;
return t.createImage(s);
}
public static Image createImage(Toolkit t, ImageProducer i) {
return t.createImage(i);
}
public static Image getImage(Toolkit t, URL u) {