mirror of
https://github.com/2006-Scape/Parabot.git
synced 2026-07-06 16:50:39 +00:00
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:
+5
-3
@@ -1,7 +1,9 @@
|
|||||||
language: java
|
language: java
|
||||||
|
|
||||||
|
dist: trusty
|
||||||
|
|
||||||
jdk:
|
jdk:
|
||||||
- oraclejdk7
|
- openjdk7
|
||||||
- oraclejdk8
|
- oraclejdk8
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
@@ -56,7 +58,7 @@ deploy:
|
|||||||
branch:
|
branch:
|
||||||
- master
|
- master
|
||||||
- development
|
- development
|
||||||
jdk: 'oraclejdk7'
|
jdk: 'openjdk7'
|
||||||
|
|
||||||
- provider: script
|
- provider: script
|
||||||
script: "cp ./.travis/.travis.settings.xml $HOME/.m2/settings.xml && mvn package javadoc:javadoc deploy site:deploy"
|
script: "cp ./.travis/.travis.settings.xml $HOME/.m2/settings.xml && mvn package javadoc:javadoc deploy site:deploy"
|
||||||
@@ -65,4 +67,4 @@ deploy:
|
|||||||
repo: Parabot/Parabot
|
repo: Parabot/Parabot
|
||||||
branch:
|
branch:
|
||||||
- master
|
- master
|
||||||
jdk: 'oraclejdk7'
|
jdk: 'openjdk7'
|
||||||
@@ -8,9 +8,22 @@ import java.io.InputStream;
|
|||||||
import java.lang.annotation.Annotation;
|
import java.lang.annotation.Annotation;
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
|
import java.security.AccessController;
|
||||||
|
import java.security.PrivilegedAction;
|
||||||
|
import java.security.ProtectionDomain;
|
||||||
|
|
||||||
public class ClassRedirect {
|
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 {
|
public static Object newInstance(Class<?> c) throws IllegalAccessException, InstantiationException {
|
||||||
if (validStack()) {
|
if (validStack()) {
|
||||||
return c.newInstance();
|
return c.newInstance();
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ public class ThreadRedirect {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static Thread currentThread() {
|
public static Thread currentThread() {
|
||||||
return null;
|
return new Thread();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void join(Thread t) throws InterruptedException {
|
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.DataFlavor;
|
||||||
import java.awt.datatransfer.Transferable;
|
import java.awt.datatransfer.Transferable;
|
||||||
import java.awt.datatransfer.UnsupportedFlavorException;
|
import java.awt.datatransfer.UnsupportedFlavorException;
|
||||||
|
import java.awt.image.ImageProducer;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
|
|
||||||
@@ -40,11 +41,15 @@ public class ToolkitRedirect {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static Image createImage(Toolkit t, byte[] b) {
|
public static Image createImage(Toolkit t, byte[] b) {
|
||||||
return null;
|
return t.createImage(b);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Image createImage(Toolkit t, String s) {
|
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) {
|
public static Image getImage(Toolkit t, URL u) {
|
||||||
|
|||||||
Reference in New Issue
Block a user