|
From: <ps...@us...> - 2017-05-08 19:07:58
|
Revision: 277
http://sourceforge.net/p/vlibrary/code/277
Author: psteitz
Date: 2017-05-08 19:07:55 +0000 (Mon, 08 May 2017)
Log Message:
-----------
Formatting, generics.
Modified Paths:
--------------
branches/VLIBRARY_2_X/src/main/java/org/sourceforge/vlibrary/user/actions/SaveReaderAction.java
Modified: branches/VLIBRARY_2_X/src/main/java/org/sourceforge/vlibrary/user/actions/SaveReaderAction.java
===================================================================
--- branches/VLIBRARY_2_X/src/main/java/org/sourceforge/vlibrary/user/actions/SaveReaderAction.java 2017-05-08 19:02:40 UTC (rev 276)
+++ branches/VLIBRARY_2_X/src/main/java/org/sourceforge/vlibrary/user/actions/SaveReaderAction.java 2017-05-08 19:07:55 UTC (rev 277)
@@ -1,24 +1,23 @@
package org.sourceforge.vlibrary.user.actions;
+import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.log4j.Logger;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.util.MessageResources;
-import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.log4j.Logger;
-
import org.sourceforge.vlibrary.Constants;
import org.sourceforge.vlibrary.exceptions.LibraryException;
import org.sourceforge.vlibrary.user.domain.Reader;
import org.sourceforge.vlibrary.user.forms.ReaderForm;
-
-import java.lang.reflect.InvocationTargetException;
-
/**
* Implementation of <strong>Action</strong> that validates and creates or
* updates the reader profile information entered by the user.
@@ -27,11 +26,11 @@
*/
public class SaveReaderAction extends LibraryAction {
-
+
/** log4j Logger */
private static Logger logger =
Logger.getLogger(SaveReaderAction.class.getName());
-
+
/**
* Depending on the action request parameter, either create a Reader
* or update based on <form> data.
@@ -50,21 +49,20 @@
HttpServletResponse response,
MessageResources messages)
throws Exception {
-
+
// Get the form and action parameter
ReaderForm frm = (ReaderForm) form;
-
String action = request.getParameter(Constants.ACTION);
-
+
if (action == null) {
action = Constants.CREATE;
}
-
- ArrayList errors = new ArrayList();
-
+
+ ArrayList<LibraryException> errors = new ArrayList<LibraryException>();
+
// Create a Reader object and copy properties from the ReaderForm
Reader rd = new Reader();
-
+
try {
PropertyUtils.copyProperties(rd, frm);
} catch (InvocationTargetException e) {
@@ -72,31 +70,24 @@
if (t == null) {
t = e;
}
-
String errString = messages.getMessage("error.reader.reflection");
-
logger.error(errString, t);
-
errors.add(new LibraryException(errString,t));
-
return standardForward(mapping,request,errors);
} catch (Throwable t) {
String errString = messages.getMessage("error.reader.populate");
-
logger.error(errString, t);
-
errors.add(new LibraryException(errString,t));
-
return standardForward(mapping,request,errors);
}
-
+
// Attempt requested action
try {
if (action.equals("Create")) {
- libraryManager.insertReader( rd );
+ libraryManager.insertReader(rd);
} else {
if (action.equals("Update")) {
- libraryManager.updateReader( rd );
+ libraryManager.updateReader(rd);
} else {
String errString = messages.getMessage
("error.action.invalid");
@@ -110,7 +101,7 @@
logger.error(errString,t);
errors.add(new LibraryException(errString,t));
}
-
+
if (errors.isEmpty() && logger.isInfoEnabled()) {
// Log transaction
if (action.equals("Create")) {
@@ -121,7 +112,6 @@
rd.getFirstName() + " " + rd.getLastName()));
}
}
-
return standardForward(mapping,request,errors);
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|