Author: jflesch
Date: 2008-01-26 11:58:33 +0000 (Sat, 26 Jan 2008)
New Revision: 17299

Modified:
   trunk/apps/Thaw/src/thaw/core/Logger.java
   trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java
   trunk/apps/Thaw/src/thaw/plugins/TrayIcon.java
   trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoardFactory.java
Log:
Reduce tray icon verbosity : don't display anymore warning messages

Modified: trunk/apps/Thaw/src/thaw/core/Logger.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Logger.java   2008-01-25 19:32:12 UTC (rev 
17298)
+++ trunk/apps/Thaw/src/thaw/core/Logger.java   2008-01-26 11:58:33 UTC (rev 
17299)
@@ -9,6 +9,13 @@
  */
 public class Logger {

+       public final static int LOG_LEVEL_ERROR   = 0;
+       public final static int LOG_LEVEL_WARNING = 1;
+       public final static int LOG_LEVEL_NOTICE  = 2;
+       public final static int LOG_LEVEL_INFO    = 3;
+       public final static int LOG_LEVEL_DEBUG   = 4;
+       public final static int LOG_LEVEL_VERBOSE = 5;
+
        private static int LOG_LEVEL = 2;


@@ -59,7 +66,7 @@
        }

        private static void log(final int level, final Object o, final String 
msg,
-                               final boolean manda) {
+                                                       final boolean manda) {
                if (Logger.LOG_LEVEL < level && !manda)
                        return;


Modified: trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java     2008-01-25 19:32:12 UTC 
(rev 17298)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java     2008-01-26 11:58:33 UTC 
(rev 17299)
@@ -182,7 +182,7 @@
                }

                if(!socket.isConnected()) {
-                       Logger.warning(this, "Unable to connect, but no 
exception ?! WTF ?");
+                       Logger.warning(this, "Unable to connect, but no 
exception ?!");
                        Logger.warning(this, "Will try to continue ...");
                }

@@ -388,7 +388,7 @@

                /* SECURITY */
                if(rawBytesWaiting > 0) {
-                       Logger.warning(this, "RAW BYTES STILL WAITING ON 
SOCKET. THIS IS ABNORMAL. : Will drop them.");
+                       Logger.warning(this, "RAW BYTES STILL WAITING ON 
SOCKET. THIS IS ABNORMAL. -> Will drop them.");

                        while(rawBytesWaiting > 0) {
                                int to_read = 1024;
@@ -455,7 +455,7 @@

                        } catch (final java.io.IOException e) {
                                if(isConnected())
-                                       Logger.error(this, "IOException while 
reading but still connected, wtf? : "
+                                       Logger.notice(this, "IOException while 
reading but still connected ?! : "
                                                     +e.toString()+ " ; 
"+e.getMessage() );
                                else
                                        Logger.notice(this, "IOException. 
Disconnected. : "+e.toString() + " ; "

Modified: trunk/apps/Thaw/src/thaw/plugins/TrayIcon.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/TrayIcon.java      2008-01-25 19:32:12 UTC 
(rev 17298)
+++ trunk/apps/Thaw/src/thaw/plugins/TrayIcon.java      2008-01-26 11:58:33 UTC 
(rev 17299)
@@ -152,7 +152,7 @@


        public void newLogLine(int level, Object src, String line) {
-               if (level > 1 || src == this || src == icon)
+               if (level > Logger.LOG_LEVEL_ERROR || src == this || src == 
icon)
                        return;

                int msgType = ((level == 0) ? SysTrayIcon.MSG_ERROR : 
SysTrayIcon.MSG_WARNING);

Modified: 
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoardFactory.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoardFactory.java    
2008-01-25 19:32:12 UTC (rev 17298)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoardFactory.java    
2008-01-26 11:58:33 UTC (rev 17299)
@@ -44,7 +44,8 @@
                "public",
                "sites",
                "test",
-               "privacy"
+               "privacy",
+               "software"
        };




Reply via email to