Author: jvdrean
Date: 2008-02-22 11:52:05 +0100 (Fri, 22 Feb 2008)
New Revision: 7913
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/menuview.vm
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListPluginApi.java
Log:
XWIKI-1865 : Rename badly named methods in WatchList plugin
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/menuview.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/menuview.vm
2008-02-22 10:48:19 UTC (rev 7912)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/menuview.vm
2008-02-22 10:52:05 UTC (rev 7913)
@@ -115,26 +115,26 @@
}
//]]>
</script>
- #set ($isWatchedDoc = $xwiki.watchlist.isWatchedDocument())
- #set ($isWatchedSpace = $xwiki.watchlist.isWatchedSpace())
- #if ($isWatchedDoc || $isWatchedSpace)
+ #set ($isDocWatched = $xwiki.watchlist.isDocumentWatched())
+ #set ($isSpaceWatched = $xwiki.watchlist.isSpaceWatched())
+ #if ($isDocWatched || $isSpaceWatched)
#xwikitopmenuentrystart("javascript:watchlist('removedocument')"
$msg.get("core.menu.watch") "tmWatched")
#else
#xwikitopmenuentrystart("javascript:watchlist('adddocument')"
$msg.get("core.menu.watch") "tmWatch")
#end
- #if (!$isWatchedDoc)
+ #if (!$isDocWatched)
#submenuitem("javascript:watchlist('adddocument')"
$msg.get("core.menu.watchlist.add.page"))
#else
#submenuitem("javascript:watchlist('removedocument')"
$msg.get("core.menu.watchlist.remove.page"))
#end
#submenuseparator()
- #if (!$isWatchedSpace)
+ #if (!$isSpaceWatched)
#submenuitem("javascript:watchlist('addspace')"
$msg.get("core.menu.watchlist.add.space"))
#else
#submenuitem("javascript:watchlist('removespace')"
$msg.get("core.menu.watchlist.remove.space"))
#end
#submenuseparator()
- #submenuitem($crtUserDoc.getURL("view", "xpage=watchlist")
$msg.get("core.menu.watchlist.management"))
+ #submenuitem($docuser.getURL("view", "xpage=watchlist")
$msg.get("core.menu.watchlist.management"))
#xwikitopmenuentryend()
#end
#end
Modified:
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListPluginApi.java
===================================================================
---
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListPluginApi.java
2008-02-22 10:48:19 UTC (rev 7912)
+++
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListPluginApi.java
2008-02-22 10:52:05 UTC (rev 7913)
@@ -68,7 +68,7 @@
* @return True if the document is in the current user's WatchList
* @throws XWikiException If the user's WatchList Object cannot be
retreived nor created
*/
- public boolean isWatchedDocument() throws XWikiException
+ public boolean isDocumentWatched() throws XWikiException
{
return
getWatchListPlugin().getWatchedDocuments(context.getLocalUser(), context)
.contains(context.getDoc().getFullName());
@@ -134,7 +134,7 @@
* @return True if the document is in the current user's watchlist
* @throws XWikiException If the user's WatchList Object cannot be
retreived nor created
*/
- public boolean isWatchedSpace() throws XWikiException
+ public boolean isSpaceWatched() throws XWikiException
{
return getWatchListPlugin().getWatchedSpaces(context.getLocalUser(),
context)
.contains(context.getDoc().getSpace());
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
