Changeset 51bf23a
- Timestamp:
- Dec 12, 2018 3:17:51 PM (2 years ago)
- Branches:
- master
- Children:
- 9738db7
- Parents:
- 5eda3064
- Files:
-
- 2 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
apps/desktopgui/build.xml
r5eda3064 r51bf23a 35 35 <pathelement location="../../installer/lib/wrapper/all/wrapper.jar" /> 36 36 <pathelement location="../../router/java/build/router.jar" /> 37 <pathelement location="../systray/java/build/systray.jar" /> 37 38 </classpath> 38 39 </javac> -
apps/desktopgui/src/net/i2p/desktopgui/InternalTrayManager.java
r5eda3064 r51bf23a 7 7 import java.awt.event.ActionEvent; 8 8 import java.awt.event.ActionListener; 9 9 import java.io.IOException; 10 10 import javax.swing.JMenu; 11 11 import javax.swing.JMenuItem; … … 13 13 import javax.swing.SwingWorker; 14 14 15 import net.i2p.apps.systray.UrlLauncher; 15 16 import net.i2p.data.DataHelper; 16 17 import net.i2p.desktopgui.router.RouterManager; 17 import net.i2p.desktopgui.util.BrowseException;18 import net.i2p.desktopgui.util.I2PDesktop;19 18 import net.i2p.router.RouterContext; 20 19 import net.i2p.util.Log; … … 434 433 * 435 434 * Modified from I2PTunnelHTTPClientBase. 436 * TODO perhaps move this to a new PortMapper method.437 435 * 438 436 * @since 0.9.26 439 437 */ 440 438 private void launchBrowser() { 439 // null args ok 440 UrlLauncher launcher = new UrlLauncher(_context, null, null); 441 441 String url = _context.portMapper().getConsoleURL(); 442 442 try { 443 I2PDesktop.browse(url);444 } catch ( BrowseException e1) {443 launcher.openUrl(url); 444 } catch (IOException e1) { 445 445 log.log(Log.WARN, "Failed to open browser!", e1); 446 446 } -
apps/desktopgui/src/net/i2p/desktopgui/Main.java
r5eda3064 r51bf23a 18 18 import static net.i2p.app.ClientAppState.*; 19 19 import net.i2p.desktopgui.router.RouterManager; 20 import net.i2p.desktopgui.util.*;21 20 import net.i2p.router.RouterContext; 22 21 import net.i2p.router.app.RouterApp; -
build.xml
r5eda3064 r51bf23a 389 389 </target> 390 390 391 <target name="buildDesktopGui" depends="buildCore, buildrouter" > 392 <!-- 393 <ant dir="apps/desktopgui" target="clean" /> 394 --> 391 <target name="buildDesktopGui" depends="buildCore, buildrouter, buildSystray" > 395 392 <ant dir="apps/desktopgui" target="jar" /> 396 393 <copy file="apps/desktopgui/dist/desktopgui.jar" todir="build/" />
Note: See TracChangeset
for help on using the changeset viewer.