Cantharella-commits

Download

cantharella-commits@list.forge.codelutin.com

February 2013

3 participants
101 discussions

r66 - in trunk: cantharella.service/src/main/java/nc/ird/cantharella/service/config cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl cantharella.utils/src/main/java/nc/ird/module/utils cantharella.utils/src/test/java/nc/ird/module/utils cantharella.web/src/main/java/nc/ird/cantharella/web/utils/links
by acheype＠users.forge.codelutin.com 04 Feb '13

04 Feb '13

Author: acheype Date: 2013-02-04 01:22:15 +0100 (Mon, 04 Feb 2013) New Revision: 66 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/66 Log: fix some warnings Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java trunk/cantharella.utils/src/main/java/nc/ird/module/utils/PasswordTools.java trunk/cantharella.utils/src/test/java/nc/ird/module/utils/CoordToolsTest.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/links/CsvExportLink.java Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java 2013-01-29 09:48:04 UTC (rev 65) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java 2013-02-04 00:22:15 UTC (rev 66) @@ -93,7 +93,7 @@ * mailActivated getter * @return mailActivated */ - public static final boolean isMailActivated() { + public static boolean isMailActivated() { return mailActivated; } @@ -101,7 +101,7 @@ * mailActivated setter * @param mailActivated mailActivated */ - public static final void setMailActivated(boolean mailActivated) { + public static void setMailActivated(boolean mailActivated) { ServiceContext.mailActivated = mailActivated; } Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java 2013-01-29 09:48:04 UTC (rev 65) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java 2013-02-04 00:22:15 UTC (rev 66) @@ -72,6 +72,7 @@ @Resource private SessionFactory sessionFactory; + @Override public void reIndex() { long before = System.currentTimeMillis(); if (LOG.isInfoEnabled()) { @@ -90,11 +91,13 @@ LOG.info("Lucene index rebuilded in " + (after-before) + " ms"); } } catch (InterruptedException e) { + LOG.error(e.toString()); e.printStackTrace(); } } @Override + @SuppressWarnings("unchecked") public SearchResult search(String strQuery, Utilisateur utilisateur) { SearchResult result = new SearchResult(); Modified: trunk/cantharella.utils/src/main/java/nc/ird/module/utils/PasswordTools.java =================================================================== --- trunk/cantharella.utils/src/main/java/nc/ird/module/utils/PasswordTools.java 2013-01-29 09:48:04 UTC (rev 65) +++ trunk/cantharella.utils/src/main/java/nc/ird/module/utils/PasswordTools.java 2013-02-04 00:22:15 UTC (rev 66) @@ -67,6 +67,7 @@ * @param password Password * @return Hashed password */ + @SuppressWarnings("deprecation") public static String sha1(String password) { AssertTools.assertNotNull(password); return DigestUtils.shaHex(password); Modified: trunk/cantharella.utils/src/test/java/nc/ird/module/utils/CoordToolsTest.java =================================================================== --- trunk/cantharella.utils/src/test/java/nc/ird/module/utils/CoordToolsTest.java 2013-01-29 09:48:04 UTC (rev 65) +++ trunk/cantharella.utils/src/test/java/nc/ird/module/utils/CoordToolsTest.java 2013-02-04 00:22:15 UTC (rev 66) @@ -24,12 +24,12 @@ import java.math.BigDecimal; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; /** * Coordonnate tools test + * * @author Mickael Tricot * @author Adrien Cheype */ Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/links/CsvExportLink.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/links/CsvExportLink.java 2013-01-29 09:48:04 UTC (rev 65) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/links/CsvExportLink.java 2013-02-04 00:22:15 UTC (rev 66) @@ -41,9 +41,13 @@ public class CsvExportLink<T> extends Link<Void> { + /** For serializable methods */ + private static final long serialVersionUID = 20130204L; + /** Date format for download filename. */ private static final DateFormat FILENAME_DF = new SimpleDateFormat("yyyy_MM_dd-HH_mm-"); - + + private final DataTable<T> table; private final String filename; @@ -94,6 +98,7 @@ writer.close(); } + @SuppressWarnings("unchecked") private List<ExportableColumn<T>> getExportableColumns() { List<ExportableColumn<T>> exportable = new ArrayList<ExportableColumn<T>>(table.getColumns().size()); for (IColumn<?> column : table.getColumns()) {

1 0