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 2006/09/13 10:54:13 UTC
svn commit: r442907 -
/lenya/trunk/src/modules/resource/java/src/org/apache/lenya/cms/site/usecases/CreateResource.java
Author: andreas
Date: Wed Sep 13 01:54:13 2006
New Revision: 442907
URL: http://svn.apache.org/viewvc?view=rev&rev=442907
Log:
Add more validation code to CreateResource usecase. See bug 40488.
Modified:
lenya/trunk/src/modules/resource/java/src/org/apache/lenya/cms/site/usecases/CreateResource.java
Modified: lenya/trunk/src/modules/resource/java/src/org/apache/lenya/cms/site/usecases/CreateResource.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/resource/java/src/org/apache/lenya/cms/site/usecases/CreateResource.java?view=diff&rev=442907&r1=442906&r2=442907
==============================================================================
--- lenya/trunk/src/modules/resource/java/src/org/apache/lenya/cms/site/usecases/CreateResource.java (original)
+++ lenya/trunk/src/modules/resource/java/src/org/apache/lenya/cms/site/usecases/CreateResource.java Wed Sep 13 01:54:13 2006
@@ -25,7 +25,6 @@
import org.apache.lenya.cms.publication.DocumentException;
import org.apache.lenya.cms.publication.ResourceWrapper;
import org.apache.lenya.cms.repository.RepositoryException;
-import org.apache.lenya.cms.usecase.UsecaseException;
import org.apache.lenya.util.ServletHelper;
/**
@@ -41,23 +40,25 @@
}
/**
- * Validates the request parameters.
- *
- * @throws UsecaseException if an error occurs.
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#doCheckExecutionConditions()
*/
- void validate() throws UsecaseException {
+ protected void doCheckExecutionConditions() throws Exception {
+
+ super.doCheckExecutionConditions();
+
String title = getParameterAsString("title");
-
if (title.length() == 0) {
addErrorMessage("Please enter a title.");
}
- }
-
- /**
- * @see org.apache.lenya.cms.usecase.AbstractUsecase#doCheckExecutionConditions()
- */
- protected void doCheckExecutionConditions() throws Exception {
- validate();
+
+ Part file = getPart("file");
+ if (file == null) {
+ addErrorMessage("Please choose a file to upload.");
+ }
+ else if (file.isRejected()) {
+ String[] params = { Integer.toString(file.getSize()) };
+ addErrorMessage("upload-size-exceeded", params);
+ }
}
/**
@@ -90,15 +91,9 @@
getLogger().debug("Assets::addAsset() called");
Part file = getPart("file");
-
- if (file.isRejected()) {
- String[] params = { Integer.toString(file.getSize()) };
- addErrorMessage("upload-size-exceeded", params);
- } else {
- Document document = getNewDocument();
- ResourceWrapper wrapper = new ResourceWrapper(document, this.manager, getLogger());
- wrapper.write(file);
- }
+ Document document = getNewDocument();
+ ResourceWrapper wrapper = new ResourceWrapper(document, this.manager, getLogger());
+ wrapper.write(file);
}
protected String getSourceExtension() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org