Menu
▾
▴
[Rochat-svn] SF.net SVN: rochat: [10] trunk/src/net/sensiva/rochat
|
From: <le...@us...> - 2007-10-16 14:06:30
|
Revision: 10
http://rochat.svn.sourceforge.net/rochat/?rev=10&view=rev
Author: levia
Date: 2007-10-16 07:06:27 -0700 (Tue, 16 Oct 2007)
Log Message:
-----------
- Removed ErrorThread, redirecting of error stream failed since when exceptions get there, the app closes anyway.
- Changed the Logger a bit.
Modified Paths:
--------------
trunk/src/net/sensiva/rochat/core/logging/LogListener.java
trunk/src/net/sensiva/rochat/core/logging/Logger.java
trunk/src/net/sensiva/rochat/ui/main/MainFrame.java
Removed Paths:
-------------
trunk/src/net/sensiva/rochat/core/logging/ErrorThread.java
Deleted: trunk/src/net/sensiva/rochat/core/logging/ErrorThread.java
===================================================================
--- trunk/src/net/sensiva/rochat/core/logging/ErrorThread.java 2007-10-16 13:26:31 UTC (rev 9)
+++ trunk/src/net/sensiva/rochat/core/logging/ErrorThread.java 2007-10-16 14:06:27 UTC (rev 10)
@@ -1,60 +0,0 @@
-/*
- ROChat
- Copyright (C) 2007 The ROChat team
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- ----------------------------------------------------------------------------
-*/
-package net.sensiva.rochat.ui.core.logging;
-
-import java.util.*;
-import java.io.*;
-
-/**
- * This class is a thread that runs to listen for errors (exceptions, etc).
-*/
-public class ErrorThread extends Thread
-{
- private PipedInputStream m_ErrInput;
-
- public ErrorThread(PipedInputStream errorInput)
- {
- m_ErrInput = errorInput;
- }
-
- public void run()
- {
- final byte[] buf = new byte[1024];
- try
- {
- while (true)
- {
- final int len = m_ErrInput.read(buf);
- if (len == -1)
- {
- break;
- }
- String message = new String(buf, 0, len);
- System.out.println(message);
- Logger.getInstance().log(Logger.LOG_ERROR, message);
- }
- }
- catch (IOException e)
- {
- }
- }
-
-}
-
Modified: trunk/src/net/sensiva/rochat/core/logging/LogListener.java
===================================================================
--- trunk/src/net/sensiva/rochat/core/logging/LogListener.java 2007-10-16 13:26:31 UTC (rev 9)
+++ trunk/src/net/sensiva/rochat/core/logging/LogListener.java 2007-10-16 14:06:27 UTC (rev 10)
@@ -17,7 +17,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
----------------------------------------------------------------------------
*/
-package net.sensiva.rochat.ui.core.logging;
+package net.sensiva.rochat.core.logging;
import java.util.Date;
Modified: trunk/src/net/sensiva/rochat/core/logging/Logger.java
===================================================================
--- trunk/src/net/sensiva/rochat/core/logging/Logger.java 2007-10-16 13:26:31 UTC (rev 9)
+++ trunk/src/net/sensiva/rochat/core/logging/Logger.java 2007-10-16 14:06:27 UTC (rev 10)
@@ -17,7 +17,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
----------------------------------------------------------------------------
*/
-package net.sensiva.rochat.ui.core.logging;
+package net.sensiva.rochat.core.logging;
import java.util.*;
import java.io.*;
@@ -42,57 +42,60 @@
private List<LogListener> m_LogListeners = new ArrayList<LogListener>();
private static Logger m_Instance = new Logger();
- private PipedInputStream m_ErrInput;
- private PipedOutputStream m_ErrOutput;
-
/**
* The Logger constructor.
*/
public Logger()
{
- try
+ }
+
+ /**
+ * Logs a information message.
+ *
+ * @param message The message to log.
+ * \return void.
+ */
+ public void info(String message)
+ {
+ if (m_LogListeners.isEmpty())
{
- m_ErrInput = new PipedInputStream();
- m_ErrOutput = new PipedOutputStream(m_ErrInput);
- System.setErr(new PrintStream(m_ErrOutput, true));
+ // error
}
- catch (Exception e)
+ Date timeStamp = new Date();
+ for (int i = 0; i < m_LogListeners.size(); i++)
{
- e.printStackTrace();
+ LogListener listener = (LogListener)m_LogListeners.get(i);
+ listener.logEvent(LOG_INFORMATION, message, timeStamp);
}
- System.out.println("Blaat");
- new ErrorThread(m_ErrInput).start();
- throw new RuntimeException();
}
/**
- * This functions logs a message.
+ * Logs a warning message.
*
- * @param severity The severity of the event.
- * @param message The message.
+ * @param message The warning message to log.
+ * \return void.
*/
- public void log(String severity, String message)
+ public void warning(String message)
{
if (m_LogListeners.isEmpty())
{
// error
- System.out.println(severity + " : " + message);
}
Date timeStamp = new Date();
for (int i = 0; i < m_LogListeners.size(); i++)
{
LogListener listener = (LogListener)m_LogListeners.get(i);
- listener.logEvent(severity, message, timeStamp);
+ listener.logEvent(LOG_WARNING, message, timeStamp);
}
-
}
/**
- * This function logs a message.
+ * Logs a error message.
*
- * @param message The message.
+ * @param message The error message to log.
+ * \return void.
*/
- public void log(String message)
+ public void error(String message)
{
if (m_LogListeners.isEmpty())
{
@@ -102,7 +105,7 @@
for (int i = 0; i < m_LogListeners.size(); i++)
{
LogListener listener = (LogListener)m_LogListeners.get(i);
- listener.logEvent(LOG_INFORMATION, message, timeStamp);
+ listener.logEvent(LOG_ERROR, message, timeStamp);
}
}
Modified: trunk/src/net/sensiva/rochat/ui/main/MainFrame.java
===================================================================
--- trunk/src/net/sensiva/rochat/ui/main/MainFrame.java 2007-10-16 13:26:31 UTC (rev 9)
+++ trunk/src/net/sensiva/rochat/ui/main/MainFrame.java 2007-10-16 14:06:27 UTC (rev 10)
@@ -19,6 +19,7 @@
*/
package net.sensiva.rochat.ui.main;
+import net.sensiva.rochat.core.logging.*;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
@@ -46,7 +47,6 @@
e.printStackTrace();
}
-
m_MainFrame = new JFrame("ROChat");
m_Tabs = new JTabbedPane();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
