Fixes broken trunk.

Add no warning dialog to taskbar.

Fixes issue CLIENT-91

Change-Id: Ib443990256d0e157043ed0361fa6123ad7dea7c5
Reviewed-on: http://gerrit.dmdirc.com/1562
Automatic-Compile: Chris Smith <chris@dmdirc.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/FrameContainer.java

@@ -110,13 +110,14 @@ public abstract class FrameContainer<T extends Window> {
      * @since 0.6.4
      */
     protected FrameContainer(final String icon, final String name,
-            final String title, final Class<T> windowClass, final ConfigManager config) {
+            final String title, final Class<T> windowClass,
+            final ConfigManager config) {
         this.config = config;
         this.name = name;
         this.title = title;
         this.windowClass = windowClass;
         this.styliser = new Styliser(this);
-        this.document = new IRCDocument(this);
+        this.document = new IRCDocument(getConfigManager(), getStyliser());
 
         // Can't assign directly to transcoder as it's final, and Java doesn't
         // like the two paths in the try/catch.
@@ -267,7 +268,8 @@ public abstract class FrameContainer<T extends Window> {
     protected void setName(final String name) {
         this.name = name;
 
-        for (FrameInfoListener listener : listeners.get(FrameInfoListener.class)) {
+        for (FrameInfoListener listener : listeners.get(
+                FrameInfoListener.class)) {
             listener.nameChanged(this, name);
         }
     }
@@ -291,7 +293,8 @@ public abstract class FrameContainer<T extends Window> {
     public void setTitle(final String title) {
         this.title = title;
 
-        for (FrameInfoListener listener : listeners.get(FrameInfoListener.class)) {
+        for (FrameInfoListener listener : listeners.get(
+                FrameInfoListener.class)) {
             listener.titleChanged(this, title);
         }
     }
@@ -330,7 +333,8 @@ public abstract class FrameContainer<T extends Window> {
      * Called when this container's icon is updated.
      */
     private void iconUpdated() {
-        for (FrameInfoListener listener : listeners.get(FrameInfoListener.class)) {
+        for (FrameInfoListener listener : listeners.get(
+                FrameInfoListener.class)) {
             listener.iconChanged(this, icon);
         }
     }
@@ -378,7 +382,8 @@ public abstract class FrameContainer<T extends Window> {
         // TODO: This should default ot something colour independent
         notification = Color.BLACK;
 
-        for (NotificationListener listener : listeners.get(NotificationListener.class)) {
+        for (NotificationListener listener : listeners.get(
+                NotificationListener.class)) {
             listener.notificationCleared(this);
         }
     }
@@ -395,7 +400,8 @@ public abstract class FrameContainer<T extends Window> {
                 && !colour.equals(notification)) {
             notification = colour;
 
-            for (NotificationListener listener : listeners.get(NotificationListener.class)) {
+            for (NotificationListener listener : listeners.get(
+                    NotificationListener.class)) {
                 listener.notificationSet(this, colour);
             }
         }
@@ -473,7 +479,8 @@ public abstract class FrameContainer<T extends Window> {
      * Invoked when our window is activated.
      */
     public void windowActivated() {
-        for (SelectionListener listener : listeners.get(SelectionListener.class)) {
+        for (SelectionListener listener : listeners.get(
+                SelectionListener.class)) {
             listener.selectionChanged(this);
         }
 
@@ -501,9 +508,11 @@ public abstract class FrameContainer<T extends Window> {
      * @param args The message's arguments
      * @since 0.6.4
      */
-    public void addLine(final String type, final Date timestamp, final Object ... args) {
+    public void addLine(final String type, final Date timestamp,
+            final Object ... args) {
         if (type != null && !type.isEmpty()) {
-            addLine(Formatter.formatMessage(getConfigManager(), type, args), timestamp);
+            addLine(Formatter.formatMessage(getConfigManager(), type, args),
+                    timestamp);
         }
     }
 
@@ -527,7 +536,8 @@ public abstract class FrameContainer<T extends Window> {
      * @param args The message's arguments
      * @since 0.6.4
      */
-    public void addLine(final StringBuffer type, final Date timestamp, final Object ... args) {
+    public void addLine(final StringBuffer type, final Date timestamp,
+            final Object ... args) {
         if (type != null) {
             addLine(type.toString(), timestamp, args);
         }
@@ -569,7 +579,8 @@ public abstract class FrameContainer<T extends Window> {
         for (final String myLine : encodedLine.split("\n")) {
             if (timestamp != null) {
                 lines.add(new String[]{
-                    Formatter.formatMessage(getConfigManager(), "timestamp", timestamp),
+                    Formatter.formatMessage(getConfigManager(), "timestamp",
+                            timestamp),
                     myLine,
                 });
             } else {
@@ -645,7 +656,7 @@ public abstract class FrameContainer<T extends Window> {
      * @param window The window to be added
      * @since 0.6.4
      */
-    public void addWindow(T window) {
+    public void addWindow(final T window) {
         windows.add(window);
     }
 
@@ -655,7 +666,7 @@ public abstract class FrameContainer<T extends Window> {
      * @param window The window to be removed
      * @since 0.6.4
      */
-    public void removeWindow(T window) {
+    public void removeWindow(final T window) {
         windows.remove(window);
     }
 

src/com/dmdirc/commandparser/commands/IntelligentCommand.java

@@ -90,7 +90,6 @@ public interface IntelligentCommand {
         public String getPartial() {
             return partial;
         }
-
     }
 
     /**

src/com/dmdirc/ui/WarningDialog.java

@@ -1,17 +1,17 @@
 /*
- * 
+ *
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * 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
@@ -26,16 +26,17 @@ package com.dmdirc.ui;
 import java.awt.BorderLayout;
 import java.awt.Font;
 import java.awt.Insets;
+import java.awt.Toolkit;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.concurrent.Semaphore;
-import javax.swing.BorderFactory;
 
+import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JDialog;
-import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.JTextPane;
 import javax.swing.SwingUtilities;
@@ -80,22 +81,26 @@ public class WarningDialog extends JDialog {
             + "jar, but this did not fix the problem. DMDirc is unable to "
             + "continue and will now exit.";
 
-    /** Create a new NoUIDialog */
+    /** Create a new NoUIDialog. */
     public WarningDialog() {
         this(NO_UIS_TITLE, NO_UIS_BODY);
     }
 
     /**
-     * Create a new NoUIDialog
+     * Create a new NoUIDialog.
      *
      * @param title Title of dialog
      * @param body Body of dialog
      */
     public WarningDialog(final String title, final String body) {
-        super((JFrame) null, "DMDirc: "+title);
+        super((Window) null);
+        setTitle("DMDirc: " + title);
+        setIconImage(Toolkit.getDefaultToolkit().getImage(
+                Thread.currentThread().getContextClassLoader()
+                .getResource("com/dmdirc/res/logo.png")));
         setDefaultCloseOperation(DISPOSE_ON_CLOSE);
         setResizable(false);
-        
+
         final JPanel panel = new JPanel(new BorderLayout(5, 5));
 
         final JButton button = new JButton("OK");

src/com/dmdirc/ui/messages/IRCDocument.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.util.ListenerList;
 import com.dmdirc.util.RollingList;
@@ -52,11 +52,13 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
     /** Listener list. */
     private final ListenerList listeners;
     /** Cached lines. */
-    private transient RollingList<Line> cachedLines;
+    private final RollingList<Line> cachedLines;
     /** Cached attributed strings. */
-    private transient RollingList<AttributedString> cachedStrings;
-    /** Container that owns this document. */
-    private final FrameContainer<?> container;
+    private final RollingList<AttributedString> cachedStrings;
+    /** Config Manager for getting settings. */
+    private final ConfigManager configManager;
+    /** This document's styliser. */
+    private final Styliser styliser;
     /** Font size. */
     private int fontSize;
     /** Font name. */
@@ -67,26 +69,25 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
     /**
      * Creates a new instance of IRCDocument.
      *
-     * @param container The container that owns this document
+     * @param configManager Config Manager for required settings.
+     * @param styliser Styliser to style text
      * @since 0.6.3
      */
-    public IRCDocument(final FrameContainer<?> container) {
-        this.container = container;
+    public IRCDocument(final ConfigManager configManager,
+            final Styliser styliser) {
+        this.configManager = configManager;
+        this.styliser = styliser;
 
         lines = new ArrayList<Line>();
         listeners = new ListenerList();
 
         cachedLines = new RollingList<Line>(50);
         cachedStrings = new RollingList<AttributedString>(50);
-        frameBufferSize = container.getConfigManager().getOptionInt("ui",
-                "frameBufferSize");
+        frameBufferSize = configManager.getOptionInt("ui", "frameBufferSize");
 
-        container.getConfigManager().addChangeListener("ui", "textPaneFontSize",
-                this);
-        container.getConfigManager().addChangeListener("ui", "textPaneFontName",
-                this);
-        container.getConfigManager().addChangeListener("ui", "frameBufferSize",
-                this);
+        configManager.addChangeListener("ui", "textPaneFontSize", this);
+        configManager.addChangeListener("ui", "textPaneFontName", this);
+        configManager.addChangeListener("ui", "frameBufferSize", this);
 
         setCachedSettings();
     }
@@ -123,7 +124,7 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
     public void addText(final String[] text) {
         final int index;
         synchronized (lines) {
-            final Line line = new Line(container.getStyliser(), text, fontSize, fontName);
+            final Line line = new Line(styliser, text, fontSize, fontName);
             lines.add(line);
             index = lines.indexOf(line);
         }
@@ -139,7 +140,7 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
     public void addText(final String[] text, final int lineHeight) {
         final int index;
         synchronized (lines) {
-            final Line line = new Line(container.getStyliser(), text, lineHeight, fontName);
+            final Line line = new Line(styliser, text, lineHeight, fontName);
             lines.add(line);
             index = lines.indexOf(line);
         }
@@ -156,7 +157,7 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
         synchronized (lines) {
             start = lines.size();
             for (String[] string : text) {
-                lines.add(new Line(container.getStyliser(), string, fontSize, fontName));
+                lines.add(new Line(styliser, string, fontSize, fontName));
             }
         }
         fireLinesAdded(start, text.size());
@@ -176,7 +177,7 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
             for (int i = 0; i < text.size(); i++) {
                 final String[] string = text.get(i);
                 final int lineHeight = lineHeights.get(i);
-                lines.add(new Line(container.getStyliser(), string, lineHeight, fontName));
+                lines.add(new Line(styliser, string, lineHeight, fontName));
             }
         }
         fireLinesAdded(start, text.size());
@@ -238,7 +239,8 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
      * @param index Index of the added line
      */
     protected void fireLineAdded(final int index) {
-        for (IRCDocumentListener listener : listeners.get(IRCDocumentListener.class)) {
+        for (IRCDocumentListener listener
+                : listeners.get(IRCDocumentListener.class)) {
             listener.lineAdded(index, lines.size());
         }
         trim(frameBufferSize);
@@ -251,7 +253,8 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
      * @param size Number of lines added
      */
     protected void fireLinesAdded(final int index, final int size) {
-        for (IRCDocumentListener listener : listeners.get(IRCDocumentListener.class)) {
+        for (IRCDocumentListener listener
+                : listeners.get(IRCDocumentListener.class)) {
             listener.linesAdded(index, size, lines.size());
         }
         trim(frameBufferSize);
@@ -264,7 +267,8 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
      * @param trimedLines Number of trimmed lines
      */
     protected void fireTrimmed(final int newSize, final int trimedLines) {
-        for (IRCDocumentListener listener : listeners.get(IRCDocumentListener.class)) {
+        for (IRCDocumentListener listener
+                : listeners.get(IRCDocumentListener.class)) {
             listener.trimmed(newSize, trimedLines);
         }
     }
@@ -273,7 +277,8 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
      * fires the cleared method on all listeners.
      */
     protected void fireCleared() {
-        for (IRCDocumentListener listener : listeners.get(IRCDocumentListener.class)) {
+        for (IRCDocumentListener listener
+                : listeners.get(IRCDocumentListener.class)) {
             listener.cleared();
         }
     }
@@ -282,7 +287,8 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
      * fires the need repaint method on all listeners.
      */
     protected void fireRepaintNeeded() {
-        for (IRCDocumentListener listener : listeners.get(IRCDocumentListener.class)) {
+        for (IRCDocumentListener listener
+                : listeners.get(IRCDocumentListener.class)) {
             listener.repaintNeeded();
         }
     }
@@ -326,7 +332,7 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
     }
 
     /**
-     * Returns the line height of the specified line
+     * Returns the line height of the specified line.
      *
      * @param line Line
      *
@@ -337,7 +343,7 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
     }
 
     /**
-     * Returns the line height of the specified line
+     * Returns the line height of the specified.
      *
      * @param line Line
      *
@@ -347,20 +353,22 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
         return getLineHeight(getLine(line));
     }
 
+    /**
+     * Sets all the cached settings in this document.
+     */
     private void setCachedSettings() {
         final Font defaultFont = UIManager.getFont("TextPane.font");
-        if (container.getConfigManager().hasOptionString("ui", "textPaneFontName")) {
-            fontName = container.getConfigManager().getOption("ui", "textPaneFontName");
+        if (configManager.hasOptionString("ui", "textPaneFontName")) {
+            fontName = configManager.getOption("ui", "textPaneFontName");
         } else {
             fontName = defaultFont.getName();
         }
-        if (container.getConfigManager().hasOptionString("ui", "textPaneFontSize")) {
-            fontSize = container.getConfigManager().getOptionInt("ui", "textPaneFontSize");
+        if (configManager.hasOptionString("ui", "textPaneFontSize")) {
+            fontSize = configManager.getOptionInt("ui", "textPaneFontSize");
         } else {
             fontSize = defaultFont.getSize();
         }
-        frameBufferSize = container.getConfigManager().getOptionInt("ui",
-                "frameBufferSize");
+        frameBufferSize = configManager.getOptionInt("ui", "frameBufferSize");
         trim(frameBufferSize);
     }