misc mainpage and detail edit cleanup

src/main/java/com/mousetech/gourmetj/AdminMainBean.java

@@ -92,6 +92,7 @@ public class AdminMainBean implements Serializable {
 	 */
 	public void setSearchText(String searchText) {
 		this.searchText = searchText;
+		userSession.setLastSearch(searchText);
 	}
 
 	/**/

src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java

@@ -159,6 +159,7 @@ public class RecipeDetailBean implements Serializable {
 
 	/**
 	 * @return the category as a comma-separated list.
+	 * @see #stringifyCategories(Recipe)
 	 */
 	public String getCategory() {
 		return category;
@@ -241,6 +242,8 @@ public class RecipeDetailBean implements Serializable {
 
 		getIngredients().setWrappedData(
 			buildIngredientFacade(recipe.getIngredientHash()));
+		stringifyCategories(recipe);
+
 		log.info("Set recipe: " + this.recipe);
 	}
 
@@ -255,7 +258,19 @@ public class RecipeDetailBean implements Serializable {
 		if (recipe == null) {
 			return null;
 		}
+		stringifyCategories(recipe);
+		return recipe;
+	}
 
+	/**
+	 * Categories are a Set attached to recipe. Build
+	 * a displayable comma-separated list of them.
+	 * 
+	 * @param recipe Recipe to get categories from.
+	 * 
+	 * @see #getCategory()
+	 */
+	private void stringifyCategories(Recipe recipe) {
 		Set<Category> cList = recipe.getCategories();
 		StringBuffer sb = new StringBuffer(35);
 		boolean first = true;
@@ -268,7 +283,6 @@ public class RecipeDetailBean implements Serializable {
 			sb.append(cat.getCategory());
 		}
 		this.category = sb.toString();
-		return recipe;
 	}
 
 	/**
@@ -344,7 +358,8 @@ public class RecipeDetailBean implements Serializable {
 		if (instructions == null) {
 			return "";
 		}
-		String s = instructions.replace("\n\n", "<p/>");
+		String s = instructions.replace("\r\n", "<p/>")
+			.replace("\n\n", "<p/>");
 		s = s.replace("\n", "<br/>");
 		return s;
 	}
@@ -464,11 +479,11 @@ public class RecipeDetailBean implements Serializable {
 	}
 
 	private void auditRows(List<IngredientUI> rows) {
-		log.info("=== AUDIT ROWS ===");
+//		log.info("=== AUDIT ROWS ===");
-		for ( IngredientUI row : rows ) {
+//		for ( IngredientUI row : rows ) {
-			log.info((row.isSelected() ? "[X]" : "[ ]" ) +" ROW="+row);
+//			log.info((row.isSelected() ? "[X]" : "[ ]" ) +" ROW="+row);
-		}
+//		}
-		log.info("=== DONE ===");
+//		log.info("=== DONE ===");
 	}
 
 	/**
@@ -527,8 +542,8 @@ public class RecipeDetailBean implements Serializable {
 	 * Invoked when the "E"(dit" button for Ingkey shopping
 	 * category has been clicked.
 	 * 
-	 * @param item The item whose ingredient key will
+	 * @param item The item whose ingredient key will have its
-	 * have its shopping category edited. Resets the dialog
+	 *             shopping category edited. Resets the dialog
 	 *             backing bean internal state.
 	 */
 	public void ajaxEditShopcat(IngredientUI item) {
@@ -537,8 +552,8 @@ public class RecipeDetailBean implements Serializable {
 	}
 
 	/**
-	 * On "OK" for edit shopcat where shopcat has changed,
+	 * On "OK" for edit shopcat where shopcat has changed, update
-	 * update the shopcat Entity and the ingredients.
+	 * the shopcat Entity and the ingredients.
 	 */
 	public void doUpdateShopcat() {
 
@@ -555,17 +570,17 @@ public class RecipeDetailBean implements Serializable {
 			sc = new Shopcat();
 			sc.setIngkey(key);
 		} else {
-			if ( StringUtils.equals(sc.getShopcategory(), catname)  ) {
+			if (StringUtils.equals(sc.getShopcategory(),
+				catname)) {
 				return; // No change
 			}
 		}
 		sc.setShopcategory(catname);
 
 		/*
-		 * Because the database does not have a UNIQUE
+		 * Because the database does not have a UNIQUE constraint
-		 * constraint on ingkeys, we must delete old
+		 * on ingkeys, we must delete old shopcat(s) for this key
-		 * shopcat(s) for this key before adding (updating)
+		 * before adding (updating) the new shopcat.
-		 * the new shopcat.
 		 */
 		this.recipeService.deleteShopcatByIngKey(key);
 		if (!StringUtils.isBlank(catname)) {
@@ -798,7 +813,7 @@ public class RecipeDetailBean implements Serializable {
 				cat.setId(ocat.getId());
 			}
 		}
-		recipe.setCategories(new HashSet(newList));
+		recipe.setCategories(new HashSet<Category>(newList));
 	}
 
 	private Category searchCategory(Set<Category> oldList,
@@ -978,7 +993,7 @@ public class RecipeDetailBean implements Serializable {
 	}
 
 	/**
-	 * @return the suggestCategory
+	 * @return the suggestCategory List
 	 */
 	public List<String> getSuggestCategory() {
 		if (suggestCategory == null) {

src/main/resources/META-INF/resources/WEB-INF/layout/layout.xhtml

@@ -54,9 +54,6 @@
                 </h:form>
                 <!--  -->
                 <h:form id="frmOpErr">
-                    <p:commandButton type="button"
-                        onclick="PF('opError').show()"
-                    />
                     <p:confirmDialog
                         message="Session may have expired."
                         header="Error"

src/main/resources/META-INF/resources/css/style.css

@@ -2,11 +2,18 @@
 	color: red;
 	background-color: blue;
 }
+
 .editIngGroupRow {
 	background-color: aqua;
 	font-weight: bold;
 }
+
 .displayIngGroupRow {
 	background-color: aqua;
 	font-weight: bold;
 }
+
+textarea {
+	font-family: 'latoregular', 'Trebuchet MS,Arial,Helvetica,sans-serif';
+	font-size: 1em
+}

src/main/resources/META-INF/resources/detailEdit.xhtml

@@ -359,9 +359,9 @@
                         >
                             <p:panel header="Instructions">
                                 <div id="insection">
-                                    <p:textEditor
+                                    <h:inputTextarea
                                         id="ctlInstructions"
-                                        height="320"
+                                        rows="30" cols="120"
                                         escape="false"
                                         value="#{recipeDetailBean.recipe.instructions}"
                                     />
@@ -370,8 +370,9 @@
                         </p:tab>
                         <p:tab id="notesTab" title="Notes">
                             <p:panel header="Notes">
-                                <p:textEditor id="ctlNotes"
+                                <h:inputTextarea id="ctlNotes"
-                                    height="320" escape="false"
+                                    rows="30" cols="120"
+                                    escape="false"
                                     value="#{recipeDetailBean.recipe.modifications}"
                                 />
                             </p:panel>
@@ -386,6 +387,11 @@
                         ajax="false" immediate="true"
                         action="recipeDetails.jsf"
                     />
+                    <p:commandButton id="doHome" value="Home"
+                        icon="ui-icon-home"
+                        ajax="false" immediate="true"
+                        action="home"
+                    />                    
                 </h:form>
             </p:panel>
             <p:dialog id="addGroupDlg" widgetVar="addGroupDlg">

src/main/resources/META-INF/resources/main.xhtml

@@ -10,10 +10,8 @@
         <h:messages />
         <h:form id="form1">
             <div>
-                <span class="ui-input-icon-left"> <i
+                <p:inputText id="searchFor" size="45"
-                    class="pi pi-search"
+                    placeholder="Recipe title/cuisine/category, etc.)"
-                /> <p:inputText id="searchFor" size="45"
-                        placeholder="Recipe title, (todo cuisine, etc.)"
                     value="#{adminMainBean.searchText}"
                 >
                     <f:ajax event="change" execute="@this"
@@ -21,10 +19,11 @@
                         listener="#{adminMainBean.ajaxUpdateList}"
                     />
                 </p:inputText>
-                </span>
+                <p:defaultCommand target="find" />
                 <p:commandButton id="find" value="Find"
-                    icon="ui-icon-search" defaultCommand="true"
+                    icon="ui-icon-search"
                     action="#{adminMainBean.doFind}"
+                    update=":form2:table1"
                 />
                 <p:outputLabel for="@next" value="Search for " />
                 <p:selectOneMenu id="ctlSearchType"
@@ -37,14 +36,13 @@
                     <p:ajax />
                 </p:selectOneMenu>
                 <p:commandButton id="ctlClear" value="Clear"
-                    immediate="true" icon="ui-icon-close"
+                    icon="ui-icon-close"
-                    update="form1:searchFor form2:table1"
+                    update="@form:searchFor :form2:table1"
                     action="#{adminMainBean.ajaxClearList}"
                 />
                 <p:commandButton value="New Recipe"
                     action="#{adminMainBean.doNewRecipe}"
                 />
-                <p:defaultCommand target="find" />
             </div>
         </h:form>
         <h:form id="form2">