From scm@users.chorem.org Sat Nov 28 07:55:54 2015
From: "chorem.org scm" <scm@users.chorem.org>
To: lima-commits@list.chorem.org
Subject: [Lima-commits] 02/04: fixes #1243 la sortie du champ date ou le clic
 sur une autre action entraine bien la prise en compte des dates saisies
Date: Sat, 28 Nov 2015 07:55:54 +0100
Message-ID: <20151128065554.68B5F5D17AC@goh.codelutin.com>
In-Reply-To: <20151128065552.30099.29733@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3973975686554671998=="

--===============3973975686554671998==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script.

New commit to branch feature/1242-no-account-research-exception in repository=
 lima.

See http://git.chorem.org/lima.git

commit ae8502c6e4ead0749acab5d1b714228efbc35370
Author: dcosse <cosse@codelutin.com>
Date:   Tue Jun 30 16:55:21 2015 +0200

    fixes #1243 la sortie du champ date ou le clic sur une autre action entra=
ine bien la prise en compte des dates saisies
---
 .../org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx | 2 +-
 .../ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx | 7 ++++-=
--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition=
/DateConditionView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/=
dateCondition/DateConditionView.jaxx
index 93e365c..7c7168f 100644
--- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateCo=
nditionView.jaxx
+++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateCo=
nditionView.jaxx
@@ -39,5 +39,5 @@
   <JAXXDatePicker id=3D'datePicker'
                   date=3D'{handler.getDate()}'
                   formats=3D'{handler.getFormats()}'
-                  onActionPerformed=3D'handler.setDate(datePicker.getDate())=
'/>
+                  onPropertyChange=3D'handler.setDate(datePicker.getDate())'=
/>
 </JInternalFrame>
diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalC=
ondition/DateIntervalConditionView.jaxx b/lima-swing/src/main/java/org/chorem=
/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx
index a5fa4f6..bf261b6 100644
--- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalConditio=
n/DateIntervalConditionView.jaxx
+++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalConditio=
n/DateIntervalConditionView.jaxx
@@ -28,7 +28,8 @@
     org.chorem.lima.beans.DateCondition
   </import>
   <DateIntervalConditionHandler id=3D"handler"
-                                javaBean=3D"new DateIntervalConditionHandler=
(this)"/>
+                                constructorParams=3D"this"/>
+
   <Table>
     <row>
       <cell>
@@ -38,7 +39,7 @@
         <JAXXDatePicker id=3D'beginDatePicker'
                         date=3D'{handler.getBeginDate()}'
                         formats=3D'{handler.getFormats()}'
-                        onActionPerformed=3D'handler.setBeginDate(beginDateP=
icker.getDate())'/>
+                        onPropertyChange=3D'handler.setBeginDate(beginDatePi=
cker.getDate())'/>
       </cell>
     </row>
     <row>
@@ -49,7 +50,7 @@
         <JAXXDatePicker id=3D'endDatePicker'
                         date=3D'{handler.getEndDate()}'
                         formats=3D'{handler.getFormats()}'
-                        onActionPerformed=3D'handler.setEndDate(endDatePicke=
r.getDate())'/>
+                        onPropertyChange=3D'handler.setEndDate(endDatePicker=
.getDate())'/>
       </cell>
     </row>
   </Table>

--=20
To stop receiving notification emails like this one, please contact
chorem.org SCM administrator <admin+scm@chorem.org>.

--===============3973975686554671998==--


From scm@users.chorem.org Sat Nov 28 07:55:54 2015
From: "chorem.org scm" <scm@users.chorem.org>
To: lima-commits@list.chorem.org
Subject: [Lima-commits] branch feature/1242-no-account-research-exception
 updated (5cf4e25 -> 79ebf7d)
Date: Sat, 28 Nov 2015 07:55:52 +0100
Message-ID: <20151128065552.30099.29733@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2360101899648162783=="

--===============2360101899648162783==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script.

New change to branch feature/1242-no-account-research-exception in repository=
 lima.

See http://git.chorem.org/lima.git

  discards  5cf4e25   refs #1242 Refactoring pour plus de lisibilit=C3=A9
  discards  c5f4901   refs #1242 Modification pour plus de lisibilit=C3=A9 su=
ite =C3=A0 revue de code Kevin
  discards  559a100   fixes #1243 la sortie du champ date ou le clic sur une =
autre action entraine bien la prise en compte des dates saisies
  discards  5966078   refs #1242 verifivation que l'on filtre bien sur un com=
