r1314 - xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes

[Ludovic Dubost]

Author: ludovic
Date: 2006-09-13 12:47:57 +0200 (Wed, 13 Sep 2006)
New Revision: 1314

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/DateClass.java
   xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/NumberClass.java
   xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/PropertyClass.java
Log:
Fix displaySearch breaking some tests

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/DateClass.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/DateClass.java	2006-09-13 05:43:48 UTC (rev 1313)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/DateClass.java	2006-09-13 10:47:57 UTC (rev 1314)
@@ -161,9 +161,10 @@
         input2.setID(prefix + name);
         input2.setSize(getSize());
 
-        buffer.append(((XWikiMessageTool)context.get("msg")).get("from"));
+        XWikiMessageTool msg = ((XWikiMessageTool)context.get("msg"));
+        buffer.append((msg==null) ? "from" : msg.get("from"));
         buffer.append(input1.toString());
-        buffer.append(((XWikiMessageTool)context.get("msg")).get("to"));
+        buffer.append((msg==null) ? "from" : msg.get("to"));
         buffer.append(input2.toString());
     }
 

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/NumberClass.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/NumberClass.java	2006-09-13 05:43:48 UTC (rev 1313)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/NumberClass.java	2006-09-13 10:47:57 UTC (rev 1314)
@@ -134,9 +134,10 @@
         if (value!=null)
          input2.setValue(value);
 
-        buffer.append(((XWikiMessageTool)context.get("msg")).get("from"));
+        XWikiMessageTool msg = ((XWikiMessageTool)context.get("msg"));
+        buffer.append((msg==null) ? "from" : msg.get("from"));
         buffer.append(input1.toString());
-        buffer.append(((XWikiMessageTool)context.get("msg")).get("to"));
+        buffer.append((msg==null) ? "from" : msg.get("to"));
         buffer.append(input2.toString());
     }
     

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/PropertyClass.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/PropertyClass.java	2006-09-13 05:43:48 UTC (rev 1313)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/PropertyClass.java	2006-09-13 10:47:57 UTC (rev 1314)
@@ -131,12 +131,14 @@
 
     public void displaySearch(StringBuffer buffer, String name, String prefix, XWikiCriteria criteria, XWikiContext context) {
         input input = new input();
-        BaseProperty prop = (BaseProperty) object.safeget(name);
-        if (prop!=null) input.setValue(prop.toFormString());
-
         input.setType("text");
         input.setName(prefix + name);
         input.setID(prefix + name);
+        input.setSize(20);
+        String fieldFullName = getFieldFullName();
+        String value = criteria.getParameter(fieldFullName);
+        if (value!=null)
+         input.setValue(value);
         buffer.append(input.toString());
     }