Author: tmortagne
Date: 2008-01-11 13:40:51 +0100 (Fri, 11 Jan 2008)
New Revision: 6772
Modified:
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManagerPluginApi.java
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/Wiki.java
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/XWikiServer.java
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/XWikiServerClass.java
Log:
XAAM-42: Rename SuperClass/SuperDocument in XClassManager/XObjectDocument
Modified:
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
===================================================================
---
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
2008-01-11 12:40:47 UTC (rev 6771)
+++
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
2008-01-11 12:40:51 UTC (rev 6772)
@@ -25,8 +25,8 @@
import com.xpn.xwiki.XWikiException;
import com.xpn.xwiki.plugin.applicationmanager.ApplicationManagerPlugin;
import com.xpn.xwiki.plugin.applicationmanager.ApplicationManagerPluginApi;
-import
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.SuperClass;
-import
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.SuperDocument;
+import
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.XClassManager;
+import
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.XObjectDocument;
import
com.xpn.xwiki.plugin.applicationmanager.core.plugin.XWikiPluginMessageTool;
import com.xpn.xwiki.plugin.applicationmanager.doc.XWikiApplication;
import com.xpn.xwiki.plugin.wikimanager.doc.Wiki;
@@ -352,7 +352,7 @@
XWikiDocument targetDoc = xwiki.getDocument(docFullName,
context);
targetDoc.setContent(MessageFormat.format("#includeInContext(\"{0}{1}{2}\")",
- new Object[] {sourceWiki,
SuperDocument.WIKI_SPACE_SEPARATOR, docFullName}));
+ new Object[] {sourceWiki,
XObjectDocument.WIKI_SPACE_SEPARATOR, docFullName}));
}
// Replace documents contents to link
@@ -362,7 +362,7 @@
XWikiDocument targetDoc = xwiki.getDocument(docFullName,
context);
targetDoc.setContent(MessageFormat.format("#includeTopic(\"{0}{1}{2}\")",
- new Object[] {sourceWiki,
SuperDocument.WIKI_SPACE_SEPARATOR, docFullName}));
+ new Object[] {sourceWiki,
XObjectDocument.WIKI_SPACE_SEPARATOR, docFullName}));
}
} finally {
context.setDatabase(database);
@@ -607,7 +607,7 @@
XWiki xwiki = context.getWiki();
- SuperClass wikiClass = XWikiServerClass.getInstance(context);
+ XClassManager wikiClass = XWikiServerClass.getInstance(context);
XWikiServer wikiSuperDocToSave;
@@ -630,7 +630,7 @@
}
}
- wikiSuperDocToSave = (XWikiServer)
wikiClass.newSuperDocument(docToSave, 0, context);
+ wikiSuperDocToSave = (XWikiServer)
wikiClass.newXObjectDocument(docToSave, 0, context);
// clear entry in virtual wiki cache
if
(!wikiSuperDocToSave.getServer().equals(userWikiSuperDoc.getServer())) {
@@ -812,7 +812,7 @@
*/
public List getWikiAliasList(XWikiContext context) throws XWikiException
{
- return
XWikiServerClass.getInstance(context).searchSuperDocuments(context);
+ return
XWikiServerClass.getInstance(context).searchXObjectDocuments(context);
}
/**
@@ -882,7 +882,7 @@
*/
public List getWikiTemplateAliasList(XWikiContext context) throws
XWikiException
{
- return
XWikiServerClass.getInstance(context).searchSuperDocumentsByField(
+ return
XWikiServerClass.getInstance(context).searchXObjectDocumentsByField(
XWikiServerClass.FIELD_VISIBILITY,
XWikiServerClass.FIELDL_VISIBILITY_TEMPLATE,
"StringProperty", context);
}
@@ -893,19 +893,19 @@
* A template wiki is a wiki which the XWiki.XWikiServerClass "visibility"
field is set to
* "template".
*
- * @param wikiSuperDocument a wiki descriptor document from which the new
template wiki
+ * @param wikiXObjectDocument a wiki descriptor document from which the
new template wiki
* descriptor document will be created.
* @param packageName the name of the attached XAR file to import in the
new template wiki.
* @param comment the comment to use when saving descriptor document.
* @param context the XWiki context.
* @throws XWikiException error when creating new wiki from XAR package.
*/
- public void createWikiTemplate(XWikiServer wikiSuperDocument, String
packageName,
+ public void createWikiTemplate(XWikiServer wikiXObjectDocument, String
packageName,
String comment, XWikiContext context) throws XWikiException
{
-
wikiSuperDocument.setVisibility(XWikiServerClass.FIELDL_VISIBILITY_TEMPLATE);
+
wikiXObjectDocument.setVisibility(XWikiServerClass.FIELDL_VISIBILITY_TEMPLATE);
// Create empty wiki
- createNewWikiFromPackage(wikiSuperDocument, packageName, false,
comment, context);
+ createNewWikiFromPackage(wikiXObjectDocument, packageName, false,
comment, context);
}
}
Modified:
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManagerPluginApi.java
===================================================================
---
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManagerPluginApi.java
2008-01-11 12:40:47 UTC (rev 6771)
+++
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManagerPluginApi.java
2008-01-11 12:40:51 UTC (rev 6772)
@@ -116,7 +116,7 @@
* @param wikiname the name of the new wiki.
* @param templateWiki the name of the wiki from where to copy document to
the new wiki.
* @param pkgName the name of the attached XAR file to import in the new
wiki.
- * @param wikiSuperDocument a wiki descriptor document from which the new
wiki descriptor
+ * @param wikiXObjectDocument a wiki descriptor document from which the
new wiki descriptor
* document will be created.
* @param failOnExist if true throw exception when wiki already exist. If
false overwrite
* existing wiki.
@@ -145,7 +145,7 @@
* @throws XWikiException critical error in xwiki engine.
*/
public int createNewWiki(String wikiname, String templateWiki, String
pkgName,
- XWikiServer wikiSuperDocument, boolean failOnExist) throws
XWikiException
+ XWikiServer wikiXObjectDocument, boolean failOnExist) throws
XWikiException
{
if (!hasAdminRights()) {
return XWikiException.ERROR_XWIKI_ACCESS_DENIED;
@@ -153,7 +153,7 @@
int returncode = XWikiExceptionApi.ERROR_NOERROR;
- wikiSuperDocument.setWikiName(wikiname);
+ wikiXObjectDocument.setWikiName(wikiname);
String realTemplateWikiName =
templateWiki == null || templateWiki.trim().length() == 0 ? null :
templateWiki;
@@ -171,10 +171,10 @@
comment = WikiManagerMessageTool.COMMENT_CREATEEMPTYWIKI;
}
- WikiManager.getInstance().createNewWiki(wikiSuperDocument,
failOnExist,
+ WikiManager.getInstance().createNewWiki(wikiXObjectDocument,
failOnExist,
realTemplateWikiName, realPkgName, comment, this.context);
} catch (WikiManagerException e) {
- LOG.error(messageTool.get(WikiManagerMessageTool.LOG_WIKICREATION,
wikiSuperDocument
+ LOG.error(messageTool.get(WikiManagerMessageTool.LOG_WIKICREATION,
wikiXObjectDocument
.toString()), e);
this.context.put(CONTEXT_LASTERRORCODE, new Integer(e.getCode()));
@@ -394,7 +394,7 @@
*/
public XWikiServer createWikiDocument() throws XWikiException
{
- return (XWikiServer)
XWikiServerClass.getInstance(context).newSuperDocument(context);
+ return (XWikiServer)
XWikiServerClass.getInstance(context).newXObjectDocument(context);
}
/**
@@ -526,24 +526,24 @@
int returncode = XWikiExceptionApi.ERROR_NOERROR;
- XWikiServer wikiSuperDocument =
- (XWikiServer)
XWikiServerClass.getInstance(context).newSuperDocument(context);
- wikiSuperDocument.setWikiName(templateName);
- wikiSuperDocument.setDescription(templateDescription);
+ XWikiServer wikiXObjectDocument =
+ (XWikiServer)
XWikiServerClass.getInstance(context).newXObjectDocument(context);
+ wikiXObjectDocument.setWikiName(templateName);
+ wikiXObjectDocument.setDescription(templateDescription);
- wikiSuperDocument.setServer(templateName + ".template.local");
+ wikiXObjectDocument.setServer(templateName + ".template.local");
- wikiSuperDocument.setState(XWikiServerClass.FIELDL_STATE_ACTIVE);
- wikiSuperDocument.setOwner(this.context.getUser());
+ wikiXObjectDocument.setState(XWikiServerClass.FIELDL_STATE_ACTIVE);
+ wikiXObjectDocument.setOwner(this.context.getUser());
try {
WikiManager.getInstance().createWikiTemplate(
- wikiSuperDocument,
+ wikiXObjectDocument,
packageName,
this.messageTool.get(WikiManagerMessageTool.COMMENT_CREATEWIKITEMPLATE,
new String[] {templateName, packageName}), this.context);
} catch (WikiManagerException e) {
- LOG.error(messageTool.get(WikiManagerMessageTool.LOG_WIKICREATION,
wikiSuperDocument
+ LOG.error(messageTool.get(WikiManagerMessageTool.LOG_WIKICREATION,
wikiXObjectDocument
.toString()), e);
this.context.put(CONTEXT_LASTERRORCODE, new Integer(e.getCode()));
Modified:
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/Wiki.java
===================================================================
---
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/Wiki.java
2008-01-11 12:40:47 UTC (rev 6771)
+++
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/Wiki.java
2008-01-11 12:40:51 UTC (rev 6772)
@@ -44,7 +44,7 @@
*/
public Collection getWikiAliasList() throws XWikiException
{
- return XWikiServerClass.getInstance(context).newSuperDocumentList(doc,
context);
+ return
XWikiServerClass.getInstance(context).newXObjectDocumentList(doc, context);
}
/**
@@ -84,7 +84,7 @@
*/
public XWikiServer getWikiAlias(int id) throws XWikiException
{
- return (XWikiServer)
XWikiServerClass.getInstance(context).newSuperDocument(doc, id,
+ return (XWikiServer)
XWikiServerClass.getInstance(context).newXObjectDocument(doc, id,
context);
}
}
Modified:
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/XWikiServer.java
===================================================================
---
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/XWikiServer.java
2008-01-11 12:40:47 UTC (rev 6771)
+++
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/XWikiServer.java
2008-01-11 12:40:51 UTC (rev 6772)
@@ -24,7 +24,7 @@
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
-import
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.DefaultSuperDocument;
+import
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.DefaultXObjectDocument;
import com.xpn.xwiki.doc.XWikiDocument;
/**
@@ -33,7 +33,7 @@
*
* @version $Id: $
*/
-public class XWikiServer extends DefaultSuperDocument
+public class XWikiServer extends DefaultXObjectDocument
{
/**
* Comma string.
@@ -51,8 +51,6 @@
* <li>getting XWikiServerClass instance.</li>
* <li>or when calling [EMAIL PROTECTED]
#reload(XWikiContext)}</li>
* </ul>
- * @see
DefaultSuperDocument#DefaultSuperDocument(com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.SuperClass,
- * XWikiDocument, int, XWikiContext)
*/
public XWikiServer(XWikiDocument xdoc, int objectId, XWikiContext context)
throws XWikiException
Modified:
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/XWikiServerClass.java
===================================================================
---
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/XWikiServerClass.java
2008-01-11 12:40:47 UTC (rev 6771)
+++
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/XWikiServerClass.java
2008-01-11 12:40:51 UTC (rev 6772)
@@ -23,21 +23,20 @@
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
import com.xpn.xwiki.doc.XWikiDocument;
-import
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.AbstractSuperClass;
-import
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.SuperDocument;
-import
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.SuperDocumentDoesNotExistException;
+import
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.AbstractXClassManager;
+import
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.XObjectDocument;
+import
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.XObjectDocumentDoesNotExistException;
import com.xpn.xwiki.objects.classes.BaseClass;
import com.xpn.xwiki.plugin.wikimanager.WikiManagerException;
/**
- * [EMAIL PROTECTED]
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.SuperClass}
+ * [EMAIL PROTECTED]
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.XClassManager}
* implementation for XWiki.XWikiServerClass class.
*
* @version $Id: $
- * @see
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.SuperClass
- * @see AbstractSuperClass
+ * @see
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.XClassManager
*/
-public class XWikiServerClass extends AbstractSuperClass
+public class XWikiServerClass extends AbstractXClassManager
{
/**
* Default list separators of XWiki.XWikiServerClass fields.
@@ -248,7 +247,7 @@
/**
* [EMAIL PROTECTED]
*
- * @see
com.xpn.xwiki.util.AbstractSuperClass#updateBaseClass(com.xpn.xwiki.objects.classes.BaseClass)
+ * @see
com.xpn.xwiki.util.AbstractXClassManager#updateBaseClass(com.xpn.xwiki.objects.classes.BaseClass)
*/
protected boolean updateBaseClass(BaseClass baseClass)
{
@@ -274,7 +273,7 @@
/**
* [EMAIL PROTECTED]
*
- * @see
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.AbstractSuperClass#updateClassTemplateDocument(com.xpn.xwiki.doc.XWikiDocument)
+ * @see
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.AbstractXClassManager#updateClassTemplateDocument(com.xpn.xwiki.doc.XWikiDocument)
*/
protected boolean updateClassTemplateDocument(XWikiDocument doc)
{
@@ -303,8 +302,8 @@
XWikiContext context) throws XWikiException
{
try {
- return (XWikiServer) getSuperDocument(wikiName, objectId,
validate, context);
- } catch (SuperDocumentDoesNotExistException e) {
+ return (XWikiServer) getXObjectDocument(wikiName, objectId,
validate, context);
+ } catch (XObjectDocumentDoesNotExistException e) {
throw new
WikiManagerException(WikiManagerException.ERROR_WM_WIKIDOESNOTEXISTS,
wikiName + " wiki descriptor document does not exist",
e);
@@ -338,12 +337,12 @@
/**
* [EMAIL PROTECTED]
* <p>
- * Override abstract method using XWikiApplication as [EMAIL PROTECTED]
SuperDocument}.
+ * Override abstract method using XWikiApplication as [EMAIL PROTECTED]
XObjectDocument}.
*
- * @see
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.AbstractSuperClass#newSuperDocument(com.xpn.xwiki.doc.XWikiDocument,
+ * @see
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.AbstractXClassManager#newXObjectDocument(com.xpn.xwiki.doc.XWikiDocument,
* int, com.xpn.xwiki.XWikiContext)
*/
- public SuperDocument newSuperDocument(XWikiDocument doc, int objId,
XWikiContext context)
+ public XObjectDocument newXObjectDocument(XWikiDocument doc, int objId,
XWikiContext context)
throws XWikiException
{
return new XWikiServer(doc, objId, context);
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
