diff --git a/src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java b/src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java
index 4490dca..847c56c 100644
--- a/src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java
+++ b/src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java
@@ -1063,37 +1063,21 @@ public class RecipeDetailBean implements Serializable {
// ***
- UploadedFile imageFile = null;
-
- /**
- * @return the imageFile set by the image upload control
- */
- public UploadedFile getImageFile() {
- return imageFile;
- }
-
- /**
- * @param imageFile the imageFile to set
- */
- public void setImageFile(UploadedFile imageFile) {
- this.imageFile = imageFile;
- }
-
/**
* Load/replace images. Computes thumbnail.
*
* @param event PrimeFaces file upload event object
*/
public void ajaxUploadImage(FileUploadEvent event) {
- PictureController.importImage(recipe, event.getFile().getContent());
+ PictureController.importImage(recipe,
+ event.getFile().getContent());
}
/**
* Remove images from recipe
- *
- * @param event Notused
*/
- public void ajaxDeleteImage(AjaxBehaviorEvent event) {
+ public void ajaxDeleteImage() {
+ log.info("Deleting current recipe image");
this.recipe.setImage(null);
this.recipe.setThumb(null);
}
diff --git a/src/main/java/com/mousetech/gourmetj/SpringPrimeFacesApplication.java b/src/main/java/com/mousetech/gourmetj/SpringPrimeFacesApplication.java
index 09c17a9..5d5535c 100644
--- a/src/main/java/com/mousetech/gourmetj/SpringPrimeFacesApplication.java
+++ b/src/main/java/com/mousetech/gourmetj/SpringPrimeFacesApplication.java
@@ -4,8 +4,6 @@ import jakarta.faces.application.ViewExpiredException;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
-import org.primefaces.application.resource.PrimeResourceHandler;
-import org.primefaces.renderkit.HeadRenderer;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.domain.EntityScan;
@@ -21,8 +19,6 @@ import org.springframework.http.HttpStatus;
"com.mousetech.gourmetj.persistence.model" })
public class SpringPrimeFacesApplication {
- private static final String IMAGE_IIO_PROVIDER_CONTEXT_LISTENER =
- "com.twelvemonkeys.servlet.image.IIOProviderContextListener";
final String errorPage = "/error/error.html";
final String error404Page = "/error/error404.html";
final String expiredPage = "/error/viewExpired.xhtml";
@@ -38,13 +34,6 @@ public class SpringPrimeFacesApplication {
@Override
public void onStartup(ServletContext servletContext)
throws ServletException {
- /* Note that we cannot set theme here since it was
- * already set earlier. Default value is "aristo".
- */
- servletContext.setInitParameter(
- "joinfaces.primefaces.theme", "vela");
- servletContext.setInitParameter(
- "primefaces.THEME", "overcast");
servletContext.setInitParameter(
"jakarta.faces.FACELETS_SKIP_COMMENTS",
"true");
@@ -53,7 +42,6 @@ public class SpringPrimeFacesApplication {
"com.sun.el.ExpressionFactoryImpl");
servletContext.setInitParameter(
"primefaces.UPLOADER", "native");
- //servletContext.addListener(IMAGE_IIO_PROVIDER_CONTEXT_LISTENER);
}
};
}
diff --git a/src/main/resources/META-INF/resources/detailEdit.xhtml b/src/main/resources/META-INF/resources/detailEdit.xhtml
index 1ea585f..45e9501 100644
--- a/src/main/resources/META-INF/resources/detailEdit.xhtml
+++ b/src/main/resources/META-INF/resources/detailEdit.xhtml
@@ -149,14 +149,15 @@
rows="10" cols="45"
value="#{recipeDetailBean.recipe.description}"
/>
+
+
-
-
-
+