Author: dcosse Date: 2014-08-09 01:25:18 +0200 (Sat, 09 Aug 2014) New Revision: 3908 Url: http://forge.chorem.org/projects/lima/repository/revisions/3908 Log: add serial ids Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountTopiaDao.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AccountTableCellEditor.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryBookTableCellEditor.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/CellRouteHorizontalAction.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/CellRouteVerticalAction.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/LabelListCellRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/TableModelWithGroup.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountTopiaDao.java 2014-08-08 22:53:39 UTC (rev 3907) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountTopiaDao.java 2014-08-08 23:25:18 UTC (rev 3908) @@ -52,9 +52,7 @@ Iterator<Account> itAccount = allAccounts.iterator(); while (itAccount.hasNext()) { Account acc = itAccount.next(); - Iterator<Account> itAccount2 = allAccounts.iterator(); - while (itAccount2.hasNext()) { - Account acc2 = itAccount2.next(); + for (Account acc2 : allAccounts) { if (!acc2.getAccountNumber().equals(acc.getAccountNumber()) && acc2.getAccountNumber().startsWith(acc.getAccountNumber())) { itAccount.remove(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AccountTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AccountTableCellEditor.java 2014-08-08 22:53:39 UTC (rev 3907) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AccountTableCellEditor.java 2014-08-08 23:25:18 UTC (rev 3908) @@ -61,7 +61,7 @@ protected static final long serialVersionUID = 1L; - protected volatile boolean keyPressed; + protected volatile boolean keyPressed = false; /** constructor */ public AccountTableCellEditor() { @@ -91,8 +91,8 @@ * Vérifie si la cellule peut être éditable : * seulement si il y a une frappe au clavier ou un double clic. * - * @param evt - * @return + * @param evt the event + * @return true celle is editable otherwise not. */ @Override public boolean isCellEditable(EventObject evt) { @@ -115,7 +115,8 @@ } } keyPressed = false; - return !(evt instanceof MouseEvent) || ((MouseEvent) evt).getClickCount() == 1; + boolean result = !(evt instanceof MouseEvent) || ((MouseEvent) evt).getClickCount() == 1; + return result; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryBookTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryBookTableCellEditor.java 2014-08-08 22:53:39 UTC (rev 3907) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryBookTableCellEditor.java 2014-08-08 23:25:18 UTC (rev 3908) @@ -110,8 +110,8 @@ * Vérifie si la cellule peut être éditable : * seulement si il y a une frappe au clavier ou un double clic. * - * @param evt - * @return + * @param evt the event + * @return true, cell is editable otherwise not. */ @Override public boolean isCellEditable(EventObject evt) { @@ -135,7 +135,8 @@ } // Remet à faux pour la premiere lettre tapée au clavier keyPressed = false; - return !(evt instanceof MouseEvent) || ((MouseEvent) evt).getClickCount() == 1; + boolean result = !(evt instanceof MouseEvent) || ((MouseEvent) evt).getClickCount() == 1; + return result; } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java 2014-08-08 22:53:39 UTC (rev 3907) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java 2014-08-08 23:25:18 UTC (rev 3908) @@ -40,7 +40,8 @@ * @author Sylvain Bavencoff <bavencoff@codelutin.com> */ public abstract class AbstractLimaTableModel<E> extends AbstractTableModel { - + + private static final long serialVersionUID = -1125159257823536360L; protected List<E> values; protected List<Column<AbstractLimaTableModel<E>>> columns; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/CellRouteHorizontalAction.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/CellRouteHorizontalAction.java 2014-08-08 22:53:39 UTC (rev 3907) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/CellRouteHorizontalAction.java 2014-08-08 23:25:18 UTC (rev 3908) @@ -33,6 +33,7 @@ */ public class CellRouteHorizontalAction extends AbstractAction{ + private static final long serialVersionUID = 6178936082032645524L; JTable table; protected int step; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/CellRouteVerticalAction.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/CellRouteVerticalAction.java 2014-08-08 22:53:39 UTC (rev 3907) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/CellRouteVerticalAction.java 2014-08-08 23:25:18 UTC (rev 3908) @@ -31,6 +31,8 @@ */ public class CellRouteVerticalAction extends CellRouteHorizontalAction { + private static final long serialVersionUID = -4984679970177484506L; + public CellRouteVerticalAction(JTable table, boolean nextCell) { super(table, nextCell); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/LabelListCellRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/LabelListCellRenderer.java 2014-08-08 22:53:39 UTC (rev 3907) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/LabelListCellRenderer.java 2014-08-08 23:25:18 UTC (rev 3908) @@ -35,6 +35,8 @@ */ public class LabelListCellRenderer extends BasicComboBoxRenderer { + private static final long serialVersionUID = -8893748200888932142L; + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/TableModelWithGroup.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/TableModelWithGroup.java 2014-08-08 22:53:39 UTC (rev 3907) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/TableModelWithGroup.java 2014-08-08 23:25:18 UTC (rev 3908) @@ -29,6 +29,8 @@ */ public abstract class TableModelWithGroup<E> extends AbstractLimaTableModel<E> { + private static final long serialVersionUID = 2349944168938847283L; + public int indexGroupAt(int row) { int countGroup = 0; E precedingValue = get(0); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java 2014-08-08 22:53:39 UTC (rev 3907) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java 2014-08-08 23:25:18 UTC (rev 3908) @@ -52,7 +52,6 @@ Account account = (Account) value; boolean update = ((entry.getAccount()) == null != (account == null)) || (entry.getAccount() != null - && account != null && !entry.getAccount().getAccountNumber().equals(account.getAccountNumber())); if (update) { Account previousAccount = entry.getAccount(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java 2014-08-08 22:53:39 UTC (rev 3907) +++ trunk/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java 2014-08-08 23:25:18 UTC (rev 3908) @@ -136,7 +136,7 @@ email.setSubject("Project error notification : Lima"); // message description - StringBuffer message = new StringBuffer(); + StringBuilder message = new StringBuilder(); message.append(formatMessage("Project", "Lima " + config.getVersion())); message.append(formatMessage("Date", new Date().toString())); message.append(formatMessage("Title", errorInfo.getTitle())); @@ -149,7 +149,7 @@ for (String propertyName : propertiesNames) { // security, don't send string containing password : if (!propertyName.contains("pass")) { - message.append("\t" + propertyName + " : " + config.getOptions().getProperty(propertyName) + "\n"); + message.append("\t").append(propertyName).append(" : ").append(config.getOptions().getProperty(propertyName)).append("\n"); } } @@ -160,6 +160,7 @@ message.append(formatMessage("Exception", out.toString())); // send mail + email.setMsg(message.toString()); email.send(); JOptionPane.showMessageDialog(null, "A report message has been sent to " + emailTo);