Author: mallon Date: 2012-07-11 15:02:26 +0200 (Wed, 11 Jul 2012) New Revision: 3513 Url: http://chorem.org/repositories/revision/lima/3513 Log: fixes #688 Correction des modeles de s?\195?\169lection, de filtre, du handler et du fichier jaxx, afin de finaliser les fonctionnalit?\195?\169s du panneau de lettrage. Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/UnlettringSelectionModel.java trunk/lima-swing/src/main/resources/log4j.properties Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-07-10 16:18:41 UTC (rev 3512) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-07-11 13:02:26 UTC (rev 3513) @@ -206,7 +206,7 @@ " and E.financialTransaction.transactionDate between :beginDate and :endDate " + " order by F.transactionDate, F." + FinancialTransaction.TOPIA_CREATE_DATE; - entries = context.findAll(query, "account", filter.getAccount(), "beginDate", filter.getBeginDate(), "endDate", filter.getEndDate()); + entries = context.findAll(query, "account", filter.getAccount(), "beginDate", filter.getFiscalDateFilter().getDateStart(), "endDate", filter.getFiscalDateFilter().getDateEnd()); return entries; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java 2012-07-10 16:18:41 UTC (rev 3512) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java 2012-07-11 13:02:26 UTC (rev 3513) @@ -1,5 +1,10 @@ package org.chorem.lima.ui.lettering; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; import java.math.BigDecimal; /** @@ -7,8 +12,22 @@ */ public class LetteringEditModel { + public static final String DEBIT_PROPERTY = "debit"; + + public static final String CREDIT_PROPERTY = "credit"; + + public static final String SOLDE_PROPERTY = "solde"; + + public static final String LETTRER_PROPERTY = "lettrer"; + + public static final String DELETTRER_PROPERTY = "delettrer"; + + protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); + private static final Log log = LogFactory.getLog(LetteringViewHandler.class); + + protected LetteringTableModel model; protected boolean lettred; - protected boolean unLettred = true; //By default, present unLettred entries + protected boolean unLettred; protected BigDecimal debit = BigDecimal.ZERO; protected BigDecimal credit = BigDecimal.ZERO; protected BigDecimal solde = BigDecimal.ZERO; @@ -18,7 +37,19 @@ } public void setLettred(boolean lettred) { - this.lettred = lettred; + boolean oldLettrer = isLettred(); + if(lettred && (solde == BigDecimal.ZERO || solde.intValue() == 0)){ + this.lettred = lettred; + if (log.isInfoEnabled()) { + log.info("Lettred true"); + } + }else{ + this.lettred = false; + if (log.isInfoEnabled()) { + log.info("Lettred false"); + } + } + firePropertyChange(LETTRER_PROPERTY, oldLettrer, this.lettred); } public boolean isUnLettred() { @@ -26,7 +57,9 @@ } public void setUnLettred(boolean unLettred) { + boolean oldDelettrer = isUnLettred(); this.unLettred = unLettred; + firePropertyChange(DELETTRER_PROPERTY, oldDelettrer, this.unLettred); } public BigDecimal getDebit() { @@ -34,7 +67,15 @@ } public void setDebit(BigDecimal debit) { - this.debit = debit; + BigDecimal oldDebit = getDebit(); + + if (debit != BigDecimal.ZERO){ + this.debit = debit.add(oldDebit); + }else{ + this.debit = BigDecimal.ZERO; + } + + firePropertyChange(DEBIT_PROPERTY, oldDebit, this.debit); } public BigDecimal getCredit() { @@ -42,20 +83,84 @@ } public void setCredit(BigDecimal credit) { - this.credit = credit; + BigDecimal oldCredit = getCredit(); + + if (credit != BigDecimal.ZERO){ + this.credit = credit.add(oldCredit); + }else{ + this.credit=BigDecimal.ZERO; + } + + firePropertyChange(CREDIT_PROPERTY, oldCredit, this.credit); } public BigDecimal getSolde() { return solde; } - public void setSolde(BigDecimal solde) { - this.solde = solde; + public void setSolde(BigDecimal solde, boolean credit) { + BigDecimal oldSolde = getSolde(); + + if (solde != BigDecimal.ZERO){ + if (credit){ + this.solde = oldSolde.subtract(solde); + }else{ + this.solde = oldSolde.add(solde); + } + }else{ + this.solde=BigDecimal.ZERO; + } + + firePropertyChange(SOLDE_PROPERTY, oldSolde, this.solde); } + //Allow to add / subtract credit / debit and balance + public void balanceCalcultation(BigDecimal amount, boolean debit){ + + BigDecimal debitVal = debit ? amount : BigDecimal.ZERO; + BigDecimal creditVal = debit ? BigDecimal.ZERO : amount; + + if (debitVal == BigDecimal.ZERO){ + + if (creditVal != BigDecimal.ZERO){ + setCredit(creditVal); + setSolde(creditVal, true); + } + }else if (creditVal == BigDecimal.ZERO){ + setDebit(debitVal); + setSolde(debitVal, false); + }else{ + resetDebitCreditBalance(); + } + } + public void resetDebitCreditBalance(){ setDebit(BigDecimal.ZERO); setCredit(BigDecimal.ZERO); - setSolde(BigDecimal.ZERO); + setSolde(BigDecimal.ZERO, false); } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + pcs.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + pcs.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.removePropertyChangeListener(propertyName, listener); + } + + protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { + pcs.firePropertyChange(propertyName, oldValue, newValue); + } + + protected void firePropertyChange(String propertyName, Object newValue) { + firePropertyChange(propertyName, null, newValue); + } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java 2012-07-10 16:18:41 UTC (rev 3512) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java 2012-07-11 13:02:26 UTC (rev 3513) @@ -6,6 +6,7 @@ import org.chorem.lima.entity.Entry; import javax.swing.*; +import java.util.ArrayList; import java.util.List; /** @@ -15,16 +16,23 @@ private static final Log log = LogFactory.getLog(LetteringViewHandler.class); protected LetteringTableModel letteringTableModel; + protected LetteringEditModel editModel; protected int lineSelected; + protected List<Integer> selectedRows; //Modele de selection du tableau lors de la selection d une entree lettree - public LetteringSelectionModel(LetteringTableModel letteringTableModel) { + public LetteringSelectionModel(LetteringTableModel letteringTableModel, LetteringEditModel editModel) { this.letteringTableModel = letteringTableModel; + this.editModel = editModel; + editModel.resetDebitCreditBalance(); } @Override public void setSelectionInterval(int row, int column){ + selectedRows = new ArrayList<Integer>(); + this.clearSelection(); + lineSelected = row; String currentLettring = getCurrentLettring(); if (log.isInfoEnabled()) { @@ -34,7 +42,6 @@ //FIXME allon 10-07-12 : problème de rafraichissement très long setValueIsAdjusting(true); - super.clearSelection(); try { //select entries with the same letter of the selected entry for(Entry entry : getEntries()){ @@ -42,14 +49,35 @@ if (entry.getLettering().equals(currentLettring)){ int entryToSelect = letteringTableModel.getIndexOfEntry(entry); super.addSelectionInterval(entryToSelect, entryToSelect); + selectedRows.add(entryToSelect); } } } } finally { setValueIsAdjusting(false); } + updateBalanceAndLetteringButton(false); } + /**PropertyChange on editModel in the handler, and, there, + * set values it. + * */ + public void updateBalanceAndLetteringButton(boolean lettering){ + + editModel.resetDebitCreditBalance(); + for (int row : selectedRows){ + + Entry entryAt = letteringTableModel.getEntryAt(row); + + //Set values for calculation (By LetteringEditModel) of balance + editModel.balanceCalcultation(entryAt.getAmount(), entryAt.getDebit()); + } + + //For U.I. buttons (Lettering and unlettering) + editModel.setUnLettred(!lettering); + editModel.setLettred(lettering); + } + public List<Entry> getEntries(){ return letteringTableModel.getEntries(); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2012-07-10 16:18:41 UTC (rev 3512) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2012-07-11 13:02:26 UTC (rev 3513) @@ -38,13 +38,13 @@ <LetteringViewHandler id="handler" constructorParams="this"/> <LetteringTableModel id="tableModel"/> - <LetteringEditModel id='letteringEditModel'/> + <LetteringEditModel id='editModel'/> <LetteringFilter id='filterModel' initializer='new LetteringFilterImpl()'/> - <LetteringSelectionModel id='letteringSelectionModel' constructorParams='tableModel'/> - <UnlettringSelectionModel id='unletteringSelectionModel' constructorParams='tableModel'/> + <LetteringSelectionModel id='letteringSelectionModel' constructorParams='tableModel, editModel'/> + <UnlettringSelectionModel id='unletteringSelectionModel' constructorParams='tableModel, editModel'/> <LettringAndUnlettringSelectionModel id='lettringAndUnlettringSelectionModel' - constructorParams='letteringSelectionModel, unletteringSelectionModel, tableModel'/> + constructorParams='letteringSelectionModel, unletteringSelectionModel, tableModel, editModel'/> <script> <![CDATA[ @@ -87,7 +87,7 @@ </cell> <cell> <JXDatePicker id="pickerDebut" - onActionPerformed="filterModel.setBeginDate(pickerDebut.getDate())"/> + onActionPerformed="filterModel.getFiscalDateFilter().setDateStart(pickerDebut.getDate())"/> </cell> </row> <row> @@ -96,7 +96,7 @@ </cell> <cell> <JXDatePicker id="pickerFin" - onActionPerformed="filterModel.setEndDate(pickerFin.getDate())"/> + onActionPerformed="filterModel.getFiscalDateFilter().setDateEnd(pickerFin.getDate())"/> </cell> </row> </Table> @@ -155,15 +155,15 @@ <JLabel text="lima.ui.lettering.selectEntry"/> </cell> <cell fill="horizontal" weightx="0.25"> - <JTextField id="debitTexttField" editable="false" text="{getLetteringEditModel().getDebit().toString()}" + <JTextField id="debitTexttField" editable="false" text="{editModel.getDebit().toString()}" focusable="false"/> </cell> <cell fill="horizontal" weightx="0.25"> - <JTextField id="creditTextField" editable="false" text="{getLetteringEditModel().getCredit().toString()}" + <JTextField id="creditTextField" editable="false" text="{editModel.getCredit().toString()}" focusable="false"/> </cell> <cell fill="horizontal" weightx="0.25"> - <JTextField id="soldeTextField" editable="false" text="{getLetteringEditModel().getSolde().toString()}" + <JTextField id="soldeTextField" editable="false" text="{editModel.getSolde().toString()}" focusable="false"/> </cell> </row> @@ -176,10 +176,10 @@ <cell anchor="center" columns='4'> <JPanel id="actionsPanel"> <JButton id="lettered" text="lima.ui.lettering.buttonLettered" - enabled="{getLetteringEditModel().isLettred()}" + enabled="{editModel.isLettred()}" onActionPerformed="handler.addLetter()"/> <JButton id="noLettered" text="lima.ui.lettering.buttonNoLettered" - enabled="{getLetteringEditModel().isUnLettred()}" + enabled="{editModel.isUnLettred()}" onActionPerformed="handler.removeLetter()"/> </JPanel> </cell> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-10 16:18:41 UTC (rev 3512) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-11 13:02:26 UTC (rev 3513) @@ -28,8 +28,8 @@ import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.lima.beans.DateFilterImpl; import org.chorem.lima.beans.LetteringFilter; -import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.business.api.FinancialPeriodService; @@ -41,11 +41,8 @@ import org.chorem.lima.service.LimaServiceFactory; import javax.swing.*; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -60,7 +57,7 @@ * Last update : $Date$ * By : $Author$ */ -public class LetteringViewHandler implements ServiceListener, ListSelectionListener { +public class LetteringViewHandler{ private static final Log log = LogFactory.getLog(LetteringViewHandler.class); @@ -74,6 +71,7 @@ protected FinancialTransactionService financialTransactionService; protected EntryBookService entryBookService; protected LetteringFilter filter; + protected LetteringEditModel editModel; public LetteringViewHandler(LetteringView view) { this.view = view; @@ -90,6 +88,8 @@ */ public void init() { filter = view.getFilterModel(); + filter.setFiscalDateFilter(new DateFilterImpl()); + editModel=view.getEditModel(); loadComboAndRows(); filter.addPropertyChangeListener(new PropertyChangeListener() { @@ -99,9 +99,32 @@ if (log.isInfoEnabled()) { log.info("Filter changing..."); } + editModel.resetDebitCreditBalance(); updateAllEntries(); } }); + + //FIXME Allon-11/07/2012 : mettre simplement deux dates au niveau de 'LetteringFilter' + //pour eviter d'avoir a poser un propertyChange supplementaire sur le 'DateFilter' + filter.getFiscalDateFilter().addPropertyChangeListener(new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (log.isInfoEnabled()) { + log.info("Filter changing..."); + } + editModel.resetDebitCreditBalance(); + updateAllEntries(); + } + }); + + editModel.addPropertyChangeListener(new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + updateBalanceAndLetteringButton(); + } + }); } public void loadComboAndRows(){ @@ -148,8 +171,9 @@ log.debug("Val select letter : " + view.getLetteredCheckGroup().getSelectedButton().getName()); - filter.setBeginDate(defaultDateBegFiscalPeriod); - filter.setEndDate(defaultDateEndCurrent); + filter.getFiscalDateFilter().setDateStart(defaultDateBegFiscalPeriod); + filter.getFiscalDateFilter().setDateEnd(defaultDateEndCurrent); + filter.setDisplayUnlettred(true); updateAllEntries(); @@ -189,10 +213,21 @@ log.info("Nb entries model : " + view.getTableModel().getNumberOfEntries()); } } - view.getLetteringEditModel().resetDebitCreditBalance(); + view.getEditModel().resetDebitCreditBalance(); view.getLettringAndUnlettringSelectionModel().clearSelection(); } + public void updateBalanceAndLetteringButton(){ + view.creditTextField.setText(editModel.getCredit().toString()); + view.debitTexttField.setText(editModel.getDebit().toString()); + view.soldeTextField.setText(editModel.getSolde().toString()); + view.lettered.setEnabled(editModel.isLettred()); + view.noLettered.setEnabled(editModel.isUnLettred()); + if (log.isInfoEnabled()) { + log.info("updateBalanceAndLetteringButton"); + } + } + /** * Select previous value in combo box. * @@ -232,13 +267,13 @@ public void addLetter() { String newLetters = financialTransactionService.getNextLetters(); changeLetter(newLetters); - view.getLetteringEditModel().setLettred(false); + view.getEditModel().setLettred(false); } /**Remove a group of three letters to n entries*/ public void removeLetter() { changeLetter(null); - view.getLetteringEditModel().setUnLettred(false); + view.getEditModel().setUnLettred(false); } /**Add or remove a group of three letters to n entries*/ @@ -248,40 +283,8 @@ view.getTableModel().updateLettersSelectedEntries(entrieSelected, newLetters); for (int indexEntry : entrieSelected){ - financialTransactionService.updateEntry(view.getTableModel().getEntryAt(indexEntry)); + financialTransactionService.updateEntry(view.getTableModel().getEntryAt(indexEntry)); } } - @Override - public void valueChanged(ListSelectionEvent e) { - // calcul solde et boutons lettrer/delettrer actif/inactif sur changement de ligne selectionnee - - LetteringEditModel editModel = view.getLetteringEditModel(); - - int[] numEntriesSelected = view.getTable().getSelectedRows(); - Entry entry = null; - for(int numEntry : numEntriesSelected){ - entry = view.getTableModel().getEntryAt(numEntry); - boolean debitSelected = entry.getDebit(); - BigDecimal amountSelected = entry.getAmount(); - BigDecimal debit = debitSelected ? amountSelected : BigDecimal.ZERO; - BigDecimal credit = debitSelected ? BigDecimal.ZERO : amountSelected; - editModel.setDebit(editModel.getDebit().add(debit)); - editModel.setCredit(editModel.getCredit().add(credit)); - editModel.setSolde(editModel.getSolde().add(debit.subtract(credit))); - } - - if (entry != null){ - if (!entry.getLettering().isEmpty()){ - editModel.setUnLettred(true); - }else if (editModel.getSolde()==BigDecimal.ZERO){ - editModel.setLettred(true); - } - } - } - - @Override - public void notifyMethod(String serviceName, String methodeName) { - //To change body of implemented methods use File | Settings | File Templates. - } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java 2012-07-10 16:18:41 UTC (rev 3512) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java 2012-07-11 13:02:26 UTC (rev 3513) @@ -2,6 +2,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.lima.entity.Entry; import javax.swing.*; import javax.swing.event.ListSelectionListener; @@ -15,12 +16,17 @@ protected LetteringSelectionModel letteringSelectionModel; protected UnlettringSelectionModel unlettringSelectionModel; protected LetteringTableModel letteringTableModel; + protected LetteringEditModel editModel; protected ListSelectionModel delegate; + protected Entry entry; - public LettringAndUnlettringSelectionModel(LetteringSelectionModel letteringSelectionModel, UnlettringSelectionModel unlettringSelectionModel, LetteringTableModel letteringTableModel) { + public LettringAndUnlettringSelectionModel(LetteringSelectionModel letteringSelectionModel, + UnlettringSelectionModel unlettringSelectionModel, + LetteringTableModel letteringTableModel, LetteringEditModel letteringEditModel){ this.letteringSelectionModel = letteringSelectionModel; this.unlettringSelectionModel = unlettringSelectionModel; this.letteringTableModel = letteringTableModel; + this.editModel = letteringEditModel; delegate = unlettringSelectionModel; } @@ -28,7 +34,14 @@ @Override public void setSelectionInterval(int row, int column) { - delegate=(!letteringNotExist(row)?letteringSelectionModel:unlettringSelectionModel); + if (!letteringNotExist(row)) { + delegate = letteringSelectionModel; + } + else { + delegate = unlettringSelectionModel; + } + + editModel.resetDebitCreditBalance(); delegate.setSelectionInterval(row, column); } @@ -36,8 +49,8 @@ /**return true if lettering is null, or not null but empty*/ public boolean letteringNotExist(int row){ boolean emptyOrNull; - - String lettering = letteringTableModel.getEntryAt(row).getLettering(); + entry = letteringTableModel.getEntryAt(row); + String lettering = entry.getLettering(); emptyOrNull = (lettering==null||lettering.isEmpty()); return emptyOrNull; @@ -138,14 +151,4 @@ delegate.removeListSelectionListener(x); } - /**clear the selection of the current using model*/ - /*@Override - public void clearSelection(){ - if (letteringSelectionModel.getSelectedValues().size() == 0) { - letteringSelectionModel.clearSelection(); - }else{ - unlettringSelectionModel.clearSelection(); - } - }*/ - } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/UnlettringSelectionModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/UnlettringSelectionModel.java 2012-07-10 16:18:41 UTC (rev 3512) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/UnlettringSelectionModel.java 2012-07-11 13:02:26 UTC (rev 3513) @@ -2,6 +2,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.lima.entity.Entry; import javax.swing.*; import java.util.ArrayList; @@ -12,11 +13,14 @@ private static final Log log = LogFactory.getLog(LetteringViewHandler.class); protected LetteringTableModel letteringTableModel; protected List<Integer> selectedRows; + protected LetteringEditModel editModel; //Modele de selection du tableau lors de la selection d une entree non lettree - public UnlettringSelectionModel(LetteringTableModel letteringTableModel) { + public UnlettringSelectionModel(LetteringTableModel letteringTableModel, LetteringEditModel editModel) { this.letteringTableModel = letteringTableModel; + this.editModel = editModel; selectedRows = new ArrayList<Integer>(); + editModel.resetDebitCreditBalance(); } @Override @@ -30,6 +34,7 @@ deleteLine(row); super.removeSelectionInterval(row, column); } + updateBalanceAndLetteringButton(true); } /** @@ -60,6 +65,36 @@ return false; } + /**PropertyChange on editModel in the handler, and, there, + * set values it. + * */ + public void updateBalanceAndLetteringButton(boolean lettering){ + editModel.resetDebitCreditBalance(); + + if (log.isInfoEnabled()) { + log.info("size of selectedRows (>?) : " + selectedRows.size()); + } + + //treatment unuseful if no rows are selected + if (selectedRows.size() != 0){ + for (int row : selectedRows){ + Entry entryAt = letteringTableModel.getEntryAt(row); + + //Set values for calculation (By LetteringEditModel) of balance + editModel.balanceCalcultation(entryAt.getAmount(), entryAt.getDebit()); + } + //For U.I. buttons (Lettering and unlettering) + editModel.setUnLettred(!lettering); + editModel.setLettred(lettering); + }else{ + + editModel.setLettred(!lettering); + if (log.isInfoEnabled()) { + log.info("size of selectedRows : " + selectedRows.size()); + } + } + } + @Override public int getSelectionMode() { return MULTIPLE_INTERVAL_SELECTION; Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-07-10 16:18:41 UTC (rev 3512) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-07-11 13:02:26 UTC (rev 3513) @@ -46,4 +46,6 @@ log4j.logger.org.chorem.lima.ui.lettering.LetteringTableModel=DEBUG log4j.logger.org.chorem.lima.ui.lettering.LetteringModelUi=DEBUG log4j.logger.org.chorem.lima.ui.lettering.LettringAndUnlettringSelectionModel=DEBUG -log4j.logger.org.chorem.lima.ui.lettering.LetteringSelectionModel=DEBUG \ No newline at end of file +log4j.logger.org.chorem.lima.ui.lettering.LetteringSelectionModel=DEBUG +log4j.logger.org.chorem.lima.ui.lettering.UnletteringSelectionModel=DEBUG +log4j.logger.org.chorem.lima.ui.lettering.LetteringEditModel=DEBUG \ No newline at end of file