Author: bbrossaud Date: 2010-07-27 18:13:51 +0200 (Tue, 27 Jul 2010) New Revision: 102 Url: http://chorem.org/repositories/revision/bow/102 Log: remove warnings Modified: trunk/src/main/java/org/chorem/bow/AliasServlet.java trunk/src/main/java/org/chorem/bow/BookmarkActions.java trunk/src/main/java/org/chorem/bow/BowProxy.java trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/java/org/chorem/bow/OpenSearchActions.java Modified: trunk/src/main/java/org/chorem/bow/AliasServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-07-27 15:30:23 UTC (rev 101) +++ trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-07-27 16:13:51 UTC (rev 102) @@ -39,7 +39,8 @@ */ public class AliasServlet extends HttpServlet { - protected String bowServletUrl = ""; + private static final long serialVersionUID = 1L; + protected String bowServletUrl = ""; public AliasServlet() throws ArgumentsParserException { BowConfig config = BowConfig.getInstance(); Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-07-27 15:30:23 UTC (rev 101) +++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-07-27 16:13:51 UTC (rev 102) @@ -343,12 +343,12 @@ } public void setBookmarks(List<Bookmark> bookmarksList) { - List<Bookmark> newList = new ArrayList(bookmarksList); + List<Bookmark> newList = new ArrayList<Bookmark>(bookmarksList); bookmarks = newList; } public void setLastBookmarks(List<Bookmark> bookmarksList) { - List<Bookmark> newList = new ArrayList(bookmarksList); + List<Bookmark> newList = new ArrayList<Bookmark>(bookmarksList); lastBookmarks = newList; } Modified: trunk/src/main/java/org/chorem/bow/BowProxy.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowProxy.java 2010-07-27 15:30:23 UTC (rev 101) +++ trunk/src/main/java/org/chorem/bow/BowProxy.java 2010-07-27 16:13:51 UTC (rev 102) @@ -25,8 +25,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyExtensionMigration; import org.nuiton.wikitty.WikittyProxy; @@ -45,8 +43,6 @@ */ public class BowProxy extends WikittyProxy { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(BowProxy.class); static protected BowProxy instance; synchronized static public BowProxy getInstance() { Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-27 15:30:23 UTC (rev 101) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-27 16:13:51 UTC (rev 102) @@ -31,7 +31,6 @@ import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.Arrays; -import java.util.Iterator; import java.util.List; import java.util.Properties; import javax.mail.Message; @@ -73,7 +72,8 @@ */ public class ControllerServlet extends HttpServlet { - private static final Log log = LogFactory.getLog(ControllerServlet.class); + private static final long serialVersionUID = 1L; + private static final Log log = LogFactory.getLog(ControllerServlet.class); protected String version = ""; protected String bowServletUrl = ""; @@ -591,7 +591,6 @@ * @description check if the token is valid and return the * token owner */ - protected User checkToken(String token, HttpSession session) { if (checkTemporaryToken(token, session) == true) { User user = (User) session.getAttribute("user"); @@ -871,10 +870,9 @@ ServletFileUpload upload = new ServletFileUpload(factory); // Process the uploaded items // Parse the request - List<FileItem> items = upload.parseRequest(request); - Iterator<FileItem> iter = items.iterator(); - while (iter.hasNext()) { - FileItem item = iter.next(); + List<?> items = upload.parseRequest(request); + for (Object obj : items) { + FileItem item = (FileItem) obj; if (!item.isFormField()) { WikittyProxy proxy = BowProxy.getInstance(); String content = item.getString(); @@ -1037,12 +1035,9 @@ return criteria; } - private void actionChangePreferences(HttpServletRequest request, HttpSession session, User user) - throws NoSuchAlgorithmException, AddressException, MessagingException { + protected Preference changePreference(HttpServletRequest request, HttpSession session) { - WikittyProxy proxy = BowProxy.getInstance(); - - Preference preference = (Preference) session.getAttribute("preference"); + Preference preference = (Preference) session.getAttribute("preference"); // Retrieve Preference fields String colors = request.getParameter("colors"); String tags = request.getParameter("tags"); @@ -1056,11 +1051,12 @@ preference.setSearchEngineUrlSuggestions(searchEngineSuggestions); preference.setSearchEngineUrlResults(searchEngineResults); - proxy.store(preference); - - User newUser = proxy.restore(User.class, user.getWikittyId()); - // Retrieve User fields - String email = request.getParameter("email"); + return preference; + } + + protected User changeUser(HttpServletRequest request, User newUser) + throws NoSuchAlgorithmException { + String email = request.getParameter("email"); String newPassword = request.getParameter("newPassword"); String currentPassword = request.getParameter("currentPassword"); String confirmNewPassword = request.getParameter("confirmNewPassword"); @@ -1079,6 +1075,19 @@ } } } + return newUser; + } + + protected void actionChangePreferences(HttpServletRequest request, HttpSession session, User user) + throws NoSuchAlgorithmException, AddressException, MessagingException { + + WikittyProxy proxy = BowProxy.getInstance(); + + Preference preference = changePreference(request, session); + proxy.store(preference); + + User newUser = proxy.restore(User.class, user.getWikittyId()); + newUser = changeUser(request, newUser); newUser = proxy.store(newUser); session.setAttribute("user", newUser); @@ -1157,7 +1166,7 @@ } } - private void actionReIndexation(HttpServletRequest request, HttpSession session, User user) { + protected void actionReIndexation(HttpServletRequest request, HttpSession session, User user) { WikittyProxy proxy = BowProxy.getInstance(); proxy.getWikittyService().syncEngin(proxy.getSecurityToken()); } Modified: trunk/src/main/java/org/chorem/bow/OpenSearchActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/OpenSearchActions.java 2010-07-27 15:30:23 UTC (rev 101) +++ trunk/src/main/java/org/chorem/bow/OpenSearchActions.java 2010-07-27 16:13:51 UTC (rev 102) @@ -84,7 +84,7 @@ public void setBookmarkList(List<Bookmark> bookmarks) { if (bookmarks != null) { - List<Bookmark> newList = new ArrayList(bookmarks); + List<Bookmark> newList = new ArrayList<Bookmark>(bookmarks); bookmarkList = newList; } }