Merge branch 'master' of https://github.com/DMDirc/Plugins into dev4

logging/src/com/dmdirc/addons/logging/LoggingManager.java

@@ -223,7 +223,9 @@ public class LoggingManager implements ConfigChangeListener {
 
         synchronized (FORMAT_LOCK) {
             appendLine(filename, "*** Query opened at: %s", OPENED_AT_FORMAT.format(new Date()));
-            appendLine(filename, "*** Query with User: %s", event.getQuery().getHost());
+            appendLine(filename, "*** Query with User: %s", event.getQuery().getUser().getNickname()
+                    + '!' + event.getQuery().getUser().getUsername().orElse("")
+                    + '@' + event.getQuery().getUser().getHostname().orElse(""));
             appendLine(filename, "");
         }
     }

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/prefs/NoRemovePanel.java

@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.ui_swing.dialogs.prefs;
-
-import java.awt.Component;
-import java.awt.LayoutManager;
-
-import javax.swing.JPanel;
-
-/**
- * Creates a new JPanel that prevents components from being removed.
- */
-public class NoRemovePanel extends JPanel {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-
-    /**
-     * Creates a new JPanel that prevents components being removed.
-     *
-     * @param layout Layout manager
-     */
-    public NoRemovePanel(final LayoutManager layout) {
-        super(layout);
-    }
-
-    @Override
-    public void remove(final Component comp) {
-        //Ignore
-    }
-
-}

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/prefs/PrefsCategoryLoader.java

@@ -141,8 +141,6 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
         for (PreferencesCategory child : category.getSubcats()) {
             if (child.isInline() && category.isInlineBefore()) {
                 addInlineCategory(child, panel);
-            } else if (!child.isInline()) {
-                addCategory(child);
             }
         }
 
@@ -234,7 +232,7 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
     private void addInlineCategory(final PreferencesCategory category,
             final JPanel parent) {
         final JPanel panel = UIUtilities.invokeAndWait(() -> {
-            final JPanel panel1 = new NoRemovePanel(new MigLayout(
+            final JPanel panel1 = new JPanel(new MigLayout(
                             "fillx, gap unrel, wrap 2, "
                             + "hidemode 3, pack, wmax 470-" + leftPadding + '-'
                             + rightPadding + "-2*"
@@ -258,7 +256,7 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
      */
     private JPanel addCategory(final PreferencesCategory category) {
         final JPanel panel = UIUtilities.invokeAndWait(() -> {
-            final JPanel panel1 = new NoRemovePanel(
+            final JPanel panel1 = new JPanel(
                     new MigLayout("fillx, gap unrel, wrap 2, pack, "
                             + "hidemode 3, wmax 470-"
                             + leftPadding + '-' + rightPadding + "-2*" + padding));

windowstatus/src/com/dmdirc/addons/windowstatus/WindowStatusManager.java

@@ -188,7 +188,10 @@ public class WindowStatusManager {
 
     private String updateStatusQuery(final PrivateChat frame) {
         final StringBuilder textString = new StringBuilder();
-        textString.append(frame.getHost());
+        textString
+                .append(frame.getUser().getNickname())
+                .append('!').append(frame.getUser().getRealname().orElse(""))
+                .append('@').append(frame.getUser().getHostname().orElse(""));
         frame.getConnection().ifPresent(c -> {
             if (showname) {
                 frame.getUser().getRealname().ifPresent(s -> textString.append(" - ").append(s));