r1311 - in xwiki/trunk/src/main/java/com/xpn/xwiki: . api plugin/query

[Ludovic Dubost]

Author: ludovic
Date: 2006-09-12 23:05:31 +0200 (Tue, 12 Sep 2006)
New Revision: 1311

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
   xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java
   xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/query/XWikiQuery.java
Log:
More Query Generator

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java	2006-09-12 20:42:11 UTC (rev 1310)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java	2006-09-12 21:05:31 UTC (rev 1311)
@@ -4008,6 +4008,14 @@
 
     }
 
+    public String displaySearch(String fieldname, String className, XWikiCriteria criteria, XWikiContext context) throws XWikiException {
+        return displaySearch(fieldname, className, "", criteria, context);
+    }
+
+    public String displaySearch(String fieldname, String className, XWikiContext context) throws XWikiException {
+        return displaySearch(fieldname, className, "", new XWikiCriteria(), context);
+    }
+
     public String displaySearch(String fieldname, String className, String prefix, XWikiCriteria criteria, XWikiContext context) throws XWikiException {
         BaseClass bclass = getDocument(className, context).getxWikiClass();
         PropertyClass pclass = (PropertyClass) bclass.get(fieldname);
@@ -4016,7 +4024,7 @@
         if (pclass==null)
          return "";
         else
-         return pclass.displaySearch(fieldname, prefix, criteria, context);
+         return pclass.displaySearch(fieldname, prefix + "XWiki.XWikiUsers_", criteria, context);
     }
 
     public List search(XWikiQuery query, XWikiContext context) throws XWikiException {

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java	2006-09-12 20:42:11 UTC (rev 1310)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java	2006-09-12 21:05:31 UTC (rev 1311)
@@ -1031,7 +1031,14 @@
         return xwiki.convertUsername(username, context);
     }
 
-    public String displaySearch(String fieldname, String className, String prefix, XWikiCriteria criteria, XWikiContext context) throws XWikiException {
+    public String displaySearch(String fieldname, String className) throws XWikiException {
+        return xwiki.displaySearch(fieldname,className, context);
+    }
+
+    public String displaySearch(String fieldname, String className, XWikiCriteria criteria) throws XWikiException {
+       return xwiki.displaySearch(fieldname,className,criteria, context);
+    }
+    public String displaySearch(String fieldname, String className, String prefix, XWikiCriteria criteria) throws XWikiException {
        return xwiki.displaySearch(fieldname, className, prefix, criteria, context);
     }
 

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/query/XWikiQuery.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/query/XWikiQuery.java	2006-09-12 20:42:11 UTC (rev 1310)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/query/XWikiQuery.java	2006-09-12 21:05:31 UTC (rev 1311)
@@ -61,7 +61,8 @@
     }
 
     public void setDisplayProperties(String[] properties) {
-        displayProperties = Arrays.asList(properties);
+        if (properties!=null)
+         displayProperties = Arrays.asList(properties);
     }
 
     public List getDisplayProperties() {