Author: tmortagne Date: 2007-10-10 16:23:42 +0200 (Wed, 10 Oct 2007) New Revision: 5349
Added: xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/resources/sheets/ xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/resources/sheets/XAppSheets.XWikiApplicationClassSheet.vm Modified: xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/ApplicationManager.java xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplication.java Log: XAAM-20: Modify XAppSheets.XWikiApplicationClassSheet to better print object related to other documents: - applications dependencies - documents application contains (also resolve the matching strings) - documents to include (also resolve the matching strings) - documents to link (also resolve the matching strings) - translation pages XAAM-21: Use XAAM-19 to store in the plugin jar the default class sheet to use for XWikiApplication XAAM-22: Delete useless XWikiContext parameter in some XWikiApplication methods Modified: xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/ApplicationManager.java =================================================================== --- xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/ApplicationManager.java 2007-10-10 14:23:27 UTC (rev 5348) +++ xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/ApplicationManager.java 2007-10-10 14:23:42 UTC (rev 5349) @@ -232,7 +232,7 @@ export.setName(app.getAppName() + "-" + app.getAppVersion()); - Set documents = app.getDocumentsNames(recurse, true, context); + Set documents = app.getDocumentsNames(recurse, true); for (Iterator it = documents.iterator(); it.hasNext();) { export.add((String) it.next(), DocumentInfo.ACTION_OVERWRITE); } Modified: xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplication.java =================================================================== --- xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplication.java 2007-10-10 14:23:27 UTC (rev 5348) +++ xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplication.java 2007-10-10 14:23:42 UTC (rev 5349) @@ -349,15 +349,13 @@ * [EMAIL PROTECTED] XWikiApplicationClass#FIELD_docstolink}. * @param includeAppDesc if true application descriptor document names is add to * <code>docsNames</code>. - * @param context the XWiki context. * @throws XWikiException * @see XWikiApplicationClass#FIELD_documents * @see XWikiApplicationClass#FIELD_docstoinclude * @see XWikiApplicationClass#FIELD_docstolink * @see #resolveDocumentsNames(Collection, Collection, XWikiContext) */ - private void resolveDocumentsNames(Collection docsNames, String type, boolean includeAppDesc, - XWikiContext context) throws XWikiException + private void resolveDocumentsNames(Collection docsNames, String type, boolean includeAppDesc) throws XWikiException { if (includeAppDesc) docsNames.add(getFullName()); @@ -381,17 +379,16 @@ * [EMAIL PROTECTED] XWikiApplicationClass#FIELD_docstolink}. * @param includeAppDesc if true application descriptor document names is add to * <code>docsNames</code>. - * @param context the XWiki context. * @throws XWikiException */ private static void resolveApplicationsDocsNames(Collection docsNames, - Collection applications, String type, boolean includeAppDesc, XWikiContext context) + Collection applications, String type, boolean includeAppDesc) throws XWikiException { for (Iterator it = applications.iterator(); it.hasNext();) { XWikiApplication app = (XWikiApplication) it.next(); - app.resolveDocumentsNames(docsNames, type, includeAppDesc, context); + app.resolveDocumentsNames(docsNames, type, includeAppDesc); } } @@ -409,20 +406,18 @@ * only direct dependencies. * @param includeAppDesc if true application descriptor document names is add to * <code>docsNames</code>. - * @param context the XWiki context. * @return all documents names of type <code>type</code> application contains. * @throws XWikiException */ - private Set getDocsNameSet(String type, boolean recurse, boolean includeAppDesc, - XWikiContext context) throws XWikiException + private Set getDocsNameSet(String type, boolean recurse, boolean includeAppDesc) throws XWikiException { Set documents = new HashSet(); - resolveDocumentsNames(documents, type, includeAppDesc, context); + resolveDocumentsNames(documents, type, includeAppDesc); if (recurse) { resolveApplicationsDocsNames(documents, getXWikiApplicationSet(true, context), type, - includeAppDesc, context); + includeAppDesc); } return documents; @@ -438,17 +433,15 @@ * only direct dependencies. * @param includeAppDesc if true application descriptor document names is add to * <code>docsNames</code>. - * @param context the XWiki context. * @return all documents names application contains. * @throws XWikiException * @see #getDocuments() * @see XWikiApplicationClass#FIELD_documents */ - public Set getDocumentsNames(boolean recurse, boolean includeAppDesc, XWikiContext context) + public Set getDocumentsNames(boolean recurse, boolean includeAppDesc) throws XWikiException { - return getDocsNameSet(XWikiApplicationClass.FIELD_documents, recurse, includeAppDesc, - context); + return getDocsNameSet(XWikiApplicationClass.FIELD_documents, recurse, includeAppDesc); } /** @@ -459,15 +452,14 @@ * * @param recurse if true it follow recursively all applications dependencies, if false parse * only direct dependencies. - * @param context the XWiki context. * @return all documents names to include application contains. * @throws XWikiException * @see #getDocsToInclude() * @see XWikiApplicationClass#FIELD_docstoinclude */ - public Set getDocsNameToInclude(boolean recurse, XWikiContext context) throws XWikiException + public Set getDocsNameToInclude(boolean recurse) throws XWikiException { - return getDocsNameSet(XWikiApplicationClass.FIELD_docstoinclude, recurse, false, context); + return getDocsNameSet(XWikiApplicationClass.FIELD_docstoinclude, recurse, false); } /** @@ -493,7 +485,7 @@ Set docsToInclude = new HashSet(); resolveApplicationsDocsNames(docsToInclude, applications, - XWikiApplicationClass.FIELD_docstoinclude, false, context); + XWikiApplicationClass.FIELD_docstoinclude, false); return docsToInclude; } @@ -506,15 +498,14 @@ * * @param recurse if true it follow recursively all applications dependencies, if false parse * only direct dependencies. - * @param context the XWiki context. * @return all documents names to link application contains. * @throws XWikiException * @see #getDocsToLink() * @see XWikiApplicationClass#FIELD_docstolink */ - public Set getDocsNameToLink(boolean recurse, XWikiContext context) throws XWikiException + public Set getDocsNameToLink(boolean recurse) throws XWikiException { - return getDocsNameSet(XWikiApplicationClass.FIELD_docstolink, recurse, false, context); + return getDocsNameSet(XWikiApplicationClass.FIELD_docstolink, recurse, false); } /** @@ -540,7 +531,7 @@ Set docsToLink = new HashSet(); resolveApplicationsDocsNames(docsToLink, applications, - XWikiApplicationClass.FIELD_docstolink, false, context); + XWikiApplicationClass.FIELD_docstolink, false); return docsToLink; } Added: xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/resources/sheets/XAppSheets.XWikiApplicationClassSheet.vm =================================================================== --- xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/resources/sheets/XAppSheets.XWikiApplicationClassSheet.vm (rev 0) +++ xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/resources/sheets/XAppSheets.XWikiApplicationClassSheet.vm 2007-10-10 14:23:42 UTC (rev 5349) @@ -0,0 +1,49 @@ +#set($Appmanager = $xwiki.applicationmanager) +#set($Exception = $Appmanager.DefaultException) + +#set($object = $doc.getObject("XAppClasses.XWikiApplicationClass")) +#set($class = $object.xWikiClass) +#set($app = $Appmanager.getApplicationDocument($doc.getValue("appname", $object))) + +############################################################################# + +1 Application \"$app.appName\" + +<dl> + #foreach($prop in $class.properties) + <dt> ${prop.prettyName} </dt> + #if($context.action == "view" && $prop.name == "documents") + <dd> + #foreach($docfullname in $app.getDocumentsNames(false, false)) + [$docfullname>$docfullname] + #end + </dd> + #elseif($context.action == "view" && $prop.name == "docstoinclude") + <dd> + #foreach($docfullname in $app.getDocsNameToInclude(false)) + [$docfullname>$docfullname] + #end + </dd> + #elseif($context.action == "view" && $prop.name == "docstolink") + <dd> + #foreach($docfullname in $app.getDocsNameToLink(false)) + [$docfullname>$docfullname] + #end + </dd> + #elseif($context.action == "view" && $prop.name == "translationdocs") + <dd> + #foreach($docfullname in $app.getTranslationDocs()) + [$docfullname>$docfullname] + #end + </dd> + #elseif($context.action == "view" && $prop.name == "applications") + <dd> + #foreach($appname in $app.getApplications()) + [$appname>$Appmanager.getApplicationDocument($object.appname).fullName] + #end + </dd> + #else + <dd>$doc.display($prop.getName())</dd> + #end + #end +</dl> _______________________________________________ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications