Author: mfortun Date: 2011-07-21 12:43:56 +0200 (Thu, 21 Jul 2011) New Revision: 1083 Url: http://nuiton.org/repositories/revision/wikitty/1083 Log: * remove unused method * add method to have access to argument map Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java 2011-07-21 08:38:06 UTC (rev 1082) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java 2011-07-21 10:43:56 UTC (rev 1083) @@ -58,18 +58,9 @@ @Override public String execute() throws Exception { - List<String> argsString = new ArrayList<String>(); - String args = ActionContext.getContext().getParameters().get(ARGS_KEY) - .toString(); - String[] argsTab = StringUtil.split(args, SEPARATOR); + inputStream = new ByteArrayInputStream(doAction(this, + getMandatoryArguments()).toString().getBytes()); - for (String arg : argsTab) { - argsString.add(arg); - } - - inputStream = new ByteArrayInputStream(doAction(this, argsString) - .toString().getBytes()); - return SUCCESS; } @@ -227,13 +218,7 @@ return WikittyPublicationConfig.getConfig(); } - @Override - public String getActionName() { - // TODO mfortun-2011-05-09 really needed ? - throw new UnsupportedOperationException("not yet implemented"); - // return null; - } @Override public String makeUrl(String url) { @@ -261,28 +246,17 @@ @Override public List<String> getMandatoryArguments() { - // TODO mfortun-2011-05-09 really needed ? - throw new UnsupportedOperationException("not yet implemented"); - // return null; + List<String> argsString = new ArrayList<String>(); + String args = ActionContext.getContext().getParameters().get(ARGS_KEY) + .toString(); + String[] argsTab = StringUtil.split(args, SEPARATOR); + for (String arg : argsTab) { + argsString.add(arg); + } + return argsString; } - @Override - public Map<String, String> getArguments() { - // TODO mfortun-2011-05-09 really needed ? - throw new UnsupportedOperationException("not yet implemented"); - // return null; - - } - - @Override - public Map<String, byte[]> getArgumentFiles() { - // TODO mfortun-2011-05-09 really needed ? - throw new UnsupportedOperationException("not yet implemented"); - // return null; - - } - public String getContentType() { return contentType; } @@ -296,4 +270,15 @@ return getWikittyPublicationProxy(); } + @Override + public Map<String, String> getArguments() { + Map<String,String> result = new HashMap<String, String>(); + + for( String argElm : ActionContext.getContext().getParameters().keySet()){ + result.put(argElm, this.getArgument(argElm, "")); + } + + return result; + } + } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.java 2011-07-21 08:38:06 UTC (rev 1082) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.java 2011-07-21 10:43:56 UTC (rev 1083) @@ -37,12 +37,6 @@ public abstract ApplicationConfig getAppConfig(); - /** - * le nom de l'action a faire - * @return - */ - public abstract String getActionName(); - public abstract WikittyProxy getWikittyProxy(); @@ -57,16 +51,14 @@ public abstract List<String> getMandatoryArguments(); - public abstract Map<String, String> getArguments(); - - public abstract Map<String, byte[]> getArgumentFiles(); - public abstract String getArgument(String name, String defaultValue); public abstract String getContentType(); public abstract void setContentType(String contentType); - + public abstract String toString(); + + public abstract Map<String,String> getArguments(); } \ No newline at end of file