Author: mallon Date: 2012-07-06 09:57:01 +0200 (Fri, 06 Jul 2012) New Revision: 3495 Url: http://chorem.org/repositories/revision/lima/3495 Log: Correction pour la d?\195?\169s?\195?\169lection de lignes quand : - une ?\195?\169criture lettr?\195?\169e est s?\195?\169lectionn?\195?\169e, puis une non-lettr?\195?\169e s?\195?\169lectionn?\195?\169e ?\195?\160 son tour. - un filtre est utilis?\195?\169. refs #681 Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 2012-07-05 16:31:54 UTC (rev 3494) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 2012-07-06 07:57:01 UTC (rev 3495) @@ -154,10 +154,16 @@ // no line selected or line selected different of the current if (isSelectionEmpty() || currentEntry != null || !currentLettring.equals(entryAt.getLettering())){ - + if (log.isInfoEnabled()) { + log.info("First"); + } //Test not null for currentEntry cause of selection before of entry without letter - if (currentEntry != null){ + if (currentEntry != null && currentLettring==null){ + if (log.isInfoEnabled()) { + log.info("First_A"); + } super.clearSelection(); + currentEntry = null; debitTotal = BigDecimal.ZERO; creditTotal = BigDecimal.ZERO; soldeTotal = BigDecimal.ZERO; @@ -179,8 +185,15 @@ //no line selected or line selected different of the current //Test null for currentEntry cause of selection before entry with letter if (isSelectionEmpty() || currentEntry == null || !currentEntry.equals(entryAt)){ + if (log.isInfoEnabled()) { + log.info("Second"); + } if (currentEntry == null && currentLettring != null){ + if (log.isInfoEnabled()) { + log.info("Second_A"); + } super.clearSelection(); + currentLettring = null; debitTotal = BigDecimal.ZERO; creditTotal = BigDecimal.ZERO; soldeTotal = BigDecimal.ZERO; @@ -260,10 +273,4 @@ // do nothing } - @Override - public void clearSelection() { - // do nothing - } - - } 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-05 16:31:54 UTC (rev 3494) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-06 07:57:01 UTC (rev 3495) @@ -184,6 +184,7 @@ } } view.getModelUi().resetDebitCreditBalance(); + view.getModelUi().clearSelection(); } /** @@ -198,6 +199,7 @@ comboBox.setSelectedIndex(row - 1); } view.getModelUi().resetDebitCreditBalance(); + view.getModelUi().clearSelection(); } /** @@ -213,6 +215,7 @@ comboBox.setSelectedIndex(row + 1); } view.getModelUi().resetDebitCreditBalance(); + view.getModelUi().clearSelection(); } public void setBeginDate(Date date) { @@ -245,12 +248,6 @@ } } - /*public void nonConsecutiveSelection(int[] selectedRows){ - for (int row : selectedRows){ - view.getTable().addRowSelectionInterval(row, row); - } - }*/ - @Override public void notifyMethod(String serviceName, String methodeName) { }