xlawrence 2005/08/10 10:59:24 CEST
Modified files:
core/src/java/org/jahia/ajax AjaxServlet.java
Log:
Code cleanUp
Revision Changes Path
1.5 +10 -15 jahia/core/src/java/org/jahia/ajax/AjaxServlet.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/ajax/AjaxServlet.java.diff?r1=1.4&r2=1.5&f=h
Index: AjaxServlet.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/ajax/AjaxServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AjaxServlet.java 9 Aug 2005 13:29:45 -0000 1.4
+++ AjaxServlet.java 10 Aug 2005 08:59:24 -0000 1.5
@@ -46,7 +46,6 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
import org.jahia.bin.Jahia;
import org.jahia.data.beans.ActionURIBean;
import org.jahia.data.beans.ContainerBean;
@@ -127,12 +126,10 @@
* @param request The current request
* @param response The current response
*
- * @throws ServletException
* @throws IOException
*/
private void processMenuRequest( final HttpServletRequest request,
- final HttpServletResponse response )
- throws IOException, ServletException {
+ final HttpServletResponse response ) throws IOException {
try {
// Create the ProcessingContext
final BeanFactory bf = Jahia.getConfigBeanFactory();
@@ -143,14 +140,13 @@
final JahiaPage currentPage = jParams.getPage();
final JahiaUser currentUser = jParams.getUser();
- final HttpSession theSession = request.getSession();
if ( currentUser == null || currentPage == null ||
! currentPage.getACL().getPermission(currentUser,
JahiaBaseACL.WRITE_RIGHTS) ) {
logger.warn("Unauthorized attempt to use AJAX Servlet");
- response.setStatus(response.SC_FORBIDDEN);
- response.sendError(response.SC_FORBIDDEN,
+ response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+ response.sendError(HttpServletResponse.SC_FORBIDDEN,
"Must be logged in and have 'Write' access");
return;
}
@@ -231,9 +227,8 @@
bean = new FieldBean(field, jParams);
} else {
- bean = null;
- response.setStatus(response.SC_BAD_REQUEST);
- response.sendError(response.SC_BAD_REQUEST,
+ response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST,
"Unknown 'ObjectType' value ! 'ObjectType' value
should be '"+
PageBean.TYPE + "', '" + ContainerListBean.TYPE +
"', '" +
ContainerBean.TYPE + "' or '" + FieldBean.TYPE +
"'.");
@@ -277,7 +272,7 @@
final byte[] bytes = buff.toString().getBytes(CHARSET);
response.setContentLength(bytes.length);
- response.setStatus(response.SC_OK);
+ response.setStatus(HttpServletResponse.SC_OK);
final OutputStream out = response.getOutputStream ();
out.write(bytes);
@@ -285,8 +280,8 @@
} catch (Exception e) {
logger.fatal("Unable to process the request !", e);
- response.setStatus(response.SC_INTERNAL_SERVER_ERROR);
- response.sendError(response.SC_INTERNAL_SERVER_ERROR,
+ response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
"Unable to process the request ! Msg: "+ e.getMessage());
}
}
@@ -308,8 +303,8 @@
final String value = request.getParameter(name);
if (value == null) {
logger.fatal("Missing required '" + name + "' parameter in
request.");
- response.setStatus(response.SC_BAD_REQUEST);
- response.sendError(response.SC_BAD_REQUEST,
+ response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST,
"Missing required '" + name + "' parameter in request.");
}
return value;
