Author: sletellier Date: 2011-07-01 16:36:16 +0200 (Fri, 01 Jul 2011) New Revision: 1033 Url: http://nuiton.org/repositories/revision/wikitty/1033 Log: - Fix and reformat code Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java 2011-07-01 14:32:57 UTC (rev 1032) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java 2011-07-01 14:36:16 UTC (rev 1033) @@ -1,15 +1,18 @@ package org.nuiton.wikitty.struts; +import static org.apache.commons.lang.StringUtils.EMPTY; + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; + +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.FieldType.TYPE; @@ -19,110 +22,86 @@ public abstract class AbstractWikittyEditAction extends ActionSupport { - /** - * - */ private static final long serialVersionUID = 1959245739866183821L; /** to use log facility, just put in your code: log.info(\"...\"); */ final static private Log log = LogFactory.getLog(AbstractWikittyEditAction.class); - - protected String id; - protected String redirect; - protected String delete; - protected String store; - - protected Map<String, Object> wikittyFieldMap = new HashMap<String, Object>(); - - /* - rajouter les attributs par défaut id tout ça - et ensuite on rajoute les méthodes de parsage des arguments - et qui les rajoute dans les wikitty field tout ça. - sauf les file parce que les files compliqué. - - */ + public static final String PREFIX_WIKITTY = "Wikitty"; + + /** + * rajouter les attributs par défaut id tout ça + * et ensuite on rajoute les méthodes de parsage des arguments + * et qui les rajoute dans les wikitty field tout ça. + * sauf les file parce que les files compliqué. + */ @Override public String execute() throws Exception { // restore basic element to know what to do - id = getArgument("id", ""); - redirect = getArgument("redirect", ""); + String id = getArgument("id", EMPTY); + String redirect = getArgument("redirect", EMPTY); - delete = getArgument("delete", ""); - store = getArgument("store", ""); - - + String delete = getArgument("delete", EMPTY); + String store = getArgument("store", EMPTY); + WikittyProxy proxy = getProxy(); - if (delete != "" ){ + if (!StringUtils.isEmpty(delete)) { proxy.delete(id); - } else if (store != ""){ + } else if (!StringUtils.isEmpty(store)) { Map<String, Object> param = ActionContext.getContext().getParameters(); - this.formatArgs(param); - + Map<String, Object> wikittyFieldMap = formatArgs(param); + Wikitty wikitty = proxy.restore(id); - if (wikitty != null){ - - for (Entry<String, Object> entry : wikittyFieldMap.entrySet()){ - //wikitty.setFqField(entry.getKey(), entry.getValue()); - - FieldType ftype = wikitty.getFieldType(entry.getKey()); - - Object value = entry.getValue(); - - // Patch to handle string collection - if (ftype.isCollection() - && ftype.getType() == TYPE.STRING - && value != null) { + if (wikitty != null) { - String valueString = value.toString(); + for (Entry<String, Object> entry : wikittyFieldMap.entrySet()){ + //wikitty.setFqField(entry.getKey(), entry.getValue()); - valueString = new String(valueString.substring( - 1, valueString.length() - 1)); + FieldType ftype = wikitty.getFieldType(entry.getKey()); - Collection<String> list = new ArrayList<String>(); + Object value = entry.getValue(); - String[] valuesString = StringUtil.split( - valueString, ","); + // Patch to handle string collection + if (ftype.isCollection() + && ftype.getType() == TYPE.STRING + && value != null) { - for (String element : valuesString) { - list.add(element.trim()); - } + String valueString = value.toString(); - value = list; + valueString = new String(valueString.substring( + 1, valueString.length() - 1)); + + Collection<String> list = new ArrayList<String>(); + + String[] valuesString = StringUtil.split( + valueString, ","); + + for (String element : valuesString) { + list.add(element.trim()); + } + + value = list; + } + wikitty.setFqField(entry.getKey(), value); } - - - wikitty.setFqField(entry.getKey(), value); - - - } - - } - - proxy.store(wikitty); } - - - return SUCCESS; } - public abstract WikittyProxy getProxy(); - protected Map<String, Object> formatArgs(Map<String, Object> args) { - wikittyFieldMap = new HashMap<String, Object>(); + Map<String, Object> wikittyFieldMap = new HashMap<String, Object>(); for (Entry<String, Object> en : args.entrySet()) { - if (en.getKey().startsWith("Wikitty")) { + if (en.getKey().startsWith(PREFIX_WIKITTY)) { - String value = ""; + String value = EMPTY; if (en.getValue() instanceof String[]) { for (String occu : (String[]) en.getValue()) { @@ -141,7 +120,7 @@ public String getArgument(String key, String defaultValue) { Object temp = ActionContext.getContext().getParameters().get(key); // same method used inside wikitty publication base action - String result = ""; + String result = EMPTY; // TODO mfortun-2011-06-29 fix this with something clean if (temp == null) { result = defaultValue; @@ -151,13 +130,9 @@ result += t; } } else { - result = temp.toString(); - + result = temp.toString(); } - } return result; } - - }