You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/01/30 17:44:55 UTC
svn commit: r501458 - in
/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase:
AbstractUsecase.java DocumentUsecase.java Usecase.java
Author: andreas
Date: Tue Jan 30 08:44:54 2007
New Revision: 501458
URL: http://svn.apache.org/viewvc?view=rev&rev=501458
Log:
Added method Usecase.getParameter(String, Object), updated DocumentUsecase.getTargetDocument(boolean) to match javadoc comment
Modified:
lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java
lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/DocumentUsecase.java
lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/Usecase.java
Modified: lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java?view=diff&rev=501458&r1=501457&r2=501458
==============================================================================
--- lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java (original)
+++ lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java Tue Jan 30 08:44:54 2007
@@ -356,6 +356,17 @@
}
/**
+ * @see org.apache.lenya.cms.usecase.Usecase#getParameter(java.lang.String, java.lang.Object)
+ */
+ public Object getParameter(String name, Object defaultValue) {
+ Object value = getParameter(name);
+ if (value == null) {
+ value = defaultValue;
+ }
+ return value;
+ }
+
+ /**
* @see org.apache.lenya.cms.usecase.Usecase#getParameterAsString(java.lang.String)
*/
public String getParameterAsString(String name) {
Modified: lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/DocumentUsecase.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/DocumentUsecase.java?view=diff&rev=501458&r1=501457&r2=501458
==============================================================================
--- lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/DocumentUsecase.java (original)
+++ lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/DocumentUsecase.java Tue Jan 30 08:44:54 2007
@@ -82,7 +82,8 @@
}
/**
- * Sets the target document.
+ * Sets the target document for the case that the usecase execution
+ * succeeded (see {@link #getTargetDocument(boolean)}).
* @param document A document.
*/
protected void setTargetDocument(Document document) {
@@ -97,11 +98,11 @@
* @return A document.
*/
protected Document getTargetDocument(boolean success) {
- Document document = (Document) getParameter(TARGET_DOCUMENT);
- if (document == null) {
- document = getSourceDocument();
+ if (success) {
+ return (Document) getParameter(TARGET_DOCUMENT, getSourceDocument());
+ } else {
+ return getSourceDocument();
}
- return document;
}
/**
Modified: lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/Usecase.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/Usecase.java?view=diff&rev=501458&r1=501457&r2=501458
==============================================================================
--- lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/Usecase.java (original)
+++ lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/Usecase.java Tue Jan 30 08:44:54 2007
@@ -54,6 +54,14 @@
Object getParameter(String name);
/**
+ * Returns the current value of a parameter.
+ * @param name The parameter name.
+ * @param defaultValue The default value to return if the parameter is not set.
+ * @return An object.
+ */
+ Object getParameter(String name, Object defaultValue);
+
+ /**
* Returns the current value of a parameter as a string.
* @param name The parameter name.
* @return A string or <code>null</code> if the parameter was not set.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org