From 5083086ff450f21ec3b1aa0efbd51c95aabc87a9 Mon Sep 17 00:00:00 2001
From: tim holloway <timh@mousetech.com>
Date: Thu, 1 Feb 2024 21:34:30 -0500
Subject: [PATCH] Fixed picture upload (upgrade). Cleanup to follow.

---
 .../com/mousetech/gourmetj/RecipeDetailBean.java  | 10 ++++------
 .../gourmetj/SpringPrimeFacesApplication.java     |  2 +-
 .../java/com/mousetech/gourmetj/UserSession.java  |  1 +
 .../gourmetj/springweb/PictureController.java     |  2 +-
 .../resources/META-INF/resources/detailEdit.xhtml | 15 ++++++++++++---
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java b/src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java
index b00c689..4490dca 100644
--- a/src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java
+++ b/src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java
@@ -1063,19 +1063,19 @@ public class RecipeDetailBean implements Serializable {
 
 	// ***
 
-	Part imageFile = null;
+	UploadedFile imageFile = null;
 
 	/**
 	 * @return the imageFile set by the image upload control
 	 */
-	public Part getImageFile() {
+	public UploadedFile getImageFile() {
 		return imageFile;
 	}
 
 	/**
 	 * @param imageFile the imageFile to set
 	 */
-	public void setImageFile(Part imageFile) {
+	public void setImageFile(UploadedFile imageFile) {
 		this.imageFile = imageFile;
 	}
 
@@ -1085,9 +1085,7 @@ public class RecipeDetailBean implements Serializable {
 	 * @param event PrimeFaces file upload event object
 	 */
 	public void ajaxUploadImage(FileUploadEvent event) {
-		UploadedFile foo = event.getFile();
-
-		PictureController.importImage(recipe, foo.getContent());
+		PictureController.importImage(recipe, event.getFile().getContent());
 	}
 
 	/**
diff --git a/src/main/java/com/mousetech/gourmetj/SpringPrimeFacesApplication.java b/src/main/java/com/mousetech/gourmetj/SpringPrimeFacesApplication.java
index 4cbbc98..09c17a9 100644
--- a/src/main/java/com/mousetech/gourmetj/SpringPrimeFacesApplication.java
+++ b/src/main/java/com/mousetech/gourmetj/SpringPrimeFacesApplication.java
@@ -53,7 +53,7 @@ public class SpringPrimeFacesApplication {
 					"com.sun.el.ExpressionFactoryImpl");
 				servletContext.setInitParameter(
 					"primefaces.UPLOADER", "native");
-				////servletContext.addListener(IMAGE_IIO_PROVIDER_CONTEXT_LISTENER);
+				//servletContext.addListener(IMAGE_IIO_PROVIDER_CONTEXT_LISTENER);
 			}
 		};
 	}
diff --git a/src/main/java/com/mousetech/gourmetj/UserSession.java b/src/main/java/com/mousetech/gourmetj/UserSession.java
index 38fd3d6..ac35ffb 100644
--- a/src/main/java/com/mousetech/gourmetj/UserSession.java
+++ b/src/main/java/com/mousetech/gourmetj/UserSession.java
@@ -124,6 +124,7 @@ public class UserSession implements Serializable {
 
 	/**
 	 * @param searchType the searchType to set
+	 * @deprecated. Use CookieBean TODO
 	 */
 	public void setSearchType(RecipeSearchType searchType) {
 		this.searchType = searchType;
diff --git a/src/main/java/com/mousetech/gourmetj/springweb/PictureController.java b/src/main/java/com/mousetech/gourmetj/springweb/PictureController.java
index aaa65c6..c08b51c 100644
--- a/src/main/java/com/mousetech/gourmetj/springweb/PictureController.java
+++ b/src/main/java/com/mousetech/gourmetj/springweb/PictureController.java
@@ -180,7 +180,7 @@ public class PictureController {
 
 	/**
 	 * Take imageFile input and store it as image for recipe.
-	 * Generate thumnail
+	 * Generate thumbnail
 	 * 
 	 * @param recipe    Recipe to store into.
 	 * @param bs Info about uploaded data.
diff --git a/src/main/resources/META-INF/resources/detailEdit.xhtml b/src/main/resources/META-INF/resources/detailEdit.xhtml
index 57a24ce..1ea585f 100644
--- a/src/main/resources/META-INF/resources/detailEdit.xhtml
+++ b/src/main/resources/META-INF/resources/detailEdit.xhtml
@@ -14,6 +14,14 @@
         <ui:define name="content">
             <h:outputScript name="js/scrolltable.js" />
             <style>
+.deDescl {
+    width: 15em;
+    text-align: left;
+
+}
+.deDescr {
+    text-align: left;
+}
 .ingSel {
 	width: 3em;
 	text-align: center;
@@ -46,7 +54,7 @@
                         <p:tab id="overviewTab"
                             title="Description"
                         >
-                            <p:panelGrid columns="2">
+                            <p:panelGrid columns="2" columnClasses="deDescl, deDescr">
                                 <f:facet name="header">Description</f:facet>
                                 <p:outputLabel for="@next"
                                     value="Title"
@@ -148,14 +156,15 @@
                                 </p:panel>
                                 <p:fileUpload id="ctlUpload"
                                     label="Upload Image"
-                                    fileUploadListener="#{recipeDetailBean.ajaxUploadImage}"
+                                    value="#{recipeDetailBean.imageFile}"
+                                    listener="#{recipeDetailBean.ajaxUploadImage}"
                                     global="true" mode="advanced"
                                     multiple="false"
                                     update=":messages picPanel"
                                     auto="true"
                                     sizeLimit="1000000"
                                     allowTypes="/(\.|\/)(gif|jpe?g|png|webp)$/"
-                                />
+                                    />
                                 <p:commandButton id="ctlDelImg"
                                     value="Delete Image"
                                 >