Author: tmortagne
Date: 2007-10-10 16:23:27 +0200 (Wed, 10 Oct 2007)
New Revision: 5348

Modified:
   
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXapp
   
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXwikiapplicationclass
   
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/DeleteAppCode
   
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ExportAppCode
   
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ImportAppCode
   
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ReloadAppCode
   
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets/XWikiApplicationClassSheet
   
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppTemplates/XWikiApplicationClassTemplate
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-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXapp
===================================================================
--- 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXapp
    2007-10-10 14:09:59 UTC (rev 5347)
+++ 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXapp
    2007-10-10 14:23:27 UTC (rev 5348)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1188210392000</creationDate>
-<date>1191425573000</date>
-<contentUpdateDate>1191425573000</contentUpdateDate>
-<version>1.5</version>
+<date>1191427935000</date>
+<contentUpdateDate>1191427935000</contentUpdateDate>
+<version>1.6</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>

Modified: 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXwikiapplicationclass
===================================================================
--- 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXwikiapplicationclass
   2007-10-10 14:09:59 UTC (rev 5347)
+++ 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXwikiapplicationclass
   2007-10-10 14:23:27 UTC (rev 5348)
@@ -13,8 +13,8 @@
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1188210358000</creationDate>
 <date>1191425558000</date>
-<contentUpdateDate>1191425558000</contentUpdateDate>
-<version>1.2</version>
+<contentUpdateDate>1191871426000</contentUpdateDate>
+<version>1.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -264,5 +264,5 @@
 <tags/>
 </property>
 </object>
-<content>#includeForm("XAppSheets.XWikiApplicationClassSheet")
+<content>#includeForm("XAppSheets.XWikiApplicationClassSheet")
 </content></xwikidoc>
\ No newline at end of file

Modified: 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/DeleteAppCode
===================================================================
--- 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/DeleteAppCode
       2007-10-10 14:09:59 UTC (rev 5347)
+++ 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/DeleteAppCode
       2007-10-10 14:23:27 UTC (rev 5348)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1190904319000</creationDate>
-<date>1190917891000</date>
-<contentUpdateDate>1190917891000</contentUpdateDate>
-<version>1.9</version>
+<date>1191871847000</date>
+<contentUpdateDate>1191871847000</contentUpdateDate>
+<version>1.10</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -53,7 +53,7 @@
 <tags/>
 </property>
 </object>
-<content>#if($action == "delete")
+<content>#if($action &amp;&amp; $action == "delete")
   #if($confirm &amp;&amp; $confirm == 1)
     #set($result = $Appmanager.deleteApplication($appname))
     #if ($result == $Exception.ERROR_NOERROR)

Modified: 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ExportAppCode
===================================================================
--- 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ExportAppCode
       2007-10-10 14:09:59 UTC (rev 5347)
+++ 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ExportAppCode
       2007-10-10 14:23:27 UTC (rev 5348)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1190905378000</creationDate>
-<date>1191512138000</date>
-<contentUpdateDate>1191512138000</contentUpdateDate>
-<version>1.28</version>
+<date>1191871868000</date>
+<contentUpdateDate>1191871868000</contentUpdateDate>
+<version>1.29</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -53,7 +53,7 @@
 <tags/>
 </property>
 </object>
-<content>#if($action == "export")
+<content>#if($action &amp;&amp; $action == "export")
   #if($confirm &amp;&amp; $confirm == 1)
     #if($recurse &amp;&amp; $recurse == 1)
       #set($recurse = true)

Modified: 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ImportAppCode
===================================================================
--- 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ImportAppCode
       2007-10-10 14:09:59 UTC (rev 5347)
+++ 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ImportAppCode
       2007-10-10 14:23:27 UTC (rev 5348)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1190905469000</creationDate>
-<date>1190976022000</date>
-<contentUpdateDate>1190976022000</contentUpdateDate>
-<version>1.5</version>
+<date>1191871861000</date>
+<contentUpdateDate>1191871861000</contentUpdateDate>
+<version>1.6</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -53,7 +53,7 @@
 <tags/>
 </property>
 </object>
-<content>#if($action == "import")
+<content>#if($action &amp;&amp; $action == "import")
   #set($result = $Appmanager.importApplication($packagename))
   #if ($result == $Exception.ERROR_NOERROR)
     #info($msg.get("xapp.successimportapp", [$packagename]))

Modified: 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ReloadAppCode
===================================================================
--- 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ReloadAppCode
       2007-10-10 14:09:59 UTC (rev 5347)
