ErrorManager now outputs a trace along with the message to System.err is there are no ready error listeners

Fixed an assertion from the previous commit
TextPane passes a frame when stylising strings

git-svn-id: http://svn.dmdirc.com/trunk@2425 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/actions/ActionManager.java

@@ -104,7 +104,7 @@ public final class ActionManager {
      */
     public static void registerWrapper(final ActionWrapper wrapper) {
         Logger.doAssertion(wrapper != null && wrapper.getGroupName() != null
-                 && wrapper.getGroupName().isEmpty());
+                 && !wrapper.getGroupName().isEmpty());
         
         actionWrappers.add(wrapper);
     }

src/com/dmdirc/commandparser/commands/global/Debug.java

@@ -280,9 +280,16 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
     }
     
     /** Reverse value comparator for a map entry. */
-    private static class ValueComparator implements 
+    private static class ValueComparator implements
             Comparator<Entry<String, Integer>>, Serializable {
         
+        /**
+         * A version number for this class. It should be changed whenever the
+         * class structure is changed (or anything else that would prevent
+         * serialized objects being unserialized with the new class).
+         */
+        private static final long serialVersionUID = 1;
+        
         /** Instantiates a new ValueComparator. */
         public ValueComparator() {
             super();

src/com/dmdirc/logger/ErrorManager.java

@@ -266,6 +266,9 @@ public final class ErrorManager implements Serializable {
         if (firedListeners == 0) {
             System.err.println("An error has occurred: " + error.getLevel()
             + ": " + error.getMessage());
+            for (String line : error.getTrace()) {
+                System.err.println("\t" + line);
+            }
         }
     }
     
@@ -289,6 +292,9 @@ public final class ErrorManager implements Serializable {
          
         if (firedListeners == 0) {
             System.err.println("A fatal has occurred: " + error.getMessage());
+            for (String line : error.getTrace()) {
+                System.err.println("\t" + line);
+            }
         }
     }
     

src/com/dmdirc/ui/swing/components/Frame.java

@@ -224,7 +224,7 @@ public abstract class Frame extends JInternalFrame implements Window,
      * Initialises the components for this frame.
      */
     private void initComponents() {
-        setTextPane(new TextPane());
+        setTextPane(new TextPane(getContainer()));
         
         getTextPane().addMouseListener(this);
         getTextPane().addKeyListener(this);

src/com/dmdirc/ui/swing/textpane/TextPane.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.ui.swing.textpane;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.messages.IRCTextAttribute;
@@ -66,7 +67,7 @@ public final class TextPane extends JComponent implements AdjustmentListener,
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
-    private static final long serialVersionUID = 4;
+    private static final long serialVersionUID = 5;
     
     /** Scrollbar for the component. */
     private final JScrollBar scrollBar;
@@ -74,14 +75,21 @@ public final class TextPane extends JComponent implements AdjustmentListener,
     private final TextPaneCanvas canvas;
     /** IRCDocument. */
     private final IRCDocument document;
-    
+    /** Parent Frame. */
+    private final FrameContainer frame;
     /** Listener list. */
     private final EventListenerList textPaneListeners;
     
-    /** Creates a new instance of TextPane. */
-    public TextPane() {
+    /** 
+     * Creates a new instance of TextPane. 
+     *
+     * @param frame Parent Frame
+     */
+    public TextPane(final FrameContainer frame) {
         super();
         
+        this.frame = frame;
+        
         textPaneListeners = new EventListenerList();
         
         document = new IRCDocument();
@@ -135,7 +143,7 @@ public final class TextPane extends JComponent implements AdjustmentListener,
      */
     public void addStyledString(final String[] strings) {
         final AttributedString text = styledDocumentToAttributedString(
-                Styliser.getStyledString(strings, null));
+                Styliser.getStyledString(strings, frame));
         
         if (text.getIterator().getEndIndex() == 0) {
             addText(new AttributedString("\n"));
@@ -151,12 +159,15 @@ public final class TextPane extends JComponent implements AdjustmentListener,
      *
      * @return AttributedString representing the specified StyledDocument
      */
-    public static AttributedString styledDocumentToAttributedString(final StyledDocument doc) {
-        //Now lets get hacky, loop through the styled document and add all styles to an attributedString
+    public static AttributedString styledDocumentToAttributedString(
+            final StyledDocument doc) {
+        //Now lets get hacky, loop through the styled document and add all 
+        //styles to an attributedString
         AttributedString attString = null;
         final Element line = doc.getParagraphElement(0);
         try {
-            attString = new AttributedString(line.getDocument().getText(0, line.getDocument().getLength()));
+            attString = new AttributedString(line.getDocument().getText(0, 
+                    line.getDocument().getLength()));
         } catch (BadLocationException ex) {
             Logger.userError(ErrorLevel.MEDIUM,
                     "Unable to insert styled string: " + ex.getMessage());
@@ -173,39 +184,48 @@ public final class TextPane extends JComponent implements AdjustmentListener,
                 if (attrib == IRCTextAttribute.HYPERLINK) {
                     //Hyperlink
                     attString.addAttribute(IRCTextAttribute.HYPERLINK,
-                            as.getAttribute(attrib), element.getStartOffset(), element.getEndOffset());
+                            as.getAttribute(attrib), element.getStartOffset(), 
+                            element.getEndOffset());
                 } else if (attrib == IRCTextAttribute.NICKNAME) {
                     //Nicknames
                     attString.addAttribute(IRCTextAttribute.NICKNAME,
-                            as.getAttribute(attrib), element.getStartOffset(), element.getEndOffset());
+                            as.getAttribute(attrib), element.getStartOffset(), 
+                            element.getEndOffset());
                 } else if (attrib == IRCTextAttribute.CHANNEL) {
                     //Channels
                     attString.addAttribute(IRCTextAttribute.CHANNEL,
-                            as.getAttribute(attrib), element.getStartOffset(), element.getEndOffset());
+                            as.getAttribute(attrib), element.getStartOffset(), 
+                            element.getEndOffset());
                 } else if (attrib == ColorConstants.Foreground) {
                     //Foreground
                     attString.addAttribute(TextAttribute.FOREGROUND,
-                            as.getAttribute(attrib), element.getStartOffset(), element.getEndOffset());
+                            as.getAttribute(attrib), element.getStartOffset(), 
+                            element.getEndOffset());
                 } else if (attrib == ColorConstants.Background) {
                     //Background
                     attString.addAttribute(TextAttribute.BACKGROUND,
-                            as.getAttribute(attrib), element.getStartOffset(), element.getEndOffset());
+                            as.getAttribute(attrib), element.getStartOffset(), 
+                            element.getEndOffset());
                 } else if (attrib == FontConstants.Bold) {
                     //Bold
                     attString.addAttribute(TextAttribute.WEIGHT,
-                            TextAttribute.WEIGHT_BOLD, element.getStartOffset(), element.getEndOffset());
+                            TextAttribute.WEIGHT_BOLD, element.getStartOffset(), 
+                            element.getEndOffset());
                 } else if (attrib == FontConstants.Family) {
                     //Family
                     attString.addAttribute(TextAttribute.FAMILY,
-                            as.getAttribute(attrib), element.getStartOffset(), element.getEndOffset());
+                            as.getAttribute(attrib), element.getStartOffset(), 
+                            element.getEndOffset());
                 } else if (attrib == FontConstants.Italic) {
                     //italics
                     attString.addAttribute(TextAttribute.POSTURE,
-                            TextAttribute.POSTURE_OBLIQUE, element.getStartOffset(), element.getEndOffset());
+                            TextAttribute.POSTURE_OBLIQUE, element.getStartOffset(), 
+                            element.getEndOffset());
                 } else if (attrib == CharacterConstants.Underline) {
                     //Underline
                     attString.addAttribute(TextAttribute.UNDERLINE,
-                            TextAttribute.UNDERLINE_ON, element.getStartOffset(), element.getEndOffset());
+                            TextAttribute.UNDERLINE_ON, element.getStartOffset(), 
+                            element.getEndOffset());
                 }
             }
         }