pte
      adds  0112481   refs #1290 A la cr=C3=A9ation d'une transaction si aucu=
ne n'a =C3=A9t=C3=A9 cr=C3=A9=C3=A9e lors de la m=C3=AAme session est qu'une =
transaction est s=C3=A9lectionn=C3=A9e alors la nouvelle trasaction prend la =
date de celle-ci
      adds  d100451   refs #1289 calcul de la colonne Solde dans l'onglet rec=
herche des entr=C3=A9es
      adds  acefd82   refs #1289refactoring
      adds  32aa3f8   refs #1289 Le solde est positif si le solde est d=C3=A9=
biteur
      adds  13b9893   Merge branch 'feature/1289-SearchEntriescomputeSold' in=
to develop
      adds  26111c4   refs #1293 "Onglet Saisie des =C3=A9critures" La saisie=
 dans le champ jour est dirrectement prise en compte
      adds  54e25dd   refs #1293 Auto selection du compte si un seul compte c=
orrespond =C3=A0 la recherche
      adds  785fc80   refs #1295 M=C3=AAme objet s=C3=A9lectionn=C3=A9 entre =
la combobox et le model
      adds  c51843f   Merge branch 'feature/1295-improveEditEntryView' into d=
evelop
      adds  2d2c8a4   refs #1241 ordonne les entr=C3=A9e par date
      adds  8ef9bf6   refs #1286 Regrouppement des entr=C3=A9es par pi=C3=A8c=
es comptable dans la saisie d'=C3=A9criture
      adds  bce1075   refs #1286 La solution adopter n'est pas id=C3=A9ale, i=
l faudra revoir le model pour ordonn=C3=A9e les entr=C3=A9e d'une transaction=
 voir ref #1207
      adds  4bbfd4d   Merge branch 'feature/1286-ordered-entries' into develop
       new  636a5ba   refs #1242 verifivation que l'on filtre bien sur un com=
pte
       new  ae8502c   fixes #1243 la sortie du champ date ou le clic sur une =
autre action entraine bien la prise en compte des dates saisies
       new  2dc6345   refs #1242 Modification pour plus de lisibilit=C3=A9 su=
ite =C3=A0 revue de code Kevin
       new  79ebf7d   refs #1242 Refactoring pour plus de lisibilit=C3=A9

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (5cf4e25)
            \
             N -- N -- N   refs/heads/feature/1242-no-account-research-except=
ion (79ebf7d)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omits" are not gone; other references still
refer to them.  Any revisions marked "discards" are gone forever.

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Detailed log of new commits:

commit 79ebf7d220ed2688a10b0ad1e421fabd7d706e2c
Author: dcosse <cosse@codelutin.com>
Date:   Mon Sep 28 17:15:06 2015 +0200

    refs #1242 Refactoring pour plus de lisibilit=C3=A9

commit 2dc6345cdd1916ea9f90e358e407dd02efd60f41
Author: dcosse <cosse@codelutin.com>
Date:   Mon Sep 28 16:43:18 2015 +0200

    refs #1242 Modification pour plus de lisibilit=C3=A9 suite =C3=A0 revue d=
e code Kevin

commit ae8502c6e4ead0749acab5d1b714228efbc35370
Author: dcosse <cosse@codelutin.com>
Date:   Tue Jun 30 16:55:21 2015 +0200

    fixes #1243 la sortie du champ date ou le clic sur une autre action entra=
ine bien la prise en compte des dates saisies

commit 636a5ba8c0db0f3bc3fd6675c69b6abc108541cd
Author: dcosse <cosse@codelutin.com>
Date:   Mon Jun 29 14:49:57 2015 +0200

    refs #1242 verifivation que l'on filtre bien sur un compte

Summary of changes:
 .../ejb/FinancialTransactionServiceImpl.java       |  2 +-
 .../java/org/chorem/lima/entity/EntryTopiaDao.java | 19 +++++---
 .../lima/ui/celleditor/AccountTableCellEditor.java | 28 +++++++++--
 .../lima/ui/celleditor/DayTableCellEditor.java     | 30 +++++-------
 .../ui/common/FinancialTransactionTableModel.java  | 56 ++++++++++++++++++++=
+-
 .../ui/financialtransaction/AccountColumn.java     |  4 ++
 .../ui/financialtransaction/BalanceColumn.java     | 35 +++++++++++---
 .../lima/ui/financialtransaction/DayColumn.java    |  6 ++-
 .../FinancialTransactionViewHandler.java           | 23 +++++++--
 .../FinancialTransactionSearchTableModel.java      | 15 ++++--
 pom.xml                                            |  2 +-
 11 files changed, 172 insertions(+), 48 deletions(-)
 copy lima-business-api/src/main/java/org/chorem/lima/LimaTechnicalException.=
