Author: sdumitriu
Date: 2008-01-03 15:18:36 +0100 (Thu, 03 Jan 2008)
New Revision: 6614
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/AdminAction.java
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/AttachAction.java
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/CancelAction.java
Log:
[cleanup] Apply codestyle
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/AdminAction.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/AdminAction.java
2008-01-03 14:11:30 UTC (rev 6613)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/AdminAction.java
2008-01-03 14:18:36 UTC (rev 6614)
@@ -21,19 +21,21 @@
package com.xpn.xwiki.web;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.velocity.VelocityContext;
+
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
-import com.xpn.xwiki.api.Document;
import com.xpn.xwiki.doc.XWikiDocument;
import com.xpn.xwiki.doc.XWikiLock;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.velocity.VelocityContext;
-public class AdminAction extends XWikiAction {
+public class AdminAction extends XWikiAction
+{
private static final Log log = LogFactory.getLog(AdminAction.class);
- public String render(XWikiContext context) throws XWikiException {
+ public String render(XWikiContext context) throws XWikiException
+ {
XWikiRequest request = context.getRequest();
String content = request.getParameter("content");
XWikiDocument doc = context.getDoc();
@@ -44,29 +46,37 @@
XWikiDocument tdoc = (XWikiDocument) context.get("tdoc");
EditForm peform = (EditForm) form;
String parent = peform.getParent();
- if (parent!=null)
+ if (parent != null) {
doc.setParent(parent);
+ }
String creator = peform.getCreator();
- if (creator!=null)
+ if (creator != null) {
doc.setCreator(creator);
+ }
String defaultTemplate = peform.getDefaultTemplate();
- if (defaultTemplate!=null)
+ if (defaultTemplate != null) {
doc.setDefaultTemplate(defaultTemplate);
+ }
String defaultLanguage = peform.getDefaultLanguage();
- if ((defaultLanguage!=null)&&!defaultLanguage.equals(""))
+ if ((defaultLanguage != null) && !defaultLanguage.equals("")) {
doc.setDefaultLanguage(defaultLanguage);
- if (doc.getDefaultLanguage().equals(""))
+ }
+ if (doc.getDefaultLanguage().equals("")) {
doc.setDefaultLanguage(context.getWiki().getLanguagePreference(context));
+ }
String language = context.getWiki().getLanguagePreference(context);
String languagefromrequest =
context.getRequest().getParameter("language");
- String languagetoedit =
((languagefromrequest==null)||(languagefromrequest.equals(""))) ?
- language : languagefromrequest;
+ String languagetoedit =
+ ((languagefromrequest == null) ||
(languagefromrequest.equals(""))) ? language
+ : languagefromrequest;
- if ((languagetoedit==null)||(languagetoedit.equals("default")))
+ if ((languagetoedit == null) ||
(languagetoedit.equals("default"))) {
languagetoedit = "";
- if (doc.isNew()||(doc.getDefaultLanguage().equals(languagetoedit)))
+ }
+ if (doc.isNew() ||
(doc.getDefaultLanguage().equals(languagetoedit))) {
languagetoedit = "";
+ }
if (languagetoedit.equals("")) {
// In this case the created document is going to be the
default document
@@ -80,7 +90,7 @@
} else {
// If the translated doc object is the same as the doc object
// this means the translated doc did not exists so we need to
create it
- if ((tdoc==doc)) {
+ if ((tdoc == doc)) {
tdoc = new XWikiDocument(doc.getSpace(), doc.getName());
tdoc.setLanguage(languagetoedit);
tdoc.setContent(doc.getContent());
@@ -92,14 +102,14 @@
}
XWikiDocument tdoc2 = (XWikiDocument) tdoc.clone();
- if (content != null && !content.equals(""))
+ if (content != null && !content.equals("")) {
tdoc2.setContent(content);
+ }
context.put("tdoc", tdoc2);
vcontext.put("tdoc", tdoc2.newDocument(context));
- try{
- tdoc2.readFromTemplate(peform, context);
- }
- catch (XWikiException e) {
+ try {
+ tdoc2.readFromTemplate(peform, context);
+ } catch (XWikiException e) {
if (e.getCode() ==
XWikiException.ERROR_XWIKI_APP_DOCUMENT_NOT_EMPTY) {
context.put("exception", e);
return "docalreadyexists";
@@ -109,8 +119,10 @@
/* Setup a lock */
try {
XWikiLock lock = tdoc.getLock(context);
- if ((lock == null) ||
(lock.getUserName().equals(context.getUser())) || (peform.isLockForce()))
- tdoc.setLock(context.getUser(),context);
+ if ((lock == null) ||
(lock.getUserName().equals(context.getUser()))
+ || (peform.isLockForce())) {
+ tdoc.setLock(context.getUser(), context);
+ }
} catch (Exception e) {
e.printStackTrace();
// Lock should never make XWiki fail
@@ -120,5 +132,5 @@
}
return "admin";
- }
+ }
}
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/AttachAction.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/AttachAction.java
2008-01-03 14:11:30 UTC (rev 6613)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/AttachAction.java
2008-01-03 14:18:36 UTC (rev 6614)
@@ -23,8 +23,10 @@
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
-public class AttachAction extends XWikiAction {
- public String render(XWikiContext context) throws XWikiException {
+public class AttachAction extends XWikiAction
+{
+ public String render(XWikiContext context) throws XWikiException
+ {
return "attach";
- }
+ }
}
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/CancelAction.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/CancelAction.java
2008-01-03 14:11:30 UTC (rev 6613)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/CancelAction.java
2008-01-03 14:18:36 UTC (rev 6614)
@@ -25,47 +25,51 @@
import com.xpn.xwiki.doc.XWikiDocument;
import com.xpn.xwiki.doc.XWikiLock;
-public class CancelAction extends XWikiAction {
- public boolean action(XWikiContext context) throws XWikiException {
- XWikiRequest request = context.getRequest();
- XWikiResponse response = context.getResponse();
- XWikiDocument doc = context.getDoc();
- XWikiForm form = context.getForm();
+public class CancelAction extends XWikiAction
+{
+ public boolean action(XWikiContext context) throws XWikiException
+ {
+ XWikiRequest request = context.getRequest();
+ XWikiResponse response = context.getResponse();
+ XWikiDocument doc = context.getDoc();
+ XWikiForm form = context.getForm();
- String language = ((EditForm) form).getLanguage();
- // FIXME Which one should be used: doc.getDefaultLanguage or
- // form.getDefaultLanguage()?
- // String defaultLanguage =
((EditForm)form).getDefaultLanguage();
- XWikiDocument tdoc;
+ String language = ((EditForm) form).getLanguage();
+ // FIXME Which one should be used: doc.getDefaultLanguage or
+ // form.getDefaultLanguage()?
+ // String defaultLanguage = ((EditForm)form).getDefaultLanguage();
+ XWikiDocument tdoc;
- // FIXME Is all this really needed?
- if ((language == null) || (language.equals("")) ||
(language.equals("default")) || (language.equals(doc.getDefaultLanguage()))) {
- tdoc = doc;
- } else {
- tdoc = doc.getTranslatedDocument(language, context);
- if (tdoc == doc) {
- tdoc = new XWikiDocument(doc.getSpace(),
doc.getName());
- tdoc.setLanguage(language);
- tdoc.setStore(doc.getStore());
- }
- tdoc.setTranslation(1);
- }
+ // FIXME Is all this really needed?
+ if ((language == null) || (language.equals("")) ||
(language.equals("default"))
+ || (language.equals(doc.getDefaultLanguage()))) {
+ tdoc = doc;
+ } else {
+ tdoc = doc.getTranslatedDocument(language, context);
+ if (tdoc == doc) {
+ tdoc = new XWikiDocument(doc.getSpace(), doc.getName());
+ tdoc.setLanguage(language);
+ tdoc.setStore(doc.getStore());
+ }
+ tdoc.setTranslation(1);
+ }
- String username = context.getUser();
- XWikiLock lock = tdoc.getLock(context);
- if (lock != null && lock.getUserName().equals(username)) {
- if ("inline".equals(request.get("action")))
- doc.removeLock(context);
- else
- tdoc.removeLock(context);
- }
+ String username = context.getUser();
+ XWikiLock lock = tdoc.getLock(context);
+ if (lock != null && lock.getUserName().equals(username)) {
+ if ("inline".equals(request.get("action"))) {
+ doc.removeLock(context);
+ } else {
+ tdoc.removeLock(context);
+ }
+ }
- // forward to view
- String ajax = request.getParameter("ajax");
- if (ajax == null || !ajax.equals("1")) {
- String redirect = Utils.getRedirect("view", context);
- sendRedirect(response, redirect);
- }
- return false;
- }
+ // forward to view
+ String ajax = request.getParameter("ajax");
+ if (ajax == null || !ajax.equals("1")) {
+ String redirect = Utils.getRedirect("view", context);
+ sendRedirect(response, redirect);
+ }
+ return false;
+ }
}
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
