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 2004/12/22 17:37:51 UTC
svn commit: r123120 - lenya/trunk/src/java/org/apache/lenya/cms/usecase
Author: andreas
Date: Wed Dec 22 08:37:50 2004
New Revision: 123120
URL: http://svn.apache.org/viewcvs?view=rev&rev=123120
Log:
fixed some code style issues, parameters as objects allowed
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java
lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java
lenya/trunk/src/java/org/apache/lenya/cms/usecase/UnitOfWorkImpl.java
lenya/trunk/src/java/org/apache/lenya/cms/usecase/Usecase.java
lenya/trunk/src/java/org/apache/lenya/cms/usecase/UsecaseResolverImpl.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java?view=diff&rev=123120&p1=lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java&r1=123119&p2=lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java&r2=123120
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java Wed Dec 22 08:37:50 2004
@@ -85,7 +85,7 @@
* @return A string.
*/
protected String getSourceURL() {
- return sourceUrl;
+ return this.sourceUrl;
}
/**
@@ -94,7 +94,7 @@
* @return A boolean value.
*/
public List getErrorMessages() {
- return Collections.unmodifiableList(errorMessages);
+ return Collections.unmodifiableList(this.errorMessages);
}
/**
@@ -102,7 +102,7 @@
* @return An array of strings. Info messages do not prevent the operation from being executed.
*/
public List getInfoMessages() {
- return Collections.unmodifiableList(infoMessages);
+ return Collections.unmodifiableList(this.infoMessages);
}
private List errorMessages = new ArrayList();
@@ -113,7 +113,7 @@
* @param message The message.
*/
public void addErrorMessage(String message) {
- errorMessages.add(message);
+ this.errorMessages.add(message);
}
/**
@@ -131,7 +131,7 @@
* @param message The message.
*/
public void addInfoMessage(String message) {
- infoMessages.add(message);
+ this.infoMessages.add(message);
}
/**
@@ -188,14 +188,14 @@
* Clears the error messages.
*/
protected void clearErrorMessages() {
- errorMessages.clear();
+ this.errorMessages.clear();
}
/**
* Clears the info messages.
*/
protected void clearInfoMessages() {
- infoMessages.clear();
+ this.infoMessages.clear();
}
/**
@@ -264,9 +264,9 @@
private Map parameters = new HashMap();
/**
- * @see org.apache.lenya.cms.usecase.Usecase#setParameter(java.lang.String, java.lang.String)
+ * @see org.apache.lenya.cms.usecase.Usecase#setParameter(java.lang.String, java.lang.Object)
*/
- public void setParameter(String name, String value) {
+ public void setParameter(String name, Object value) {
if (getLogger().isDebugEnabled()) {
getLogger().debug("Setting parameter [" + name + "] = [" + value + "]");
}
@@ -276,11 +276,22 @@
/**
* @see org.apache.lenya.cms.usecase.Usecase#getParameter(java.lang.String)
*/
- public String getParameter(String name) {
- return (String) parameters.get(name);
+ public Object getParameter(String name) {
+ return this.parameters.get(name);
}
/**
+ * @see org.apache.lenya.cms.usecase.Usecase#getParameterAsString(java.lang.String)
+ */
+ public String getParameterAsString(String name) {
+ String valueString = null;
+ Object value = getParameter(name);
+ if (value != null) {
+ valueString = value.toString();
+ }
+ return valueString;
+ }
+ /**
* Returns one of the strings "true" or "false" depending on whether the corresponding checkbox
* was checked.
* @param name The parameter name.
@@ -356,5 +367,19 @@
String webappUri = ServletHelper.getWebappURI(request);
setup(webappUri, situation);
+ }
+
+ /**
+ * @see org.apache.lenya.cms.usecase.Usecase#advance()
+ */
+ public void advance() {
+ }
+
+ /**
+ * Deletes a parameter.
+ * @param name The parameter name.
+ */
+ protected void deleteParameter(String name) {
+ this.parameters.remove(name);
}
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java?view=diff&rev=123120&p1=lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java&r1=123119&p2=lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java&r2=123120
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java Wed Dec 22 08:37:50 2004
@@ -46,7 +46,7 @@
* @return A document.
*/
protected Document getSourceDocument() {
- return sourceDocument;
+ return this.sourceDocument;
}
private Document targetDocument = null;
Modified: lenya/trunk/src/java/org/apache/lenya/cms/usecase/UnitOfWorkImpl.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/usecase/UnitOfWorkImpl.java?view=diff&rev=123120&p1=lenya/trunk/src/java/org/apache/lenya/cms/usecase/UnitOfWorkImpl.java&r1=123119&p2=lenya/trunk/src/java/org/apache/lenya/cms/usecase/UnitOfWorkImpl.java&r2=123120
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/usecase/UnitOfWorkImpl.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/usecase/UnitOfWorkImpl.java Wed Dec 22 08:37:50 2004
@@ -64,7 +64,7 @@
this.identityMap = new DocumentIdentityMap(publication);
}
- return identityMap;
+ return this.identityMap;
}
/**
Modified: lenya/trunk/src/java/org/apache/lenya/cms/usecase/Usecase.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/usecase/Usecase.java?view=diff&rev=123120&p1=lenya/trunk/src/java/org/apache/lenya/cms/usecase/Usecase.java&r1=123119&p2=lenya/trunk/src/java/org/apache/lenya/cms/usecase/Usecase.java&r2=123120
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/usecase/Usecase.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/usecase/Usecase.java Wed Dec 22 08:37:50 2004
@@ -38,14 +38,21 @@
* @param name The parameter name.
* @param value The parameter value.
*/
- void setParameter(String name, String value);
+ void setParameter(String name, Object value);
/**
* Returns the current value of a parameter.
* @param name The parameter name.
- * @return A string.
+ * @return An object.
*/
- String getParameter(String name);
+ Object getParameter(String name);
+
+ /**
+ * 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.
+ */
+ String getParameterAsString(String name);
/**
* Sets a parameter from the form. This method is called for parts in multipart requests.
@@ -53,6 +60,12 @@
* @param value The parameter value.
*/
void setPart(String name, Part value);
+
+ /**
+ * Advances the usecase to the next step. This method is called when all
+ * parameters are set.
+ */
+ void advance();
/**
* Passes the source URL and the workflow situation to the usecase.
Modified: lenya/trunk/src/java/org/apache/lenya/cms/usecase/UsecaseResolverImpl.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/usecase/UsecaseResolverImpl.java?view=diff&rev=123120&p1=lenya/trunk/src/java/org/apache/lenya/cms/usecase/UsecaseResolverImpl.java&r1=123119&p2=lenya/trunk/src/java/org/apache/lenya/cms/usecase/UsecaseResolverImpl.java&r2=123120
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/usecase/UsecaseResolverImpl.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/usecase/UsecaseResolverImpl.java Wed Dec 22 08:37:50 2004
@@ -73,7 +73,7 @@
*/
public void dispose() {
if (this.selector != null) {
- this.manager.release(selector);
+ this.manager.release(this.selector);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org