Author: vmassol
Date: 2007-09-28 12:40:40 +0200 (Fri, 28 Sep 2007)
New Revision: 5130
Modified:
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Blog/Macros
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Presentations/NameOfYourPresentation
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/CopyDocument
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/PhotoAlbumClassSheet
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/PresentationClassEditSheet
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/PresentationClassS5Sheet
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/PresentationClassSheet
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/PresentationClassTemplate
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/WebSearchCode
Log:
XE-130: Fix Velocity warnings
Patch submitted by Marius Florea
Modified:
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Blog/Macros
===================================================================
--- xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Blog/Macros
2007-09-28 09:25:58 UTC (rev 5129)
+++ xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Blog/Macros
2007-09-28 10:40:40 UTC (rev 5130)
@@ -68,6 +68,8 @@
#set($inbitems = $xwiki.parseInt($nbitems))
#set($inbstart = $xwiki.parseInt($nbstart))
#foreach ($item in $xwiki.searchDocuments($sql, $inbitems, $inbstart))
+## The default foreach counter, $velocityCount, cannot be used outside of the
foreach body!
+#set($velocityCountOutsideForeachBody = $velocityCount)
#set($bentrydoc = $xwiki.getDocument($item))
#if($bentrydoc.fullName == $item)
#set($bentryobj = $bentrydoc.getObject("XWiki.ArticleClass"))
@@ -101,13 +103,13 @@
#end
##
## prev/next links
-#if(($inbstart != 0) || ($velocityCount==$inbitems))
+#if(($inbstart != 0) || ($velocityCountOutsideForeachBody==$inbitems))
<div class="pagingLinks">
#if ($inbstart!=0)
#set($iprev = $inbstart - $inbitems)
<span
class="prevPage">[Previous>$doc.name?nbstart=${iprev}]</span>
#end
-#if($velocityCount==$inbitems)
+#if($velocityCountOutsideForeachBody==$inbitems)
#set($inext = $inbstart + $inbitems)
<span class="nextPage">[Next>$doc.name?nbstart=${inext}]</span>
#end
Modified:
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Presentations/NameOfYourPresentation
===================================================================
---
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Presentations/NameOfYourPresentation
2007-09-28 09:25:58 UTC (rev 5129)
+++
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Presentations/NameOfYourPresentation
2007-09-28 10:40:40 UTC (rev 5130)
@@ -132,7 +132,7 @@
<number>0</number>
</property>
</object>
-<content>#if($request.xpage=="s5b")
+<content>#if($request.xpage and $request.xpage=="s5b")
#includeForm("XWiki.PresentationClassS5Sheet")
#else
#if($context.action=="inline")
Modified:
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/CopyDocument
===================================================================
---
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/CopyDocument
2007-09-28 09:25:58 UTC (rev 5129)
+++
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/CopyDocument
2007-09-28 10:40:40 UTC (rev 5130)
@@ -56,7 +56,7 @@
#set($targetdoc = $request.targetdoc)
#set($language = $request.language)
-#if ($targetdoc=="")
+#if (!$targetdoc or $targetdoc=="")
#set($targetdoc = $sourcedoc)
#end
Modified:
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/PhotoAlbumClassSheet
===================================================================
---
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/PhotoAlbumClassSheet
2007-09-28 09:25:58 UTC (rev 5129)
+++
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/PhotoAlbumClassSheet
2007-09-28 10:40:40 UTC (rev 5130)
@@ -51,7 +51,12 @@
<tags/>
</property>
</object>
-<content>#set($obj = $doc.getObject("XWiki.PhotoAlbumClass", 0))
+<content>#set($obj = $doc.getObject("XWiki.PhotoAlbumClass", 0))
+#if(!$obj)
+## String type is more specific than Object type. We should avoid ambiguous
method call
+## see http://java.sun.com/docs/books/jls/clarifications-2-2nd-ed.html (JLS
15.12.2.2)
+#set($obj = "")
+#end
<br />
1 $doc.display("title", $obj)
Modified:
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/PresentationClassEditSheet
===================================================================
---
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/PresentationClassEditSheet
2007-09-28 09:25:58 UTC (rev 5129)
+++
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/PresentationClassEditSheet
2007-09-28 10:40:40 UTC (rev 5130)
@@ -59,6 +59,11 @@
* <a href="$doc.getURL("edit","xpage=editobject")">Edit/Remove
slides</a>.
#set($presobj = $doc.getObject("XWiki.PresentationClass"))
+#if(!$presobj)
+## String type is more specific than Object type. We should avoid ambiguous
method call
+## see http://java.sun.com/docs/books/jls/clarifications-2-2nd-ed.html (JLS
15.12.2.2)
+#set($presobj = "")
+#end
1.1 Presentation Template
@@ -73,6 +78,11 @@
$doc.display("footer", $presobj)
#macro(slide $slideobj)
+#if(!$slideobj)
+## String type is more specific than Object type. We should avoid ambiguous
method call
+## see http://java.sun.com/docs/books/jls/clarifications-2-2nd-ed.html (JLS
15.12.2.2)
+#set($slideobj = "")
+#end
1.1 Slide $doc.display("number", $slideobj)
Title: $doc.display("title", $slideobj)
Modified:
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/PresentationClassS5Sheet
===================================================================
---
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/PresentationClassS5Sheet
2007-09-28 09:25:58 UTC (rev 5129)
+++
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/PresentationClassS5Sheet
2007-09-28 10:40:40 UTC (rev 5130)
@@ -52,6 +52,11 @@
</property>
</object>
<content>#set($presobj = $doc.getObject("XWiki.PresentationClass"))
+#if(!$presobj)
+## String type is more specific than Object type. We should avoid ambiguous
method call
+## see http://java.sun.com/docs/books/jls/clarifications-2-2nd-ed.html (JLS
15.12.2.2)
+#set($presobj = "")
+#end
<div class="layout">
<div id="currentSlide"></div>
<div id="header">$!doc.display("header", "rendered",
$presobj)</div>
@@ -66,6 +71,11 @@
</div>
<div class="presentation">
#macro(slide $slideobj)
+#if(!$slideobj)
+## String type is more specific than Object type. We should avoid ambiguous
method call
+## see http://java.sun.com/docs/books/jls/clarifications-2-2nd-ed.html (JLS
15.12.2.2)
+#set($slideobj = "")
+#end
<div class="slide">
<h1>$doc.display("title", $slideobj)</h1>
$doc.display("content", "rendered", $slideobj)
Modified:
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/PresentationClassSheet
===================================================================
---
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/PresentationClassSheet
2007-09-28 09:25:58 UTC (rev 5129)
+++
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/PresentationClassSheet
2007-09-28 10:40:40 UTC (rev 5130)
@@ -59,6 +59,11 @@
* <a href="$doc.getURL("edit","xpage=editobject")">Edit/Remove
slides</a>.
#set($presobj = $doc.getObject("XWiki.PresentationClass"))
+#if(!$presobj)
+## String type is more specific than Object type. We should avoid ambiguous
method call
+## see http://java.sun.com/docs/books/jls/clarifications-2-2nd-ed.html (JLS
15.12.2.2)
+#set($presobj = "")
+#end
1.1 Presentation Template
@@ -73,6 +78,11 @@
$doc.display("footer", "rendered",$presobj)
#macro(slide $slideobj)
+#if(!$slideobj)
+## String type is more specific than Object type. We should avoid ambiguous
method call
+## see http://java.sun.com/docs/books/jls/clarifications-2-2nd-ed.html (JLS
15.12.2.2)
+#set($slideobj = "")
+#end
1.1 Slide $doc.display("number", $slideobj)
Title: $doc.display("title", $slideobj)
Modified:
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/PresentationClassTemplate
===================================================================
---
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/PresentationClassTemplate
2007-09-28 09:25:58 UTC (rev 5129)
+++
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/PresentationClassTemplate
2007-09-28 10:40:40 UTC (rev 5130)
@@ -132,7 +132,7 @@
<number></number>
</property>
</object>
-<content>#if($request.xpage=="s5b")
+<content>#if($request.xpage and $request.xpage=="s5b")
#includeForm("XWiki.PresentationClassS5Sheet")
#else
#if($context.action=="inline")
Modified:
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/WebSearchCode
===================================================================
---
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/WebSearchCode
2007-09-28 09:25:58 UTC (rev 5129)
+++
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/WebSearchCode
2007-09-28 10:40:40 UTC (rev 5130)
@@ -62,7 +62,7 @@
## the generated RSS feed
## ==================================================
#set($datedlist = $xwiki.arrayList)
-#if($text == "")
+#if(!$text or $text == "")
## No search
#else
#set($text = $text.replaceAll("'", "''").replaceAll("%", "\\%"))
@@ -79,7 +79,7 @@
## -----------------------------------------------------------
## Display only a given space if $request.space is defined
## -----------------------------------------------------------
- #if($space == "All")
+ #if($space and $space == "All")
#set ($webClause = "$excludedWebs")
#else
#set ($webClause = "doc.web='$space' and $excludedWebs")
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
