echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* systray now fully integrated into global ant build

Browse Source 
* removed two unneeded test files i2psystray.bat, i2psystray.sh
This commit is contained in:
hypercubus
2004-08-24 06:58:05 +00:00
committed by zzz
parent 920161bc07
commit d70c22d73f
6 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/routerconsole/java/build.xml
View File

@ -4,7 +4,7 @@
<target name="build" depends="builddep, jar" />
<target name="builddep">
<ant dir="../../../router/java/" target="build" />
<!-- <ant dir="../../systray/java/" target="build" /> -->
<ant dir="../../systray/java/" target="build" />
<!-- router will build core -->
</target>
<target name="prepare">
@ -21,8 +21,8 @@
<pathelement location="../../../core/java/build/i2p.jar" />
<pathelement location="../../../router/java/build/router.jar" />
<pathelement location="../../jetty/jettylib/org.mortbay.jetty-jdk1.2.jar" />
<!-- <pathelement location="../../systray/java/build/lib/systray.jar" /> -->
<!-- <pathelement location="../../systray/java/lib/systray4j.jar" /> -->
<pathelement location="../../systray/java/build/systray.jar" />
<pathelement location="../../systray/java/lib/systray4j.jar" />
<pathelement location="../../../installer/lib/wrapper/win32/wrapper.jar" /> <!-- we dont care if we're not on win32 -->
</classpath>
</javac>
@ -88,7 +88,7 @@
<mkdir dir="./build" />
<mkdir dir="./build/javadoc" />
<javadoc
sourcepath="./src:../../../core/java/src:../../router/java/src" destdir="./build/javadoc"
sourcepath="./src:../../../core/java/src:../../../router/java/src:../../systray/java/src" destdir="./build/javadoc"
packagenames="*"
use="true"
splitindex="true"
@ -100,11 +100,11 @@
<target name="cleandep" depends="clean">
<!-- router will clean core -->
<ant dir="../../../router/java/" target="cleandep" />
<!-- <ant dir="../../systray/java/" target="cleandep" /> -->
<ant dir="../../systray/java/" target="cleandep" />
</target>
<target name="distclean" depends="clean">
<!-- router will clean core -->
<ant dir="../../../router/java/" target="distclean" />
<!-- <ant dir="../../systray/java/" target="distclean" /> -->
<ant dir="../../systray/java/" target="distclean" />
</target>
</project>

14
apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
View File

@ -3,7 +3,7 @@ package net.i2p.router.web;
import net.i2p.router.ClientTunnelSettings;
import net.i2p.router.Router;
//import net.i2p.apps.systray.SysTray;
import net.i2p.apps.systray.SysTray;
import org.tanukisoftware.wrapper.WrapperManager;
/**
@ -31,12 +31,12 @@ public class ConfigServiceHandler extends FormHandler {
} else if ("Dump threads".equals(_action)) {
WrapperManager.requestThreadDump();
addFormNotice("Threads dumped to logs/wrapper.log");
//} else if ("Show systray icon".equals(_action)) {
// SysTray.instance().show();
// addFormNotice("Systray icon enabled (if possible)");
//} else if ("Hide systray icon".equals(_action)) {
// SysTray.instance().hide();
// addFormNotice("Systray icon disabled");
} else if ("Show systray icon".equals(_action)) {
SysTray.getInstance().show();
addFormNotice("Systray icon enabled (if possible)");
} else if ("Hide systray icon".equals(_action)) {
SysTray.getInstance().hide();
addFormNotice("Systray icon disabled");
} else {
addFormNotice("Blah blah blah. whatever. I'm not going to " + _action);
}