+++ 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ReloadAppCode
       2007-10-10 14:23:27 UTC (rev 5348)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1190905536000</creationDate>
-<date>1190975990000</date>
-<contentUpdateDate>1190975990000</contentUpdateDate>
-<version>1.6</version>
+<date>1191871854000</date>
+<contentUpdateDate>1191871854000</contentUpdateDate>
+<version>1.7</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -53,7 +53,7 @@
 <tags/>
 </property>
 </object>
-<content>#if($action == "reload")
+<content>#if($action &amp;&amp; $action == "reload")
   #set($result = $Appmanager.reloadApplication($appname))
   #if ($result == $Exception.ERROR_NOERROR)
     #info($msg.get("xapp.successreloadapp", [$appname]))

Modified: 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets/XWikiApplicationClassSheet
===================================================================
--- 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets/XWikiApplicationClassSheet
        2007-10-10 14:09:59 UTC (rev 5347)
+++ 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets/XWikiApplicationClassSheet
        2007-10-10 14:23:27 UTC (rev 5348)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1188210015000</creationDate>
-<date>1191861709000</date>
-<contentUpdateDate>1191861709000</contentUpdateDate>
-<version>1.5</version>
+<date>1192025192000</date>
+<contentUpdateDate>1192025192000</contentUpdateDate>
+<version>1.21</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -53,16 +53,53 @@
 <tags/>
 </property>
 </object>
-<content>## you can modify this page to customize the presentation of your 
object
+<content>#set($Appmanager = $xwiki.applicationmanager)
+#set($Exception = $Appmanager.DefaultException)
 
-1 Document $doc.name
+#set($object = $doc.getObject("XAppClasses.XWikiApplicationClass"))
+#set($class = $object.xWikiClass)
+#set($app = $Appmanager.getApplicationDocument($doc.getValue("appname", 
$object)))
 
-#set($class = $doc.getObject("XAppClasses.XWikiApplicationClass").xWikiClass)
+#############################################################################
 
+1 Application \"$app.appName\"
+
 &lt;dl&gt;
   #foreach($prop in $class.properties)
     &lt;dt&gt; ${prop.prettyName} &lt;/dt&gt;
-    &lt;dd&gt;$doc.display($prop.getName())&lt;/dd&gt;
+    #if($context.action == "view" &amp;&amp; $prop.name == "documents")
+      &lt;dd&gt;
+        #foreach($docfullname in $app.getDocumentsNames(false, false))
+          [$docfullname&gt;$docfullname]
+        #end
+      &lt;/dd&gt;
+    #elseif($context.action == "view" &amp;&amp; $prop.name == "docstoinclude")
+      &lt;dd&gt;
+        #foreach($docfullname in $app.getDocsNameToInclude(false))
+          [$docfullname&gt;$docfullname]
+        #end
+      &lt;/dd&gt;
+    #elseif($context.action == "view" &amp;&amp; $prop.name == "docstolink")
+      &lt;dd&gt;
+        #foreach($docfullname in $app.getDocsNameToLink(false))
+          [$docfullname&gt;$docfullname]
+        #end
+      &lt;/dd&gt;
+    #elseif($context.action == "view" &amp;&amp; $prop.name == 
"translationdocs")
+      &lt;dd&gt;
+        #foreach($docfullname in $app.getTranslationDocs())
+          [$docfullname&gt;$docfullname]
+        #end
+      &lt;/dd&gt;
+    #elseif($context.action == "view" &amp;&amp; $prop.name == "applications")
+      &lt;dd&gt;
+        #foreach($appname in $app.getApplications())
+          
[$appname&gt;$Appmanager.getApplicationDocument($object.appname).fullName]
+        #end
+      &lt;/dd&gt;
+    #else
+      &lt;dd&gt;$doc.display($prop.getName())&lt;/dd&gt;
+    #end
   #end
 &lt;/dl&gt;
 </content></xwikidoc>
\ No newline at end of file

Modified: 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppTemplates/XWikiApplicationClassTemplate
===================================================================
--- 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppTemplates/XWikiApplicationClassTemplate
  2007-10-10 14:09:59 UTC (rev 5347)
+++ 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppTemplates/XWikiApplicationClassTemplate
  2007-10-10 14:23:27 UTC (rev 5348)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1188210015000</creationDate>
-<date>1191861828000</date>
-<contentUpdateDate>1191861828000</contentUpdateDate>
-<version>1.3</version>
+<date>1192025481000</date>
+<contentUpdateDate>1192025481000</contentUpdateDate>
+<version>1.12</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications

Reply via email to