Parcourir la source

fixes issue 3226

Adds a random nb6.8 change to the project properties (which seems completely pointless but i cant stop it adding it
Fixes a random import being formatted wrong

Change-Id: If417ec82d6eb8796d3ad3af8a7990c6832597c28
Reviewed-on: http://gerrit.dmdirc.com/147
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>
tags/0.6.3b1
Gregory Holmes il y a 14 ans
Parent
révision
6af2bc13d5

+ 1
- 0
nbproject/project.properties Voir le fichier

@@ -1,3 +1,4 @@
1
+jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
1 2
 project.license=dmdirc
2 3
 application.title=DMDirc
3 4
 application.vendor=chris

+ 3
- 2
src/com/dmdirc/Server.java Voir le fichier

@@ -288,13 +288,14 @@ public class Server extends WritableFrameContainer implements
288 288
                 updateIcon();
289 289
 
290 290
                 parser = buildParser();
291
+                final URI connectAddress = parser.getURI();
291 292
 
292 293
                 if (parser == null) {
293
-                    addLine("serverUnknownProtocol", address.getScheme());
294
+                    addLine("serverUnknownProtocol", connectAddress.getScheme());
294 295
                     return;
295 296
                 }
296 297
 
297
-                addLine("serverConnecting", address.getHost(), address.getPort());
298
+                addLine("serverConnecting", connectAddress.getHost(), connectAddress.getPort());
298 299
 
299 300
                 myState.transition(ServerState.CONNECTING);
300 301
 

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/updater/SwingRestartDialog.java Voir le fichier

@@ -25,8 +25,8 @@ package com.dmdirc.addons.ui_swing.dialogs.updater;
25 25
 import com.dmdirc.addons.ui_swing.MainFrame;
26 26
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
27 27
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
28
-
29 28
 import com.dmdirc.updater.components.LauncherComponent;
29
+
30 30
 import java.awt.Dialog.ModalityType;
31 31
 import java.awt.event.ActionEvent;
32 32
 import java.awt.event.ActionListener;

Chargement…
Annuler
Enregistrer