[Thaw-dev] r11406 - in trunk/apps/Thaw/src/thaw/plugins: . index

[jfle...@freenetproject.org]

Author: jflesch
Date: 2006-12-14 21:02:01 +0000 (Thu, 14 Dec 2006)
New Revision: 11406

Modified:
   trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java
   trunk/apps/Thaw/src/thaw/plugins/index/Index.java
   trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
Log:
Fix bug #1013

Modified: trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java  2006-12-14 20:57:24 UTC 
(rev 11405)
+++ trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java  2006-12-14 21:02:01 UTC 
(rev 11406)
@@ -96,7 +96,11 @@
                if (core.getConfig().getValue("queuePanelSplitLocation") == 
null) {
                        split.setDividerLocation((0.5));
                } else {
-                       
split.setDividerLocation(Double.parseDouble(core.getConfig().getValue("queuePanelSplitLocation")));
+                       try {
+                               
split.setDividerLocation(Double.parseDouble(core.getConfig().getValue("queuePanelSplitLocation")));
+                       } catch(java.lang.IllegalArgumentException e) { /* 
TODO: Shouldn't happen ! */
+                               Logger.error(this, "Error while setting split 
bar position: "+e.toString());
+                       }
                }

                split.setResizeWeight(0.5);

Modified: trunk/apps/Thaw/src/thaw/plugins/index/Index.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Index.java   2006-12-14 20:57:24 UTC 
(rev 11405)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Index.java   2006-12-14 21:02:01 UTC 
(rev 11406)
@@ -524,6 +524,10 @@
        }

        public String toString() {
+               return toString(true);
+       }
+
+       public String toString(boolean withRev) {
                String toDisp;

                if(displayName != null)
@@ -531,7 +535,7 @@
                else
                        toDisp = realName;

-               if (revision > 0)
+               if (withRev && revision > 0)
                        toDisp += " (r"+Integer.toString(revision)+")";

                return toDisp;

Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java   
2006-12-14 20:57:24 UTC (rev 11405)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java   
2006-12-14 21:02:01 UTC (rev 11406)
@@ -548,7 +548,7 @@

                        if (getTarget() instanceof Index) {
                                newName = 
IndexManagementHelper.askAName(I18n.getMessage("thaw.plugin.index.indexName"),
-                                                                        
getTarget().toString());
+                                                                        
((Index)getTarget()).toString(false));
                        } else {
                                newName = 
IndexManagementHelper.askAName(I18n.getMessage("thaw.plugin.index.categoryName"),
                                                                         
getTarget().toString());