From scm@users.chorem.org Wed Sep 30 14:50:09 2015
From: "chorem.org scm" <scm@users.chorem.org>
To: lima-commits@list.chorem.org
Subject: [Lima-commits]  01/01: refs #1268 =?utf-8?q?d=C3=A9placement?= des
 models du jaxx au handler
Date: Wed, 30 Sep 2015 14:50:10 +0200
Message-ID: <20150930125009.A87045D19CE@goh.codelutin.com>
In-Reply-To: <20150930125009.19015.322@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2114988292308898568=="

--===============2114988292308898568==
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/1293-addAccountViewerTab in repository lima.

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

commit f1dace88844af43a6a57029f8966ad186a70a2c0
Author: dcosse <cosse@codelutin.com>
Date:   Wed Sep 30 14:49:39 2015 +0200

    refs #1268 d=C3=A9placement des models du jaxx au handler
---
 .../lima/ui/accountViewer/AccountViewerView.jaxx   |  22 +---
 .../ui/accountViewer/AccountViewerViewHandler.java | 120 +++++++++++++++----=
--
 2 files changed, 89 insertions(+), 53 deletions(-)

diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/Accoun=
tViewerView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/=
AccountViewerView.jaxx
index d03a614..a1c21f0 100644
--- a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewer=
View.jaxx
+++ b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewer=
View.jaxx
@@ -24,22 +24,12 @@
         java.awt.FlowLayout
         java.awt.Dimension
         org.chorem.lima.util.WrapToolBarLayout
-        org.chorem.lima.ui.common.FinancialPeriodComboBoxModel
-        org.chorem.lima.util.BigDecimalToString
-        org.chorem.lima.ui.lettering.TypeEntry
-        org.chorem.lima.entity.Account
-        javax.swing.ListSelectionModel
-        org.jdesktop.swingx.JXDatePicker
         static org.nuiton.i18n.I18n.t
         org.chorem.lima.ui.combobox.AccountComboBox
-        org.chorem.lima.ui.LimaRendererUtil
-        org.chorem.lima.entity.FinancialPeriod
     </import>
=20
     <AccountViewerViewHandler id=3D"handler" constructorParams=3D"this"/>
=20
-    <AccountViewerEditModel id=3D'editModel'/>
-
     <script>
         <![CDATA[
           void $afterCompleteSetup() {
@@ -72,14 +62,10 @@
=20
         <JLabel id=3D"beginPeriodLabel"/>
=20
-        <org.chorem.lima.ui.common.FiscalPeriodComboBoxModel id=3D"fiscalPer=
iodComboBoxModel"/>
         <JComboBox id=3D"fiscalPeriodComboBox"
-                   model=3D"{fiscalPeriodComboBoxModel}"
                    onItemStateChanged=3D"handler.onFiscalPeriodChange(event)=
"/>
=20
-        <org.chorem.lima.ui.common.FinancialPeriodComboBoxModel id=3D"financ=
ialPeriodComboBoxModel"/>
         <JComboBox id=3D"financialPeriodComboBox"
-                   model=3D"{financialPeriodComboBoxModel}"
                    onItemStateChanged=3D"handler.onFinancialPeriodChange(eve=
nt)"/>
=20
         <JAXXDatePicker id=3D"beginPeriodPicker"
@@ -119,14 +105,8 @@
         </JPanel>
=20
         <JScrollPane constraints=3D"BorderLayout.CENTER">
-            <AccountViewerTableModel id=3D"tableModel"/>
-            <AccountViewerSelectionModel id=3D'accountViewerSelectionModel' =
constructorParams=3D'tableModel'
-                                         onValueChanged=3D"handler.balanceAn=
dActions()"/>
-
             <AccountViewerTable id=3D"table"
-                                constructorParams=3D"handler"
-                                model=3D"{tableModel}"
-                                selectionModel=3D"{accountViewerSelectionMod=
el}"/>
+                                constructorParams=3D"handler"/>
         </JScrollPane>
=20
         <JPanel constraints=3D"BorderLayout.SOUTH" layout=3D"{new BorderLayo=
ut()}">
diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/Accoun=
tViewerViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/account=
Viewer/AccountViewerViewHandler.java
index c425164..d79fbdc 100644
--- a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewer=
ViewHandler.java
+++ b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewer=
ViewHandler.java
@@ -41,10 +41,14 @@ import org.chorem.lima.entity.Entry;
 import org.chorem.lima.entity.FinancialPeriod;
 import org.chorem.lima.entity.FiscalPeriod;
 import org.chorem.lima.ui.combobox.AccountComboBox;
