r1496 - xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets

[Jeremi Joslin]

Author: jeremi
Date: 2006-11-02 16:21:11 +0100 (Thu, 02 Nov 2006)
New Revision: 1496

Modified:
   xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetManagerPlugin.java
Log:
return Document instead of XWikiDocument

Modified: xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetManagerPlugin.java
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetManagerPlugin.java	2006-11-02 14:46:55 UTC (rev 1495)
+++ xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetManagerPlugin.java	2006-11-02 15:21:11 UTC (rev 1496)
@@ -504,15 +504,26 @@
 
     public List getPublishedCollection(String userName, XWikiContext context) throws XWikiException {
         String hql = ", BaseObject as obj where doc.fullName=obj.name and obj.className='"+ ASSET_CLASS_FULLNAME + "' and doc.author = '" + userName + "' and doc.web!='" + ASSET_TEMPORARY_SPACE + "'";
-        return context.getWiki().getStore().searchDocuments(hql, context);
+        List xDocs = context.getWiki().getStore().searchDocuments(hql, context);
+        return WrapDocuments(xDocs, context);
     }
 
+    private List WrapDocuments(List xdocs, XWikiContext context){
+        List docs = new ArrayList();
+        Iterator it  = xdocs.iterator();
+        while(it.hasNext()){
+            docs.add(((XWikiDocument)it.next()).newDocument(context));
+        }
+        return docs;
+    }
+
     public List getUnpublishedCollection(XWikiContext context) throws XWikiException {
         return getUnpublishedCollection(context.getUser(), context);
     }
 
     public List getUnpublishedCollection(String userName, XWikiContext context) throws XWikiException {
         String hql = ", BaseObject as obj where doc.fullName=obj.name and obj.className='"+ ASSET_CLASS_FULLNAME + "' and doc.author = '" + userName + "' and doc.web='" + ASSET_TEMPORARY_SPACE + "'";
-        return context.getWiki().getStore().searchDocuments(hql, context);
+        List xDocs = context.getWiki().getStore().searchDocuments(hql, context);
+        return WrapDocuments(xDocs, context);
     }
 }