Author: sdumitriu
Date: 2008-02-20 16:13:15 +0100 (Wed, 20 Feb 2008)
New Revision: 7875
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarPluginApi.java
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/captcha/CaptchaPluginApi.java
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/charts/ChartingPluginApi.java
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/diff/DiffPluginApi.java
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/feed/FeedPluginApi.java
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/flickr/FlickrPluginApi.java
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/google/GooglePluginApi.java
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/graphviz/GraphVizPluginApi.java
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/ldap/LDAPPluginApi.java
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/LucenePluginApi.java
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/mail/MailPluginApi.java
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/svg/SVGPluginApi.java
Log:
XWIKI-1551
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarPluginApi.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarPluginApi.java
2008-02-20 14:22:48 UTC (rev 7874)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarPluginApi.java
2008-02-20 15:13:15 UTC (rev 7875)
@@ -53,28 +53,28 @@
}
public CalendarParams getCalendarParams(String month, String year) {
- return getPlugin().getCalendarParams(month, year, getXWikiContext());
+ return plugin.getCalendarParams(month, year, getXWikiContext());
}
public String getHTMLCalendar(CalendarParams calendarParams, String user)
throws XWikiException {
- return getPlugin().getHTMLCalendar(calendarParams, user,
getXWikiContext());
+ return plugin.getHTMLCalendar(calendarParams, user, getXWikiContext());
}
public String getHTMLCalendar(CalendarParams calendarParams, Document doc,
String user) throws XWikiException {
- return getPlugin().getHTMLCalendar(calendarParams, doc.getDocument(),
user, getXWikiContext());
+ return plugin.getHTMLCalendar(calendarParams, doc.getDocument(), user,
getXWikiContext());
}
public String getHTMLCalendar(CalendarParams calendarParams, String hql,
String user) throws XWikiException {
- return getPlugin().getHTMLCalendar(calendarParams, hql, user,
getXWikiContext());
+ return plugin.getHTMLCalendar(calendarParams, hql, user,
getXWikiContext());
}
public String getHTMLCalendar(CalendarParams calendarParams, String hql,
int nb) throws XWikiException {
- return getPlugin().getHTMLCalendar(calendarParams, hql, nb,
getXWikiContext());
+ return plugin.getHTMLCalendar(calendarParams, hql, nb,
getXWikiContext());
}
public String getHTMLCalendar(CalendarParams calendarParams, CalendarData
calendarData) throws XWikiException
{
- return getPlugin().getHTMLCalendar(calendarParams, calendarData,
getXWikiContext());
+ return plugin.getHTMLCalendar(calendarParams, calendarData,
getXWikiContext());
}
public CalendarParams getCalendarParams() {
@@ -97,9 +97,11 @@
return getCalendarEvent(cdateStart, cdateEnd, user, description);
}
-
public CalendarPlugin getPlugin() {
- return plugin;
+ if (hasProgrammingRights()) {
+ return plugin;
+ }
+ return null;
}
public void setPlugin(CalendarPlugin plugin) {
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/captcha/CaptchaPluginApi.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/captcha/CaptchaPluginApi.java
2008-02-20 14:22:48 UTC (rev 7874)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/captcha/CaptchaPluginApi.java
2008-02-20 15:13:15 UTC (rev 7875)
@@ -36,7 +36,10 @@
public CaptchaPlugin getPlugin()
{
- return plugin;
+ if (hasProgrammingRights()) {
+ return plugin;
+ }
+ return null;
}
private void setPlugin(CaptchaPlugin plugin)
@@ -46,11 +49,11 @@
public String displayCaptcha(String action, String classname) throws
XWikiException
{
- return getPlugin().displayCaptcha(action, classname,
getXWikiContext());
+ return plugin.displayCaptcha(action, classname, getXWikiContext());
}
public Boolean verifyCaptcha(String action) throws XWikiException
{
- return getPlugin().verifyCaptcha(action, getXWikiContext());
+ return plugin.verifyCaptcha(action, getXWikiContext());
}
}
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/charts/ChartingPluginApi.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/charts/ChartingPluginApi.java
2008-02-20 14:22:48 UTC (rev 7874)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/charts/ChartingPluginApi.java
2008-02-20 15:13:15 UTC (rev 7875)
@@ -40,7 +40,10 @@
}
public ChartingPlugin getPlugin() {
- return plugin;
+ if (hasProgrammingRights()) {
+ return plugin;
+ }
+ return null;
}
public Chart generateChart(ChartParams params, XWikiContext context)
throws GenerateException {
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/diff/DiffPluginApi.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/diff/DiffPluginApi.java
2008-02-20 14:22:48 UTC (rev 7874)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/diff/DiffPluginApi.java
2008-02-20 15:13:15 UTC (rev 7875)
@@ -22,7 +22,10 @@
}
public DiffPlugin getPlugin() {
- return plugin;
+ if (hasProgrammingRights()) {
+ return plugin;
+ }
+ return null;
}
public void setPlugin(DiffPlugin plugin) {
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/feed/FeedPluginApi.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/feed/FeedPluginApi.java
2008-02-20 14:22:48 UTC (rev 7874)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/feed/FeedPluginApi.java
2008-02-20 15:13:15 UTC (rev 7875)
@@ -38,7 +38,10 @@
}
public FeedPlugin getPlugin() {
- return plugin;
+ if (hasProgrammingRights()) {
+ return plugin;
+ }
+ return null;
}
public void setPlugin(FeedPlugin plugin) {
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/flickr/FlickrPluginApi.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/flickr/FlickrPluginApi.java
2008-02-20 14:22:48 UTC (rev 7874)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/flickr/FlickrPluginApi.java
2008-02-20 15:13:15 UTC (rev 7875)
@@ -37,7 +37,10 @@
}
public FlickrPlugin getPlugin() {
- return plugin;
+ if (hasProgrammingRights()) {
+ return plugin;
+ }
+ return null;
}
/**
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/google/GooglePluginApi.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/google/GooglePluginApi.java
2008-02-20 14:22:48 UTC (rev 7874)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/google/GooglePluginApi.java
2008-02-20 15:13:15 UTC (rev 7875)
@@ -40,7 +40,10 @@
}
public GooglePlugin getPlugin() {
- return plugin;
+ if (hasProgrammingRights()) {
+ return plugin;
+ }
+ return null;
}
public void setPlugin(GooglePlugin plugin) {
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/graphviz/GraphVizPluginApi.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/graphviz/GraphVizPluginApi.java
2008-02-20 14:22:48 UTC (rev 7874)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/graphviz/GraphVizPluginApi.java
2008-02-20 15:13:15 UTC (rev 7875)
@@ -35,7 +35,10 @@
}
public GraphVizPlugin getPlugin() {
- return plugin;
+ if (hasProgrammingRights()) {
+ return plugin;
+ }
+ return null;
}
public void setPlugin(GraphVizPlugin plugin) {
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/ldap/LDAPPluginApi.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/ldap/LDAPPluginApi.java
2008-02-20 14:22:48 UTC (rev 7874)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/ldap/LDAPPluginApi.java
2008-02-20 15:13:15 UTC (rev 7875)
@@ -38,7 +38,10 @@
}
public LDAPPlugin getPlugin() {
- return plugin;
+ if (hasProgrammingRights()) {
+ return plugin;
+ }
+ return null;
}
public void setPlugin(LDAPPlugin plugin) {
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/LucenePluginApi.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/LucenePluginApi.java
2008-02-20 14:22:48 UTC (rev 7874)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/LucenePluginApi.java
2008-02-20 15:13:15 UTC (rev 7875)
@@ -207,7 +207,10 @@
*/
public LucenePlugin getPlugin()
{
- return this.plugin;
+ if (hasProgrammingRights()) {
+ return plugin;
+ }
+ return null;
}
/**
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/mail/MailPluginApi.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/mail/MailPluginApi.java
2008-02-20 14:22:48 UTC (rev 7874)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/mail/MailPluginApi.java
2008-02-20 15:13:15 UTC (rev 7875)
@@ -36,7 +36,10 @@
}
public MailPlugin getPlugin() {
- return plugin;
+ if (hasProgrammingRights()) {
+ return plugin;
+ }
+ return null;
}
public void setPlugin(MailPlugin plugin) {
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/svg/SVGPluginApi.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/svg/SVGPluginApi.java
2008-02-20 14:22:48 UTC (rev 7874)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/svg/SVGPluginApi.java
2008-02-20 15:13:15 UTC (rev 7875)
@@ -36,7 +36,10 @@
}
public SVGPlugin getPlugin() {
- return plugin;
+ if (hasProgrammingRights()) {
+ return plugin;
+ }
+ return null;
}
public void setPlugin(SVGPlugin plugin) {
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
