litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-161 Tweak the interface for displaying a system error.

Browse source
This commit is contained in:
jeb228 2010-06-30 18:42:09 +00:00
parent 7b3b9d27e8
commit 643ed3d53f
1 changed files with 5 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java
View file

@ -71,6 +71,7 @@ public class ImageUploadController extends FreeMarkerHttpServlet {
public static final String TEMPLATE_NEW = "imageUpload/newImage.ftl"; public static final String TEMPLATE_NEW = "imageUpload/newImage.ftl";
public static final String TEMPLATE_REPLACE = "imageUpload/replaceImage.ftl"; public static final String TEMPLATE_REPLACE = "imageUpload/replaceImage.ftl";
public static final String TEMPLATE_CROP = "imageUpload/cropImage.ftl"; public static final String TEMPLATE_CROP = "imageUpload/cropImage.ftl";
public static final String TEMPLATE_ERROR = "error.ftl";
private static final String URL_HERE = UrlBuilder.getUrl("/uploadImages"); private static final String URL_HERE = UrlBuilder.getUrl("/uploadImages");
@ -207,9 +208,9 @@ public class ImageUploadController extends FreeMarkerHttpServlet {
// Can't find the entity? Complain. // Can't find the entity? Complain.
return showAddImagePageWithError(null, e.getMessage()); return showAddImagePageWithError(null, e.getMessage());
} catch (Exception e) { } catch (Exception e) {
// We weren't expecting this - dump as much info as possible. // We weren't expecting this - log it, and apologize to the user.
log.error(e, e); log.error(e, e);
return doError(e.toString()); return new TemplateResponseValues(TEMPLATE_ERROR);
} }
} }
@ -290,18 +291,6 @@ public class ImageUploadController extends FreeMarkerHttpServlet {
return showIndividualDisplayPage(entity); return showIndividualDisplayPage(entity);
} }
/**
* Display a error message to the user.
*
* @message The text of the error message.
*/
private TemplateResponseValues doError(String message) {
TemplateResponseValues rv = new TemplateResponseValues(
"errorMessage.ftl");
rv.put("errorMessage", message);
return rv;
}
/** /**
* We need to be talking about an actual Individual here. * We need to be talking about an actual Individual here.
*/ */
@ -538,8 +527,8 @@ public class ImageUploadController extends FreeMarkerHttpServlet {
/** /**
* For debugging, dump all sorts of information about the request. * For debugging, dump all sorts of information about the request.
* *
* WARNING: if "req" represents a Multi-part request which has not * WARNING: if "req" represents a Multi-part request which has not yet been
* yet been parsed, then reading these parameters will consume them. * parsed, then reading these parameters will consume them.
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private void dumpRequestDetails(HttpServletRequest req) { private void dumpRequestDetails(HttpServletRequest req) {