Index: lams_tool_images/db/sql/create_lams_tool_imageGallery.sql =================================================================== diff -u -rf6a03ee21a18654d54498cd94d9f68fbea3b996a -rde59f382658daefe4f6679aaaea621284d1c72cc --- lams_tool_images/db/sql/create_lams_tool_imageGallery.sql (.../create_lams_tool_imageGallery.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) +++ lams_tool_images/db/sql/create_lams_tool_imageGallery.sql (.../create_lams_tool_imageGallery.sql) (revision de59f382658daefe4f6679aaaea621284d1c72cc) @@ -5,7 +5,7 @@ drop table if exists tl_laimag10_image_comment; drop table if exists tl_laimag10_image_rating; drop table if exists tl_laimag10_image_vote; -drop table if exists tl_laimag10_imageGallery_item_visit_log; +drop table if exists tl_laimag10_item_log; drop table if exists tl_laimag10_session; drop table if exists tl_laimag10_user; drop table if exists tl_laimag10_configuration; Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageGalleryItemVisitDAO.java =================================================================== diff -u -r7dac65b89adddab2b602b5d57d8e3ddd4cab2060 -rde59f382658daefe4f6679aaaea621284d1c72cc --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageGalleryItemVisitDAO.java (.../ImageGalleryItemVisitDAO.java) (revision 7dac65b89adddab2b602b5d57d8e3ddd4cab2060) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageGalleryItemVisitDAO.java (.../ImageGalleryItemVisitDAO.java) (revision de59f382658daefe4f6679aaaea621284d1c72cc) @@ -24,7 +24,6 @@ package org.lamsfoundation.lams.tool.imageGallery.dao; import java.util.List; -import java.util.Map; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItemVisitLog; Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageVoteDAO.java =================================================================== diff -u -rd135b890fdc2d5b58c6bd02c48c8b3365d9a2ffe -rde59f382658daefe4f6679aaaea621284d1c72cc --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageVoteDAO.java (.../ImageVoteDAO.java) (revision d135b890fdc2d5b58c6bd02c48c8b3365d9a2ffe) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageVoteDAO.java (.../ImageVoteDAO.java) (revision de59f382658daefe4f6679aaaea621284d1c72cc) @@ -23,8 +23,6 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.imageGallery.dao; -import java.util.List; - import org.lamsfoundation.lams.tool.imageGallery.model.ImageVote; /** Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemDAOHibernate.java =================================================================== diff -u -r5d9ada1b3b139591dc6f1fffec04990beb727522 -rde59f382658daefe4f6679aaaea621284d1c72cc --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemDAOHibernate.java (.../ImageGalleryItemDAOHibernate.java) (revision 5d9ada1b3b139591dc6f1fffec04990beb727522) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemDAOHibernate.java (.../ImageGalleryItemDAOHibernate.java) (revision de59f382658daefe4f6679aaaea621284d1c72cc) @@ -37,6 +37,7 @@ return this.getHibernateTemplate().find(FIND_AUTHORING_ITEMS, imageGalleryUid); } + @Override public ImageGalleryItem getByUid(Long imageGalleryItemUid) { return (ImageGalleryItem) this.getObject(ImageGalleryItem.class, imageGalleryItemUid); } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemVisitDAOHibernate.java =================================================================== diff -u -r7dac65b89adddab2b602b5d57d8e3ddd4cab2060 -rde59f382658daefe4f6679aaaea621284d1c72cc --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemVisitDAOHibernate.java (.../ImageGalleryItemVisitDAOHibernate.java) (revision 7dac65b89adddab2b602b5d57d8e3ddd4cab2060) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemVisitDAOHibernate.java (.../ImageGalleryItemVisitDAOHibernate.java) (revision de59f382658daefe4f6679aaaea621284d1c72cc) @@ -23,14 +23,10 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.imageGallery.dao.hibernate; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.lamsfoundation.lams.tool.imageGallery.dao.ImageGalleryItemVisitDAO; -import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallery; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItemVisitLog; -import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallerySession; public class ImageGalleryItemVisitDAOHibernate extends BaseDAOHibernate implements ImageGalleryItemVisitDAO { Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.java =================================================================== diff -u -rcba500cc787cfc127fa1dbfdea56b368bbe5c388 -rde59f382658daefe4f6679aaaea621284d1c72cc --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.java (.../ImageGallerySession.java) (revision cba500cc787cfc127fa1dbfdea56b368bbe5c388) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.java (.../ImageGallerySession.java) (revision de59f382658daefe4f6679aaaea621284d1c72cc) @@ -24,7 +24,6 @@ package org.lamsfoundation.lams.tool.imageGallery.model; import java.util.Date; -import java.util.Set; import org.apache.log4j.Logger; Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ResizePictureUtil.java =================================================================== diff -u -r989e4b47442b99cfcdf170f565a1b0c4c69fb03c -rde59f382658daefe4f6679aaaea621284d1c72cc --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ResizePictureUtil.java (.../ResizePictureUtil.java) (revision 989e4b47442b99cfcdf170f565a1b0c4c69fb03c) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ResizePictureUtil.java (.../ResizePictureUtil.java) (revision de59f382658daefe4f6679aaaea621284d1c72cc) @@ -34,8 +34,6 @@ import javax.imageio.ImageIO; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.tool.imageGallery.service.ImageGalleryException; -import org.lamsfoundation.lams.tool.imageGallery.service.ImageGalleryServiceImpl; import org.lamsfoundation.lams.tool.imageGallery.service.UploadImageGalleryFileException; /** Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java =================================================================== diff -u -re9a15f092fec282a10620269d12e833465367444 -rde59f382658daefe4f6679aaaea621284d1c72cc --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java (.../LearningAction.java) (revision e9a15f092fec282a10620269d12e833465367444) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java (.../LearningAction.java) (revision de59f382658daefe4f6679aaaea621284d1c72cc) @@ -27,7 +27,6 @@ import java.sql.Timestamp; import java.util.ArrayList; import java.util.Date; -import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.TreeSet; Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/servlet/ExportServlet.java =================================================================== diff -u -r4b47f86b588e38c9e7e9f2760c75f775cb080831 -rde59f382658daefe4f6679aaaea621284d1c72cc --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/servlet/ExportServlet.java (.../ExportServlet.java) (revision 4b47f86b588e38c9e7e9f2760c75f775cb080831) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/servlet/ExportServlet.java (.../ExportServlet.java) (revision de59f382658daefe4f6679aaaea621284d1c72cc) @@ -27,7 +27,6 @@ import java.io.File; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -46,7 +45,6 @@ import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.imageGallery.ImageGalleryConstants; import org.lamsfoundation.lams.tool.imageGallery.dto.ReflectDTO; -import org.lamsfoundation.lams.tool.imageGallery.dto.Summary; import org.lamsfoundation.lams.tool.imageGallery.dto.UserImageContributionDTO; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallery; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem; Index: lams_tool_images/web/includes/javascript/jquery.galleria.js =================================================================== diff -u -r989e4b47442b99cfcdf170f565a1b0c4c69fb03c -rde59f382658daefe4f6679aaaea621284d1c72cc --- lams_tool_images/web/includes/javascript/jquery.galleria.js (.../jquery.galleria.js) (revision 989e4b47442b99cfcdf170f565a1b0c4c69fb03c) +++ lams_tool_images/web/includes/javascript/jquery.galleria.js (.../jquery.galleria.js) (revision de59f382658daefe4f6679aaaea621284d1c72cc) @@ -291,7 +291,7 @@ var _wrapper = $('.galleria_wrapper'); // get the thumb - var _thumb = $('.galleria img[@rel="'+_src+'"]'); + var _thumb = $('.galleria img[rel="'+_src+'"]'); if (_src) { @@ -365,11 +365,11 @@ } }, next : function() { - var _next = $($$.nextSelector($('.galleria img[@rel="'+$.galleria.current+'"]').parents('li'))).find('img').attr('rel'); + var _next = $($$.nextSelector($('.galleria img[rel="'+$.galleria.current+'"]').parents('li'))).find('img').attr('rel'); $.galleria.activate(_next); }, prev : function() { - var _prev = $($$.previousSelector($('.galleria img[@rel="'+$.galleria.current+'"]').parents('li'))).find('img').attr('rel'); + var _prev = $($$.previousSelector($('.galleria img[rel="'+$.galleria.current+'"]').parents('li'))).find('img').attr('rel'); $.galleria.activate(_prev); } } Index: lams_tool_images/web/pages/export/exportportfolio.jsp =================================================================== diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -rde59f382658daefe4f6679aaaea621284d1c72cc --- lams_tool_images/web/pages/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 35a0e719d061c08b52e705135bb2f2126079ed21) +++ lams_tool_images/web/pages/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision de59f382658daefe4f6679aaaea621284d1c72cc) @@ -21,7 +21,7 @@