You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/12/17 17:06:19 UTC
svn commit: r487996 - in
/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/acting:
CommandAction.java LinkTranslatorMapAction.java
Author: cziegeler
Date: Sun Dec 17 08:06:18 2006
New Revision: 487996
URL: http://svn.apache.org/viewvc?view=rev&rev=487996
Log:
Clean up code
Modified:
cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/acting/CommandAction.java
cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/acting/LinkTranslatorMapAction.java
Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/acting/CommandAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/acting/CommandAction.java?view=diff&rev=487996&r1=487995&r2=487996
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/acting/CommandAction.java (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/acting/CommandAction.java Sun Dec 17 08:06:18 2006
@@ -46,7 +46,7 @@
String command = param.getParameter(PARAM_COMMAND);
Source src = null;
- if ((param != null) && (command != null)) {
+ if ( command != null ) {
try {
src = resolver.resolveURI(command);
File file = SourceUtil.getFile(src);
@@ -61,8 +61,7 @@
} finally {
resolver.release(src);
}
- }
- else {
+ } else {
return null;
}
return EMPTY_MAP;
Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/acting/LinkTranslatorMapAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/acting/LinkTranslatorMapAction.java?view=diff&rev=487996&r1=487995&r2=487996
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/acting/LinkTranslatorMapAction.java (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/acting/LinkTranslatorMapAction.java Sun Dec 17 08:06:18 2006
@@ -19,7 +19,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
@@ -37,7 +36,11 @@
* @since 16 December 2002
* @version $Id$
*/
-public class LinkTranslatorMapAction extends ServiceableAction implements ThreadSafe {
+public class LinkTranslatorMapAction
+ extends AbstractAction
+ implements ThreadSafe {
+
+ final static protected String LINK_MAP_PREFIX = "linkMap:";
/**
* Execute the LinkTranslatorMapAction.
@@ -49,53 +52,54 @@
* @param objectModel Description of the Parameter
* @exception Exception Description of the Exception
*/
- public Map act(Redirector redirector, SourceResolver resolver, Map objectModel, String source, Parameters parameters) throws Exception {
+ public Map act(Redirector redirector,
+ SourceResolver resolver,
+ Map objectModel,
+ String source,
+ Parameters parameters)
+ throws Exception {
Map linkObjectMap = (Map) objectModel.get(Constants.LINK_OBJECT);
- String[] parameterNames = parameters.getNames();
+ final String[] parameterNames = parameters.getNames();
for (int i = 0; i < parameterNames.length; i++) {
String parameterName = parameterNames[i];
- final String LINK_MAP_PREFIX = "linkMap:";
if (parameterName.startsWith(LINK_MAP_PREFIX)) {
- String linkKey = parameterName.substring(LINK_MAP_PREFIX.length());
- String linkValue = parameters.getParameter(parameterName, null);
+ final String linkKey = parameterName.substring(LINK_MAP_PREFIX.length());
+ final String linkValue = parameters.getParameter(parameterName, null);
if (linkValue != null) {
if (linkObjectMap == null) {
linkObjectMap = new HashMap();
objectModel.put(Constants.LINK_OBJECT, linkObjectMap);
}
- getLogger().debug("Add mapping from " +
- String.valueOf(linkKey) + " to " + String.valueOf(linkValue));
+ getLogger().debug("Add mapping from " + linkKey + " to " + linkValue);
linkObjectMap.put(linkKey, linkValue);
}
}
}
- /*
- * expect base = "/.."
- */
- String base = parameters.getParameter("url-base", "");
+ //
+ // expect base = "/.."
+ //
+ final String base = parameters.getParameter("url-base", "");
// get the extension with starting dot
- Request request = ObjectModelHelper.getRequest(objectModel);
- String requestURI = request.getRequestURI();
+ final Request request = ObjectModelHelper.getRequest(objectModel);
+ final String requestURI = request.getRequestURI();
String extension = NetUtils.getExtension(requestURI);
String path = NetUtils.getPath(requestURI);
- getLogger().debug("LinkMapTranslator 1 " + "path " + String.valueOf(path) );
+ getLogger().debug("LinkMapTranslator 1 " + "path " + path);
path = path + base;
- getLogger().debug("LinkMapTranslator 2 " + "path " + String.valueOf(path) );
+ getLogger().debug("LinkMapTranslator 2 " + "path " + path);
path = NetUtils.normalize(path);
getLogger().debug("LinkMapTranslator 3 " +
- "path " + String.valueOf(path) + ", " +
- "base " + String.valueOf(base) + ", " +
- "ext " + String.valueOf(extension));
+ "path " + path + ", " +
+ "base " + base + ", " +
+ "ext " + extension);
if (extension != null) {
- LinkPatternHashMap lphm = new LinkPatternHashMap(path, extension);
- lphm.setParent(linkObjectMap);
- lphm.enableLogging(getLogger());
+ LinkPatternHashMap lphm = new LinkPatternHashMap(path, extension, linkObjectMap, this.getLogger());
objectModel.put(Constants.LINK_OBJECT, lphm);
}
@@ -107,12 +111,12 @@
/**
* A special links map
*/
- public static class LinkPatternHashMap extends HashMap implements LogEnabled {
- Logger logger;
- String pageExtension;
- String path;
+ public static class LinkPatternHashMap extends HashMap {
- Map parent;
+ protected final Logger logger;
+ protected final String pageExtension;
+ protected final String path;
+ protected final Map parent;
/**
@@ -121,23 +125,16 @@
* @param pageExtension Description of the Parameter
* @param path Description of the Parameter
*/
- public LinkPatternHashMap(String path, String pageExtension) {
+ public LinkPatternHashMap(String path,
+ String pageExtension,
+ Map parentMap,
+ Logger logger) {
this.pageExtension = pageExtension;
this.path = path;
- this.parent = null;
- }
-
-
- /**
- * Sets the parent attribute of the LinkPatternHashMap object
- *
- * @param parent The new parent value
- */
- public void setParent(Map parent) {
- this.parent = parent;
+ this.parent = parentMap;
+ this.logger = logger;
}
-
/**
* assume that LinkTranslator wants to check iff a href link
* is a URI mapped to some URI.
@@ -160,8 +157,8 @@
// to-do: handle parameters!!, like page:index?a=b&c=d
newHref = strippedPageSchema + pageExtension;
- if (logger != null && logger.isDebugEnabled()) {
- logger.debug("href " + String.valueOf(keyString) + " mapped to " + String.valueOf(newHref));
+ if (logger.isDebugEnabled()) {
+ logger.debug("href " + keyString + " mapped to " + newHref);
}
}
@@ -179,7 +176,9 @@
}
// strip path
- logger.debug("newHref " + String.valueOf(newHref) + ", " + " path " + String.valueOf(path));
+ if (logger.isDebugEnabled()) {
+ logger.debug("newHref " + newHref + ", " + " path " + path);
+ }
if (newHref.startsWith(this.path)) {
final int pathLength = path.length();
@@ -188,7 +187,9 @@
newHref = newHref.substring(1);
}
}
- logger.debug("newHref stripped " + String.valueOf(newHref));
+ if (logger.isDebugEnabled()) {
+ logger.debug("newHref stripped " + newHref);
+ }
}
// now nearly finished
@@ -205,20 +206,10 @@
result = parent.get(key);
}
}
- logger.debug("For key " + String.valueOf(key) +
- " result is " + String.valueOf(result));
-
+ if (logger.isDebugEnabled()) {
+ logger.debug("For key " + key + " result is " + result);
+ }
return result;
- }
-
-
- /**
- * Description of the Method
- *
- * @param logger Description of the Parameter
- */
- public void enableLogging(Logger logger) {
- this.logger = logger;
}
}
}