[Thaw-dev] r14433 - in trunk/apps/Thaw/src/thaw: core fcp plugins

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-07-29 22:28:50 +0000 (Sun, 29 Jul 2007)
New Revision: 14433

Modified:
   trunk/apps/Thaw/src/thaw/core/Main.java
   trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
   trunk/apps/Thaw/src/thaw/plugins/TrayIcon.java
Log:
Fix the version in Main.java

Modified: trunk/apps/Thaw/src/thaw/core/Main.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Main.java     2007-07-29 21:05:09 UTC (rev 
14432)
+++ trunk/apps/Thaw/src/thaw/core/Main.java     2007-07-29 22:28:50 UTC (rev 
14433)
@@ -20,7 +20,7 @@
        _minor  = 7,
        _update = 1;
        public final static String
-       _svnBuildNumber = "14418:14424M";
+       _svnBuildNumber = "@custom@";

        public final static String
        VERSION = Main._major + "." + Main._minor + "." + Main._update + " 
r"+Main._svnBuildNumber;

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java      2007-07-29 21:05:09 UTC 
(rev 14432)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java      2007-07-29 22:28:50 UTC 
(rev 14433)
@@ -665,8 +665,11 @@
                                        fatal = false;
                                }

-                               Logger.warning(this, "==== PUT FAILED ===");
-                               Logger.warning(this, msg.toString());
+                               if (putFailedCode != 9)
+                                       Logger.warning(this, "Insertion 
failed");
+                               else
+                                       Logger.warning(this, "Insertion error : 
collision");
+                               Logger.notice(this, msg.toString());

                                setChanged();
                                this.notifyObservers();

Modified: trunk/apps/Thaw/src/thaw/plugins/TrayIcon.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/TrayIcon.java      2007-07-29 21:05:09 UTC 
(rev 14432)
+++ trunk/apps/Thaw/src/thaw/plugins/TrayIcon.java      2007-07-29 22:28:50 UTC 
(rev 14433)
@@ -144,7 +144,7 @@

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

-               popMessage(Logger.PREFIXES[level], line, msgType);
+               popMessage("Thaw : "+Logger.PREFIXES[level], line, msgType);
        }