Tweaks init command and init doc submission.

[mkjsf-moved-to-github.git] / src / main / java / com / indexdata / mkjsf / utils / FileUpload.java

diff --git a/src/main/java/com/indexdata/mkjsf/utils/FileUpload.java b/src/main/java/com/indexdata/mkjsf/utils/FileUpload.java
index 71598f2..ba8c242 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/utils/FileUpload.java
+++ b/src/main/java/com/indexdata/mkjsf/utils/FileUpload.java
@@ -14,7 +14,7 @@ import com.indexdata.mkjsf.pazpar2.HttpResponseWrapper;
 \r
 public abstract class FileUpload implements Serializable {\r
 \r
-  protected UploadedFile uploadedFile;\r
+\r
   protected HttpResponseWrapper response;\r
   private static Logger logger = Logger.getLogger(FileUpload.class);\r
   private static final long serialVersionUID = 748784638056392862L;\r
@@ -22,25 +22,20 @@ public abstract class FileUpload implements Serializable {
   public FileUpload() {\r
   }\r
 \r
-  public abstract String submit() throws IOException;\r
+  public abstract HttpResponseWrapper submit() throws IOException;\r
   \r
-  public UploadedFile getUploadedFile() {\r
-    return uploadedFile;\r
-  }\r
-\r
-  public void setUploadedFile(UploadedFile uploadedFile) {\r
-    logger.info(Utils.objectId(this) + " received an uploaded file [" + Utils.objectId(uploadedFile) + "]");\r
-    this.uploadedFile = uploadedFile;\r
-  }\r
+  public abstract UploadedFile getUploadedFile();\r
+  \r
+  public abstract void setUploadedFile(UploadedFile uploadedFile);\r
   \r
   public void downloadDoc() throws IOException {\r
     logger.info(Utils.objectId(this) + " got a download request");\r
     FacesContext facesContext = FacesContext.getCurrentInstance();\r
     ExternalContext externalContext = facesContext.getExternalContext();\r
-    externalContext.setResponseHeader("Content-Type", uploadedFile.getContentType());\r
-    externalContext.setResponseHeader("Content-Length", String.valueOf((uploadedFile.getBytes().length)));\r
-    externalContext.setResponseHeader("Content-Disposition", "attachment;filename=\"" + FilenameUtils.getBaseName(uploadedFile.getName()) + "\"");\r
-    externalContext.getResponseOutputStream().write(uploadedFile.getBytes());\r
+    externalContext.setResponseHeader("Content-Type", getUploadedFile().getContentType());\r
+    externalContext.setResponseHeader("Content-Length", String.valueOf((getUploadedFile().getBytes().length)));\r
+    externalContext.setResponseHeader("Content-Disposition", "attachment;filename=\"" + FilenameUtils.getBaseName(getUploadedFile().getName()) + "\"");\r
+    externalContext.getResponseOutputStream().write(getUploadedFile().getBytes());\r
     facesContext.responseComplete();\r
   }\r
   \r