diff --git a/src/main/java/com/mousetech/gourmetj/AppBean.java b/src/main/java/com/mousetech/gourmetj/AppBean.java new file mode 100644 index 0000000..98a3019 --- /dev/null +++ b/src/main/java/com/mousetech/gourmetj/AppBean.java @@ -0,0 +1,51 @@ +package com.mousetech.gourmetj; + +import java.util.ArrayList; +import java.util.List; + +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.faces.model.SelectItem; +import jakarta.inject.Named; + +/** + * Appplication-scope data (mostly constants) + * + * @author timh + * @since Feb 1, 2024 + */ +@Named +@ApplicationScoped +public class AppBean { + + public AppBean() { + // TODO Auto-generated constructor stub + } + + private List searchTypeList; + + /** + * @return the searchTypeList + * @see RecipeSearchType + * Used by main.xhtml + */ + public List getSearchTypeList() { + if (searchTypeList == null) { + searchTypeList = loadSearchTypeList(); + } + return searchTypeList; + } + + private List loadSearchTypeList() { + List list = new ArrayList(5); + list.add(new SelectItem(RecipeSearchType.rst_BY_NAME.ordinal(), + "Title")); + list.add(new SelectItem(RecipeSearchType.rst_BY_CATEGORY.ordinal(), + "Category")); + list.add(new SelectItem(RecipeSearchType.rst_BY_CUISINE.ordinal(), + "Cuisine")); + list.add( + new SelectItem(RecipeSearchType.rst_BY_INGREDIENT.ordinal(), + "Ingredient")); + return list; + } +} diff --git a/src/main/java/com/mousetech/gourmetj/UserSession.java b/src/main/java/com/mousetech/gourmetj/UserSession.java index 01b779c..38fd3d6 100644 --- a/src/main/java/com/mousetech/gourmetj/UserSession.java +++ b/src/main/java/com/mousetech/gourmetj/UserSession.java @@ -129,32 +129,6 @@ public class UserSession implements Serializable { this.searchType = searchType; } - private List searchTypeList; - - /** - * @return the searchTypeList - */ - public List getSearchTypeList() { - if (searchTypeList == null) { - searchTypeList = loadSearchTypeList(); - } - return searchTypeList; - } - - private List loadSearchTypeList() { - List list = new ArrayList(5); - list.add(new SelectItem(RecipeSearchType.rst_BY_NAME.ordinal(), - "Title")); - list.add(new SelectItem(RecipeSearchType.rst_BY_CATEGORY.ordinal(), - "Category")); - list.add(new SelectItem(RecipeSearchType.rst_BY_CUISINE.ordinal(), - "Cuisine")); - list.add( - new SelectItem(RecipeSearchType.rst_BY_INGREDIENT.ordinal(), - "Ingredient")); - return list; - } - // ==== public String formatCategories(Recipe r) { diff --git a/src/main/resources/META-INF/resources/main.xhtml b/src/main/resources/META-INF/resources/main.xhtml index 9004e8f..8d0652a 100644 --- a/src/main/resources/META-INF/resources/main.xhtml +++ b/src/main/resources/META-INF/resources/main.xhtml @@ -31,7 +31,7 @@ value="#{cookieBean.searchType}" > -