Author: vgritsenko
Date: Tue Mar 22 09:48:47 2005
New Revision: 158631
URL: http://svn.apache.org/viewcvs?view=rev&rev=158631
Log:
code cleanup
Modified:
cocoon/blocks/unsupported/scratchpad/trunk/java/org/apache/cocoon/acting/CookieCreatorAction.java
Modified:
cocoon/blocks/unsupported/scratchpad/trunk/java/org/apache/cocoon/acting/CookieCreatorAction.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/scratchpad/trunk/java/org/apache/cocoon/acting/CookieCreatorAction.java?view=diff&r1=158630&r2=158631
==============================================================================
---
cocoon/blocks/unsupported/scratchpad/trunk/java/org/apache/cocoon/acting/CookieCreatorAction.java
(original)
+++
cocoon/blocks/unsupported/scratchpad/trunk/java/org/apache/cocoon/acting/CookieCreatorAction.java
Tue Mar 22 09:48:47 2005
@@ -1,12 +1,12 @@
/*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,7 +15,6 @@
*/
package org.apache.cocoon.acting;
-
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
@@ -26,6 +25,7 @@
import org.apache.cocoon.environment.SourceResolver;
import java.util.Map;
+import java.util.Collections;
/**
* The CookieCreatorAction class create or remove cookies. The action needs
@@ -42,108 +42,69 @@
* you want to remove a cookie set its maxage to -1.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Paolo Scaffardi</a>
- * @version CVS $Id: CookieCreatorAction.java,v 1.3 2004/03/05 10:07:25
bdelacretaz Exp $
+ * @version CVS $Id$
*/
-
-public class CookieCreatorAction extends ServiceableAction implements
ThreadSafe {
+public class CookieCreatorAction extends ServiceableAction
+ implements ThreadSafe {
/**
- * Description of the Method
- *
- * @param redirector Description of Parameter
- * @param resolver Description of Parameter
- * @param objectModel Description of Parameter
- * @param src Description of Parameter
- * @param parameters Description of Parameter
- * @return Description of the Returned Value
- * @exception Exception Description of Exception
+ * Creates a cookie.
+ * @return Empty map on success, null on failure.
*/
public Map act(Redirector redirector,
- SourceResolver resolver,
- Map objectModel,
- String src,
- Parameters parameters)
- throws Exception {
-
- Response res = ObjectModelHelper.getResponse(objectModel);
-
- /*
- * check response validity
- */
- if (res == null) {
+ SourceResolver resolver,
+ Map objectModel,
+ String src,
+ Parameters parameters)
+ throws Exception {
+ final Response response = ObjectModelHelper.getResponse(objectModel);
+ if (response == null) {
if (getLogger().isDebugEnabled()) {
- getLogger().debug("COOKIECREATOR: no response object");
+ getLogger().debug("No response object");
}
return null;
}
- String cookieName = null;
-
- String
- cookieValue = null;
-
- String
- cookieComment = null;
-
- String
- cookieDomain = null;
-
- String
- cookiePath = null;
-
- try {
- cookieName = parameters.getParameter("name");
- } catch (Exception e) {
+ String name = parameters.getParameter("name", null);
+ if (name == null) {
if (getLogger().isDebugEnabled()) {
getLogger().debug("COOKIECREATOR: cannot retrieve cookie name
attribute");
}
return null;
}
-
- cookieValue = parameters.getParameter("value", "");
-
- Cookie cookie = res.createCookie(cookieName, cookieValue);
-
- try {
- if ((cookieComment = parameters.getParameter("comment")) != null) {
- cookie.setComment(cookieComment);
- }
- } catch (ParameterException ignore) {
+ String value = parameters.getParameter("value", "");
+ String comment = parameters.getParameter("comment", null);
+ String domain = parameters.getParameter("domain", null);
+ String path = parameters.getParameter("path", null);
+
+ final Cookie cookie = response.createCookie(name, value);
+ if (comment != null) {
+ cookie.setComment(comment);
}
-
- try {
- if ((cookieDomain = parameters.getParameter("domain")) != null) {
- cookie.setDomain(cookieDomain);
- }
- } catch (ParameterException ignore) {
+ if (domain != null) {
+ cookie.setDomain(domain);
}
-
- try {
- if ((cookiePath = parameters.getParameter("path")) != null) {
- cookie.setPath(cookiePath);
- }
- } catch (ParameterException ignore) {
+ if (path != null) {
+ cookie.setPath(path);
}
-
cookie.setSecure(parameters.getParameterAsBoolean("secure", false));
cookie.setMaxAge(parameters.getParameterAsInteger("maxage", 0));
cookie.setVersion(parameters.getParameterAsInteger("version", 0));
-
- res.addCookie(cookie);
+ response.addCookie(cookie);
if (getLogger().isDebugEnabled()) {
if (cookie.getMaxAge() == 0) {
- getLogger().debug("COOKIECREATOR: '" + cookieName
- + "' cookie has been removed");
+ getLogger().debug("Cookie '" + name + "' has been removed");
} else {
- getLogger().debug("COOKIECREATOR: '" + cookieName
- + "' cookie created with value '"
- + cookieValue + "' (version " + cookie.getVersion()
- + "; it will expire in "
- + cookie.getMaxAge() + " seconds)");
+ getLogger().debug("Cookie '" + name +
+ "' created with value '" +
+ value + "' (version " + cookie.getVersion() +
+ "; it will expire in " +
+ cookie.getMaxAge() + " seconds)");
}
}
- return null;
+
+ return Collections.EMPTY_MAP;
}
}
