Author: bbrossaud Date: 2010-07-27 17:30:23 +0200 (Tue, 27 Jul 2010) New Revision: 101 Url: http://chorem.org/repositories/revision/bow/101 Log: remove multiple delete bookmark and logout button works Modified: trunk/src/main/java/org/chorem/bow/BowConfig.java trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/webapp/bookmarkHome.jsp trunk/src/main/webapp/bookmarkSearch.jsp Modified: trunk/src/main/java/org/chorem/bow/BowConfig.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowConfig.java 2010-07-26 08:10:56 UTC (rev 100) +++ trunk/src/main/java/org/chorem/bow/BowConfig.java 2010-07-27 15:30:23 UTC (rev 101) @@ -26,8 +26,6 @@ import static org.nuiton.i18n.I18n._; import java.io.File; -import java.util.ArrayList; -import java.util.List; import org.apache.commons.lang.UnhandledException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-26 08:10:56 UTC (rev 100) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-27 15:30:23 UTC (rev 101) @@ -296,7 +296,7 @@ WikittyProxy proxy = BowProxy.getInstance(); Criteria criteria = getBookmarkListCriteriaByUser(user, searchLine); criteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); - PagedResult result = proxy.findAllByCriteria(Bookmark.class, criteria);// retrieve bookmarks by search + PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria);// retrieve bookmarks by search BookmarkActions bookmarkActions = createBookmarkActions(request, result, searchLine); request.setAttribute("bookmarkActions", bookmarkActions); request.setAttribute("token", token); @@ -332,7 +332,7 @@ criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()). criteria().addFacetField(Bookmark.FQ_FIELD_TAGS); } - PagedResult result = proxy.findAllByCriteria(Bookmark.class, criteria); + PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); List<Bookmark> bookList = result.getAll(); List<FacetTopic> topics = result.getTopic(Bookmark.FQ_FIELD_TAGS); openSearchActions.setBookmarkList(bookList); @@ -391,7 +391,7 @@ Criteria baseCriteria = getBookmarkListCriteriaByUser(user, searchLine); if (type != null && baseCriteria != null && !type.isEmpty()) { WikittyProxy proxy = BowProxy.getInstance(); - PagedResult result = null; + PagedResult<Bookmark> result = null; if (type.equals("ascName")) { Criteria criteria = baseCriteria.addSortAscending(Bookmark.FQ_FIELD_DESCRIPTION); result = proxy.findAllByCriteria(Bookmark.class, criteria); @@ -456,11 +456,15 @@ throws IOException, ServletException { String bookmarkId = request.getParameter("bookmarkId"); if (bookmarkId != null && !bookmarkId.isEmpty()) { - WikittyProxy proxy = BowProxy.getInstance(); - Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId); - if (bookmark != null) { - proxy.delete(bookmarkId); - } + try { + WikittyProxy proxy = BowProxy.getInstance(); + Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId); + if (bookmark != null) { + proxy.delete(bookmarkId); + } + } catch (Exception eee) { + log.error("Can't do action", eee); + } } redirectToTheGoodPage(request, response); } @@ -653,7 +657,7 @@ WikittyProxy proxy = BowProxy.getInstance(); Criteria criteria = getBookmarkListCriteriaByUser(user, searchLine); criteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); - PagedResult result = proxy.findAllByCriteria(Bookmark.class, criteria); // select all bookmarks by user + PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); // select all bookmarks by user BookmarkActions bookmarkActions = createBookmarkActions(request, result, searchLine); request.setAttribute("bookmarkActions", bookmarkActions); } @@ -664,7 +668,7 @@ * @return bookmarkActions the bookmarkAction * @description create the tagCLoud by research type */ - protected BookmarkActions createBookmarkActions(HttpServletRequest request, PagedResult result, String searchLine) { + protected BookmarkActions createBookmarkActions(HttpServletRequest request, PagedResult<Bookmark> result, String searchLine) { String fullText = request.getParameter("fullTextLine"); BookmarkActions bookmarkActions = new BookmarkActions(); bookmarkActions.setFullTextLine(fullText); @@ -833,7 +837,7 @@ Criteria criteria = getBookmarkListCriteriaByUser(user, null); if (criteria != null) { Criteria sortCriteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); - PagedResult result = proxy.findAllByCriteria(Bookmark.class, sortCriteria); // select all bookmarks by user + PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, sortCriteria); // select all bookmarks by user sortCriteria = criteria.addSortDescending(Bookmark.FQ_FIELD_DATE).setEndIndex(10); List<Bookmark> lastBookmarks = proxy.findAllByCriteria(Bookmark.class, sortCriteria).getAll(); BookmarkActions bookmarkActions = createBookmarkActions(request, result, null); @@ -868,9 +872,9 @@ // Process the uploaded items // Parse the request List<FileItem> items = upload.parseRequest(request); - Iterator iter = items.iterator(); + Iterator<FileItem> iter = items.iterator(); while (iter.hasNext()) { - FileItem item = (FileItem) iter.next(); + FileItem item = iter.next(); if (!item.isFormField()) { WikittyProxy proxy = BowProxy.getInstance(); String content = item.getString(); @@ -989,7 +993,7 @@ } else { criteria = getBookmarkListCriteriaByUser(user, null); } - PagedResult result = proxy.findAllByCriteria(Bookmark.class, criteria); + PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); BookmarkActions bookmarkActions = createBookmarkActions(request, result, null); request.setAttribute("bookmarkActions", bookmarkActions); } Modified: trunk/src/main/webapp/bookmarkHome.jsp =================================================================== --- trunk/src/main/webapp/bookmarkHome.jsp 2010-07-26 08:10:56 UTC (rev 100) +++ trunk/src/main/webapp/bookmarkHome.jsp 2010-07-27 15:30:23 UTC (rev 101) @@ -63,7 +63,7 @@ <a class="logo" href="<%=url%>?action=home">bow</a>(Bookmarks On the Web) </div> <div id="headright"> - <form action="bow?action=logout"> + <form method="POST" action="bow?action=logout"> <button>Logout</button> </form> <a href="#">Aide</a> Modified: trunk/src/main/webapp/bookmarkSearch.jsp =================================================================== --- trunk/src/main/webapp/bookmarkSearch.jsp 2010-07-26 08:10:56 UTC (rev 100) +++ trunk/src/main/webapp/bookmarkSearch.jsp 2010-07-27 15:30:23 UTC (rev 101) @@ -63,7 +63,7 @@ <a class="logo" href="<%=url%>?action=home">bow</a>(Bookmarks On the Web) </div> <div id="headright"> - <form action="bow?action=logout"> + <form method="POST" action="bow?action=logout"> <button>Logout</button> </form> <a href="#">Aide</a>