From f02266d67c5d606ca35700944e3f90c1cf398968 Mon Sep 17 00:00:00 2001 From: Enrico Joerns Date: Thu, 2 Oct 2014 02:05:39 +0200 Subject: [PATCH] [cooja] dialogs/MessageListe: User Logger instead of println --- .../contikios/cooja/dialogs/MessageList.java | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/tools/cooja/java/org/contikios/cooja/dialogs/MessageList.java b/tools/cooja/java/org/contikios/cooja/dialogs/MessageList.java index 212a65e34..1921a68ce 100644 --- a/tools/cooja/java/org/contikios/cooja/dialogs/MessageList.java +++ b/tools/cooja/java/org/contikios/cooja/dialogs/MessageList.java @@ -26,13 +26,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * - * ----------------------------------------------------------------- - * - * Author : Adam Dunkels, Joakim Eriksson, Niclas Finne, Fredrik Osterlind - * Created : 2006-06-14 - * Updated : $Date: 2009/11/13 14:27:46 $ - * $Revision: 1.15 $ */ package org.contikios.cooja.dialogs; @@ -64,11 +57,21 @@ import javax.swing.JPopupMenu; import javax.swing.JSeparator; import javax.swing.ListModel; import javax.swing.ListSelectionModel; +import org.apache.log4j.Logger; import org.contikios.cooja.Cooja; +/** + * + * @author Adam Dunkels + * @author Joakim Eriksson + * @author Niclas Finne + * @author Fredrik Osterlind + */ public class MessageList extends JList { + private static final Logger logger = Logger.getLogger(MessageList.class); + public static final int NORMAL = 0; public static final int WARNING = 1; public static final int ERROR = 2; @@ -146,8 +149,8 @@ public class MessageList extends JList { readThread.start(); return new PrintStream(output); - } catch (Exception e) { - System.out.println("Exception: "+ e); + } catch (IOException e) { + logger.error(messages); return null; } } @@ -250,14 +253,14 @@ public class MessageList extends JList { @Override public void actionPerformed(ActionEvent e) { MessageContainer[] messages = getMessages(); - System.out.println("\nCOMPILATION OUTPUT:\n"); + logger.info("\nCOMPILATION OUTPUT:\n"); for (MessageContainer msg: messages) { if (hideNormal && msg.type == NORMAL) { continue; } - System.out.println(msg); + logger.info(msg); } - System.out.println(); + logger.info("\n"); } }); popup.add(consoleOutputMenuItem);