java =3D> lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DayTableCell=
Editor.java (64%)

--=20
To stop receiving notification emails like this one, please contact
chorem.org SCM administrator <admin+scm@chorem.org>.

--===============2360101899648162783==--


From scm@users.chorem.org Sat Nov 28 07:55:54 2015
From: "chorem.org scm" <scm@users.chorem.org>
To: lima-commits@list.chorem.org
Subject: [Lima-commits] 01/04: refs #1242 verifivation que l'on filtre bien
	sur un compte
Date: Sat, 28 Nov 2015 07:55:53 +0100
Message-ID: <20151128065554.26B885C054A@goh.codelutin.com>
In-Reply-To: <20151128065552.30099.29733@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6091073132058851857=="

--===============6091073132058851857==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script.

New commit to branch feature/1242-no-account-research-exception in repository=
 lima.

See http://git.chorem.org/lima.git

commit 636a5ba8c0db0f3bc3fd6675c69b6abc108541cd
Author: dcosse <cosse@codelutin.com>
Date:   Mon Jun 29 14:49:57 2015 +0200

    refs #1242 verifivation que l'on filtre bien sur un compte
---
 .../lima/ui/Filter/AccountCondition/AccountConditionHandler.java       | 3 +=
+-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondit=
ion/AccountConditionHandler.java b/lima-swing/src/main/java/org/chorem/lima/u=
i/Filter/AccountCondition/AccountConditionHandler.java
index 4138fdc..e5ba896 100644
--- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/Acc=
ountConditionHandler.java
+++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/Acc=
ountConditionHandler.java
@@ -80,7 +80,8 @@ public class AccountConditionHandler implements ConditionHa=
ndler {
=20
     public void accountComboBoxChange(PropertyChangeEvent event) {
         if (event.getPropertyName().equals(AccountComboBox.PROPERTY_SELECTED=
_ITEM)) {
-            setAccount((Account) event.getNewValue());
+            Account account =3D event.getNewValue() =3D=3D null ? null : eve=
nt.getNewValue() instanceof Account ? (Account) event.getNewValue() : null;
+            setAccount(account);
         }
     }
 }

--=20
To stop receiving notification emails like this one, please contact
chorem.org SCM administrator <admin+scm@chorem.org>.

--===============6091073132058851857==--


From scm@users.chorem.org Sat Nov 28 07:55:54 2015
From: "chorem.org scm" <scm@users.chorem.org>
To: lima-commits@list.chorem.org
Subject: [Lima-commits]  03/04: refs #1242 Modification pour plus de 
 =?utf-8?q?lisibilit=C3=A9?= suite =?utf-8?q?=C3=A0?= revue de code Kevin
Date: Sat, 28 Nov 2015 07:55:55 +0100
Message-ID: <20151128065554.A41455D17D8@goh.codelutin.com>
In-Reply-To: <20151128065552.30099.29733@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6271283356851354799=="

--===============6271283356851354799==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script.

New commit to branch feature/1242-no-account-research-exception in repository=
 lima.

See http://git.chorem.org/lima.git

commit 2dc6345cdd1916ea9f90e358e407dd02efd60f41
Author: dcosse <cosse@codelutin.com>
Date:   Mon Sep 28 16:43:18 2015 +0200

    refs #1242 Modification pour plus de lisibilit=C3=A9 suite =C3=A0 revue d=
e code Kevin
---
 .../lima/ui/Filter/AccountCondition/AccountConditionHandler.java     | 5 +++=
