Get rid of threadgroups

This commit is contained in:
Parnassian
2014-02-22 18:51:58 +01:00
parent 09c679d05f
commit 18f10207cc
14 changed files with 86 additions and 96 deletions
@@ -27,7 +27,7 @@ public class LocalServerExecuter extends ServerExecuter {
}
@Override
public void run(ThreadGroup tg) {
public void run() {
// add jar or directory to buildpath.
if (this.classPath.isJar()) {
Core.verbose("Adding server provider jar to buildpath: "
@@ -43,7 +43,7 @@ public class LocalServerExecuter extends ServerExecuter {
}
}
// finalize
super.finalize(tg, this.serverProvider, this.serverName);
super.finalize(this.serverProvider, this.serverName);
}
}
@@ -32,7 +32,7 @@ public class PublicServerExecuter extends ServerExecuter {
}
@Override
public void run(ThreadGroup tg) {
public void run() {
try {
final File destination = new File(Directories.getCachePath(),
this.serverID);
@@ -86,7 +86,7 @@ public class PublicServerExecuter extends ServerExecuter {
final Constructor<?> con = providerClass.getConstructor();
final ServerProvider serverProvider = (ServerProvider) con
.newInstance();
super.finalize(tg, serverProvider, this.serverName);
super.finalize(serverProvider, this.serverName);
} catch (NoClassDefFoundError ignored) {
UILog.log(
"Error",
@@ -2,6 +2,7 @@ package org.parabot.environment.servers;
import org.parabot.core.Context;
import org.parabot.core.ui.components.BotToolbar;
import org.parabot.core.ui.components.PaintComponent;
/**
*
@@ -12,17 +13,17 @@ import org.parabot.core.ui.components.BotToolbar;
*/
public abstract class ServerExecuter {
public abstract void run(final ThreadGroup tg);
public abstract void run();
public void finalize(final ThreadGroup tg, final ServerProvider provider, final String serverName) {
// loads the server and its it to the gui
new Thread(tg, new Runnable() {
public void finalize(final ServerProvider provider, final String serverName) {
new Thread(new Runnable() {
@Override
public void run() {
try {
final Context context = new Context(provider);
Context context = Context.getInstance(provider);
BotToolbar.getInstance().addTab(context, serverName);
context.load();
PaintComponent.getInstance().startPainting(context.getPaintDebugger());
} catch (Throwable t) {
t.printStackTrace();
}
@@ -75,7 +75,7 @@ public abstract class ServerProvider implements Opcodes {
for (Injectable inj : injectables) {
inj.inject();
}
Context.resolve().setHookParser(parser);
Context.getInstance().setHookParser(parser);
}
private HookFile fetchHookFile() {
@@ -106,11 +106,11 @@ public abstract class ServerProvider implements Opcodes {
}
public void setClientInstance(Object client) {
Context.resolve().setClientInstance(client);
Context.getInstance().setClientInstance(client);
}
public void parseJar() {
Context.resolve().getClassPath().addJar(getJar());
Context.getInstance().getClassPath().addJar(getJar());
}
public void initScript(Script script) {
@@ -122,7 +122,7 @@ public abstract class ServerProvider implements Opcodes {
}
public void initMouse() {
final Context context = Context.resolve();
final Context context = Context.getInstance();
final Applet applet = context.getApplet();
final Mouse mouse = new Mouse(applet);
applet.addMouseListener(mouse);
@@ -131,7 +131,7 @@ public abstract class ServerProvider implements Opcodes {
}
public void initKeyboard() {
final Context context = Context.resolve();
final Context context = Context.getInstance();
final Applet applet = context.getApplet();
final Keyboard keyboard = new Keyboard(applet);
applet.addKeyListener(keyboard);