[xwiki-notifications] r5469 - xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager

[SVN]

Author: tmortagne
Date: 2007-10-23 19:07:08 +0200 (Tue, 23 Oct 2007)
New Revision: 5469

Modified:
   
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManagerPluginApi.java
Log:
Reinsert template name and package name conversion to null when equals to empty 
string. It was deleted in 5389 ("Improve code style the Checkstyle xwiki plugin 
way.")

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
    2007-10-23 17:03:55 UTC (rev 5468)
+++ 
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManagerPluginApi.java
    2007-10-23 17:07:08 UTC (rev 5469)
@@ -154,19 +154,24 @@
 
         wikiSuperDocument.setWikiName(wikiname);
 
+        String realTemplateWikiName =
+            templateWiki == null || templateWiki.trim().length() == 0 ? null : 
templateWiki;
+
+        String realPkgName = pkgName == null || pkgName.trim().length() == 0 ? 
null : pkgName;
+
         try {
             String comment;
 
-            if (templateWiki != null) {
+            if (realTemplateWikiName != null) {
                 comment = 
WikiManagerMessageTool.COMMENT_CREATEWIKIFROMTEMPLATE;
-            } else if (pkgName != null) {
+            } else if (realPkgName != null) {
                 comment = WikiManagerMessageTool.COMMENT_CREATEWIKIFROMPACKAGE;
             } else {
                 comment = WikiManagerMessageTool.COMMENT_CREATEEMPTYWIKI;
             }
 
-            WikiManager.getInstance().createNewWiki(wikiSuperDocument, 
failOnExist, templateWiki,
-                pkgName, comment, this.context);
+            WikiManager.getInstance().createNewWiki(wikiSuperDocument, 
failOnExist,
+                realTemplateWikiName, realPkgName, comment, this.context);
         } catch (WikiManagerException e) {
             LOG.error(messageTool.get(WikiManagerMessageTool.LOG_WIKICREATION, 
wikiSuperDocument
                 .toString()), e);

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