+import org.chorem.lima.ui.common.FinancialPeriodComboBoxModel;
+import org.chorem.lima.ui.common.FiscalPeriodComboBoxModel;
 import org.chorem.lima.util.BigDecimalToString;
 import org.chorem.lima.util.ErrorHelper;
=20
 import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
 import java.awt.event.ActionEvent;
 import java.awt.event.InputEvent;
 import java.awt.event.ItemEvent;
@@ -84,7 +88,11 @@ public class AccountViewerViewHandler {
=20
     protected AccountViewerFilter filter;
=20
+    protected AccountViewerTableModel accountViewerTableModel;
+    protected AccountViewerSelectionModel accountViewerSelectionModel;
     protected AccountViewerEditModel editModel;
+    protected FinancialPeriodComboBoxModel financialPeriodComboBoxModel;
+    protected FiscalPeriodComboBoxModel fiscalPeriodComboBoxModel;
=20
     protected ErrorHelper errorHelper;
=20
@@ -115,10 +123,50 @@ public class AccountViewerViewHandler {
      */
     public void init() {
         filter =3D new AccountViewerFilter();
-        editModel =3D view.getEditModel();
-        updateFinancialPeriodView();
+
+        createComponentsModels();
+
+        addModelsToComponents();
+
+        initAccountTableView();
+
+        addListeners();
+
+        initFinancialPeriodDefaultComponent();
+
         initSoldPeriodView();
=20
+        initializationComplete =3D true;
+
+        updateSoldStatus();
+    }
+
+    protected void createComponentsModels() {
+        editModel =3D new AccountViewerEditModel();
+        financialPeriodComboBoxModel =3D new FinancialPeriodComboBoxModel();
+        fiscalPeriodComboBoxModel =3D new FiscalPeriodComboBoxModel();
+        accountViewerTableModel =3D new AccountViewerTableModel();
+        accountViewerSelectionModel =3D new AccountViewerSelectionModel(acco=
untViewerTableModel);
+    }
+
+    protected void addModelsToComponents() {
+        view.getFinancialPeriodComboBox().setModel(financialPeriodComboBoxMo=
del);
+        view.getFiscalPeriodComboBox().setModel(fiscalPeriodComboBoxModel);
+        AccountViewerTable accountViewerTable =3D view.getTable();
+        accountViewerTable.setModel(accountViewerTableModel);
+        accountViewerTable.setSelectionModel(accountViewerSelectionModel);
+    }
+
+    protected void addListeners() {
+        accountViewerSelectionModel.addListSelectionListener(new ListSelecti=
onListener() {
+            @Override
+            public void valueChanged(ListSelectionEvent e) {
+                if (!e.getValueIsAdjusting()) {
+                    view.getHandler().balanceAndActions();
+                }
+            }
+        });
+
         editModel.addPropertyChangeListener(AccountViewerEditModel.PROPERTY_=
DEBIT, new PropertyChangeListener() {
             @Override
             public void propertyChange(PropertyChangeEvent evt) {
@@ -146,16 +194,19 @@ public class AccountViewerViewHandler {
                 updateSoldStatus();
             }
         });
+    }
=20
-        onSelectionModeChanged(selectionMode);
-
-        SwingUtil.fixTableColumnWidth(view.getTable(), 0, 100);
-        SwingUtil.fixTableColumnWidth(view.getTable(), 1, 60);
-        SwingUtil.fixTableColumnWidth(view.getTable(), 2, 80);
-        SwingUtil.fixTableColumnWidth(view.getTable(), 4, 50);
+    protected void initAccountTableView() {
+        AccountViewerTable accountViewerTable =3D view.getTable();
+        SwingUtil.fixTableColumnWidth(accountViewerTable, 0, 100);
+        SwingUtil.fixTableColumnWidth(accountViewerTable, 1, 60);
+        SwingUtil.fixTableColumnWidth(accountViewerTable, 2, 80);
+        SwingUtil.fixTableColumnWidth(accountViewerTable, 4, 50);
+    }
=20
-        initializationComplete =3D true;
-        updateSoldStatus();
+    protected void initFinancialPeriodDefaultComponent() {
+        updateFinancialPeriodView();
+        onSelectionModeChanged(selectionMode);
     }
=20
     protected void initShortCuts() {
@@ -243,7 +294,7 @@ public class AccountViewerViewHandler {
             if (row > 0) {
                 comboBox.setSelectedIndex(row - 1);
             }
-            view.getAccountViewerSelectionModel().clearSelection();
+            view.getTable().getSelectionModel().clearSelection();
         }
     }
=20
@@ -261,7 +312,7 @@ public class AccountViewerViewHandler {
             if (row < size - 1) {
                 comboBox.setSelectedIndex(row + 1);
             }
-            view.getAccountViewerSelectionModel().clearSelection();
+            view.getTable().getSelectionModel().clearSelection();
         }
     }
=20
@@ -271,8 +322,8 @@ public class AccountViewerViewHandler {
             if (PeriodChoice.FINANCIAL_PERIOD.equals(filter.getPeriodChoice(=
))) {
                 List<FinancialPeriod> periods =3D financialPeriodService.get=
FinancialPeriodsWithBeginDateWithin(selectedFiscalPeriod.getBeginDate(), sele=
ctedFiscalPeriod.getEndDate());
                 FinancialPeriod selectedFinancialPeriod =3D periods.get(0);
-                view.getFinancialPeriodComboBoxModel().setObjects(periods);
-                view.getFinancialPeriodComboBoxModel().setSelectedItem(selec=
tedFinancialPeriod);
+                financialPeriodComboBoxModel.setObjects(periods);
+                financialPeriodComboBoxModel.setSelectedItem(selectedFinanci=
alPeriod);
=20
                 setFilter(selectedFiscalPeriod, selectedFinancialPeriod, sel=
ectedFinancialPeriod.getBeginDate(), selectedFinancialPeriod.getEndDate(), Pe=
riodChoice.FINANCIAL_PERIOD);
             } else {
@@ -282,7 +333,7 @@ public class AccountViewerViewHandler {
         }
     }
=20
-    protected void onFinancialPeriodChange(java.awt.event.ItemEvent event) {
+    protected void onFinancialPeriodChange(ItemEvent event) {
         FinancialPeriod financialPeriod =3D (FinancialPeriod) event.getItem(=
);
         if (initializationComplete && filter.getFinancialPeriod() =3D=3D nul=
l || !filter.getFinancialPeriod().equals(financialPeriod)) {
             updateAllEntriesForFinancialPeriodChoice(financialPeriod);
@@ -317,16 +368,17 @@ public class AccountViewerViewHandler {
     }
=20
     public void onSelectionModeChanged(SelectionMode selectionMode) {
+        AccountViewerSelectionModel accountViewerSelectionModel =3D (Account=
ViewerSelectionModel) view.getTable().getSelectionModel();
=20
         switch (selectionMode) {
             case LETTERED:
-                view.getAccountViewerSelectionModel().setLetteredSelectionMo=
de(true);
+                accountViewerSelectionModel.setLetteredSelectionMode(true);
                 break;
             case MANUAL:
-                view.getAccountViewerSelectionModel().setLetteredSelectionMo=
de(false);
+                accountViewerSelectionModel.setLetteredSelectionMode(false);
                 break;
             default:
-                view.getAccountViewerSelectionModel().setLetteredSelectionMo=
de(true);
+                accountViewerSelectionModel.setLetteredSelectionMode(true);
         }
     }
=20
@@ -371,7 +423,8 @@ public class AccountViewerViewHandler {
                 && filter.getDateStart() !=3D null
                 && filter.getDateEnd() !=3D null) {
             List<Entry> entries =3D financialTransactionService.getAllEntrie=
ByDatesAndAccountAndLettering(filter);
-            view.getTableModel().setValues(entries);
+            AccountViewerTableModel accountViewerTableModel =3D (AccountView=
erTableModel) view.getTable().getModel();
+            accountViewerTableModel.setValues(entries);
=20
             updateSummary();
         }
@@ -472,12 +525,12 @@ public class AccountViewerViewHandler {
=20
     public void initFiscalPeriodView() {
         List<FiscalPeriod> fiscalPeriods =3D fiscalPeriodService.getAllFisca=
lPeriods();
-        view.getFiscalPeriodComboBoxModel().setObjects(fiscalPeriods);
+        fiscalPeriodComboBoxModel.setObjects(fiscalPeriods);
=20
         FiscalPeriod fiscalPeriod =3D fiscalPeriodService.getLastFiscalPerio=
d();
         if (fiscalPeriod !=3D null) {
             setFilter(fiscalPeriod, null, fiscalPeriod.getBeginDate(), fisca=
lPeriod.getEndDate(), PeriodChoice.FINANCIAL_PERIOD);
-            view.getFiscalPeriodComboBoxModel().setSelectedItem(fiscalPeriod=
);
+            fiscalPeriodComboBoxModel.setSelectedItem(fiscalPeriod);
             view.getFiscalPeriodComboBox().setVisible(true);
         }
     }
@@ -503,7 +556,7 @@ public class AccountViewerViewHandler {
         FinancialPeriod defaultFinancialPeriod =3D null;
         List<FinancialPeriod> financialPeriods =3D null;
         if (fiscalPeriod !=3D null) {
-            view.getFinancialPeriodComboBoxModel().removeAllElements();
+            financialPeriodComboBoxModel.removeAllElements();
=20
             financialPeriods =3D financialPeriodService.getFinancialPeriodsW=
ithBeginDateWithin(fiscalPeriod.getBeginDate(), fiscalPeriod.getEndDate());
=20
@@ -534,16 +587,16 @@ public class AccountViewerViewHandler {
=20
     protected void updateFinancialPeriodCombo(FinancialPeriod defaultFinanci=
alPeriod, List<FinancialPeriod> financialPeriods) {
         if (CollectionUtils.isNotEmpty(financialPeriods)) {
-            view.getFinancialPeriodComboBoxModel().setObjects(financialPerio=
ds);
-            view.getFinancialPeriodComboBoxModel().setSelectedItem(defaultFi=
nancialPeriod);
+            financialPeriodComboBoxModel.setObjects(financialPeriods);
+            financialPeriodComboBoxModel.setSelectedItem(defaultFinancialPer=
iod);
         }
     }
=20
     protected void initFiscalPeriodCombo() {
         List<FiscalPeriod> fiscalPeriods =3D fiscalPeriodService.getAllFisca=
lPeriods();
-        view.getFiscalPeriodComboBoxModel().setObjects(fiscalPeriods);
+        fiscalPeriodComboBoxModel.setObjects(fiscalPeriods);
         if (CollectionUtils.isNotEmpty(fiscalPeriods)) {
-            view.getFiscalPeriodComboBoxModel().setSelectedItem(fiscalPeriod=
s.get(fiscalPeriods.size() - 1));
+            fiscalPeriodComboBoxModel.setSelectedItem(fiscalPeriods.get(fisc=
alPeriods.size() - 1));
         }
         view.getFiscalPeriodComboBox().setVisible(true);
     }
@@ -609,8 +662,9 @@ public class AccountViewerViewHandler {
             log.debug("balanceAndActions");
         }
         onBalanceChanged(null);
+        AccountViewerSelectionModel accountViewerSelectionModel =3D (Account=
ViewerSelectionModel) view.getTable().getSelectionModel();
         if (view.getTable().getSelectedRows().length > 0 && !letteringNotExi=
st(view.getTable().getSelectedRow()) ||
-                view.getTable().getSelectedRows().length > 0 && !view.getAcc=
ountViewerSelectionModel().isSelectionEmpty()) {
+                view.getTable().getSelectedRows().length > 0 && !accountView=
erSelectionModel.isSelectionEmpty()) {
             setValuesForSelectedEntries();
         }
     }
@@ -622,7 +676,8 @@ public class AccountViewerViewHandler {
     public boolean letteringNotExist(int row){
         boolean emptyOrNull =3D false;
         if (row !=3D -1) {
-            Entry entry =3D view.getTableModel().get(row);
+            AccountViewerTableModel accountViewerTableModel =3D (AccountView=
erTableModel) view.getTable().getModel();
+            Entry entry =3D accountViewerTableModel.get(row);
             String lettering =3D entry.getLettering();
             emptyOrNull =3D (lettering=3D=3Dnull||lettering.isEmpty());
         }
@@ -631,10 +686,11 @@ public class AccountViewerViewHandler {
=20
     public void setValuesForSelectedEntries() {
         Entry selectedEntry;
-        AccountViewerTableModel tableModel =3D view.getTableModel();
-        for (int i =3D 0; i < tableModel.getRowCount(); i ++){
-            if (view.getAccountViewerSelectionModel().isSelectedIndex(i)){
-                selectedEntry =3D tableModel.get(i);
+        AccountViewerTableModel accountViewerTableModel =3D (AccountViewerTa=
bleModel) view.getTable().getModel();
+        AccountViewerSelectionModel accountViewerSelectionModel =3D (Account=
ViewerSelectionModel) view.getTable().getSelectionModel();
+        for (int i =3D 0; i < accountViewerTableModel.getRowCount(); i ++){
+            if (accountViewerSelectionModel.isSelectedIndex(i)){
+                selectedEntry =3D accountViewerTableModel.get(i);
                 //Set values for calculation (By AccountViewerEditModel) of =
balance
                 onBalanceChanged(selectedEntry);
             }

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

--===============2114988292308898568==--


From scm@users.chorem.org Wed Sep 30 14:50:09 2015
From: "chorem.org scm" <scm@users.chorem.org>
To: lima-commits@list.chorem.org
Subject: [Lima-commits] branch feature/1293-addAccountViewerTab updated
	(be0c2f3 -> f1dace8)
Date: Wed, 30 Sep 2015 14:50:09 +0200
Message-ID: <20150930125009.19015.322@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1327440697464583010=="

--===============1327440697464583010==
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/1293-addAccountViewerTab in repository lima.

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

      from  be0c2f3   refs #1293 Correction i18n
       new  f1dace8   refs #1268 d=C3=A9placement des models du jaxx au handl=
er

The 1 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 f1dace88844af43a6a57029f8966ad186a70a2c0
Author: dcosse <cosse@codelutin.com>
Date:   Wed Sep 30 14:49:39 2015 +0200

    refs #1268 d=C3=A9placement des models du jaxx au handler

Summary of changes:
 .../lima/ui/accountViewer/AccountViewerView.jaxx   |  22 +---
 .../ui/accountViewer/AccountViewerViewHandler.java | 120 +++++++++++++++----=
--
 2 files changed, 89 insertions(+), 53 deletions(-)

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

--===============1327440697464583010==--