+-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondit=
ion/AccountConditionHandler.java b/lima-swing/src/main/java/org/chorem/lima/u=
i/Filter/AccountCondition/AccountConditionHandler.java
index e5ba896..0dd92ed 100644
--- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/Acc=
ountConditionHandler.java
+++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/Acc=
ountConditionHandler.java
@@ -80,7 +80,10 @@ public class AccountConditionHandler implements ConditionH=
andler {
=20
     public void accountComboBoxChange(PropertyChangeEvent event) {
         if (event.getPropertyName().equals(AccountComboBox.PROPERTY_SELECTED=
_ITEM)) {
-            Account account =3D event.getNewValue() =3D=3D null ? null : eve=
nt.getNewValue() instanceof Account ? (Account) event.getNewValue() : null;
+            Account account =3D null;
+            if (event.getNewValue() !=3D null && event.getNewValue() instanc=
eof Account) {
+                account =3D (Account) event.getNewValue();
+            }
             setAccount(account);
         }
     }

--=20
To stop receiving notification emails like this one, please contact
chorem.org SCM administrator <admin+scm@chorem.org>.

--===============6271283356851354799==--


From scm@users.chorem.org Sat Nov 28 07:55:55 2015
From: "chorem.org scm" <scm@users.chorem.org>
To: lima-commits@list.chorem.org
Subject: [Lima-commits]  04/04: refs #1242 Refactoring pour plus de 
 =?utf-8?q?lisibilit=C3=A9?=
Date: Sat, 28 Nov 2015 07:55:56 +0100
Message-ID: <20151128065554.F0A985D1826@goh.codelutin.com>
In-Reply-To: <20151128065552.30099.29733@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5710201150839324964=="

--===============5710201150839324964==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script.

New commit to branch feature/1242-no-account-research-exception in repository=
 lima.

See http://git.chorem.org/lima.git

commit 79ebf7d220ed2688a10b0ad1e421fabd7d706e2c
Author: dcosse <cosse@codelutin.com>
Date:   Mon Sep 28 17:15:06 2015 +0200

    refs #1242 Refactoring pour plus de lisibilit=C3=A9
---
 .../ui/financialtransaction/AccountColumn.java     | 44 +++++++++++++++-----=
--
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction=
/AccountColumn.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtr=
ansaction/AccountColumn.java
index e8484d0..a76504d 100644
--- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/Accoun=
tColumn.java
+++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/Accoun=
tColumn.java
@@ -50,19 +50,20 @@ public class AccountColumn extends AbstractColumn<Financi=
alTransactionTableModel
     @Override
     public boolean setValueAt(Object value, int row) {
         Entry entry =3D tableModel.get(row);
-        // In case of Account field being feed up but no account was selected
-        //  the value is a String instead of Account.
-        Account account =3D value =3D=3D null ? null : value instanceof Acco=
unt ? (Account) value : null;
-        boolean update =3D ((entry.getAccount()) =3D=3D null !=3D (account =
=3D=3D null))
-                || (entry.getAccount() !=3D null
-                    && !entry.getAccount().getAccountNumber().equals(account=
.getAccountNumber()));
+
+        Account selectedAccount =3D getSelectedAccount(value);
+        Account previousAccount =3D entry.getAccount();
+
+        boolean update =3D isValueChange(selectedAccount, previousAccount);
+
         if (update) {
-            Account previousAccount =3D entry.getAccount();
-            entry.setAccount(account);
-            if (!tableModel.updateEntry(entry)) {
-                update =3D revertAccountChange(entry, previousAccount);
+            entry.setAccount(selectedAccount);
+            boolean updateSucceed =3D !tableModel.updateEntry(entry);
+            if (updateSucceed) {
+                setDescriptionFieldIfNone(entry, selectedAccount);
             } else {
                 setDescriptionFieldIfNone(entry, account);
+                update =3D revertAccountChange(entry, previousAccount);
             }
         }
=20
@@ -70,15 +71,32 @@ public class AccountColumn extends AbstractColumn<Financi=
alTransactionTableModel
     }
=20
     protected void setDescriptionFieldIfNone(Entry entry, Account account) {
+    protected Account getSelectedAccount(Object value) {
+        Account newAccount =3D  null;
+        if (value !=3D null && value instanceof Account) {
+            newAccount =3D (Account) value;
+        }
+        return newAccount;
+    }
+
+    protected boolean isValueChange(Account newAccount, Account previousAcco=
unt) {
+        boolean update;
+        if (previousAccount =3D=3D null) {
+            update =3D newAccount !=3D null;
+        } else {
+            update =3D newAccount =3D=3D null || !previousAccount.getAccount=
Number().equals(newAccount.getAccountNumber());
+        }
+        return update;
+    }
+
+    protected void setDescriptionFieldIfNone(Entry entry, Account account) {
         if (StringUtils.isBlank(entry.getDescription()) && account !=3D null=
 && StringUtils.isNotBlank(account.getLabel())) {
             entry.setDescription(account.getLabel());
         }
     }
=20
     protected boolean revertAccountChange(Entry entry, Account previousAccou=
nt) {
-        boolean update;
         entry.setAccount(previousAccount);
-        update =3D false;
-        return update;
+        return false;
     }
 }

--=20
To stop receiving notification emails like this one, please contact
chorem.org SCM administrator <admin+scm@chorem.org>.

--===============5710201150839324964==--