r1384 - in xwiki/trunk/src/main/java/com/xpn/xwiki: . api objects/classes store

[Jeremi Joslin]

Author: jeremi
Date: 2006-10-12 18:12:30 +0200 (Thu, 12 Oct 2006)
New Revision: 1384

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/objects/classes/BaseClass.java
   xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java
Log:
[GELC]
* add ClearName in the API
* add the ability to create a dblist programmatically
* add a function to find an unsued name

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java	2006-10-11 18:42:11 UTC (rev 1383)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java	2006-10-12 16:12:30 UTC (rev 1384)
@@ -4039,6 +4039,17 @@
 
     }
 
+    public String getUniquePageName(String space, String name, XWikiContext context){
+        String pageName = clearName(name, context);
+        if (exists(space + "." + pageName, context)){
+            int i = 0;
+            while (exists(space + "." + pageName + "_" + i, context))
+                i++;
+            return pageName + "_" + i;
+        }
+        return pageName;
+    }
+
     public String displaySearch(String fieldname, String className, XWikiCriteria criteria, XWikiContext context) throws XWikiException {
         return displaySearch(fieldname, className, "", criteria, context);
     }

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java	2006-10-11 18:42:11 UTC (rev 1383)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java	2006-10-12 16:12:30 UTC (rev 1384)
@@ -2059,5 +2059,13 @@
     public com.xpn.xwiki.api.PropertyClass getPropertyClassFromName(String propPath) {
         return new PropertyClass(xwiki.getPropertyClassFromName(propPath, context), context);
     }
+
+    public String getUniquePageName(String space, String name){
+        return xwiki.getUniquePageName(space, name, context);
+    }
+
+    public String clearName(String name){
+        return xwiki.clearName(name, context);
+    }
 }
 

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/BaseClass.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/BaseClass.java	2006-10-11 18:42:11 UTC (rev 1383)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/BaseClass.java	2006-10-12 16:12:30 UTC (rev 1384)
@@ -418,6 +418,25 @@
         return false;
     }
 
+    public boolean addDBListField(String fieldName, String fieldPrettyName, String sql) {
+        return addDBListField(fieldName, fieldPrettyName, 1, false, sql);
+    }
+
+    public boolean addDBListField(String fieldName, String fieldPrettyName, int size, boolean multiSelect, String sql) {
+        if (get(fieldName)==null) {
+            DBListClass list_class = new DBListClass();
+            list_class.setName(fieldName);
+            list_class.setPrettyName(fieldPrettyName);
+            list_class.setSize(size);
+            list_class.setMultiSelect(multiSelect);
+            list_class.setSql(sql);
+            list_class.setObject(this);
+            put(fieldName, list_class);
+            return true;
+        }
+        return false;
+    }
+
     public boolean addNumberField(String fieldName, String fieldPrettyName, int size, String type) {
         if (get(fieldName)==null) {
             NumberClass number_class = new NumberClass();

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java	2006-10-11 18:42:11 UTC (rev 1383)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java	2006-10-12 16:12:30 UTC (rev 1384)
@@ -1598,8 +1598,6 @@
             while (it.hasNext()) {
                 list.add(it.next());
             }
-            if (bTransaction)
-                endTransaction(context, false, false);
             return list;
         }
         catch (Exception e) {