From echatellier@users.chorem.org Fri Apr  9 18:12:23 2010
From: echatellier@users.chorem.org
To: lima-commits@list.chorem.org
Subject: [Lima-commits] r2841 -
	trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction
Date: Fri, 09 Apr 2010 18:12:23 +0200
Message-ID: <20100409161223.3F17815919@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7394427501591489299=="

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

Author: echatellier
Date: 2010-04-09 18:12:23 +0200 (Fri, 09 Apr 2010)
New Revision: 2841

Log:
Migration of transaction and lettering UI.

Added:
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/TransactionH=
elper.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/TransactionV=
iewHandler.java
Removed:
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/LetteringVie=
wImpl.java
Modified:
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/CriteriaWidg=
etImpl.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/LetteringVie=
w.jaxx
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/SearchTransa=
ctionView.jaxx
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/TransactionV=
iew.jaxx

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/Crite=
riaWidgetImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/CriteriaWid=
getImpl.java	2010-04-09 16:10:45 UTC (rev 2840)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/CriteriaWid=
getImpl.java	2010-04-09 16:12:23 UTC (rev 2841)
@@ -23,13 +23,13 @@
 import org.apache.commons.logging.LogFactory;
 import org.chorem.lima.LimaContext;
 import static org.nuiton.i18n.I18n._;
-import org.chorem.lima.combobox.JWideComboBox;
-import org.chorem.lima.combobox.model.AccountComboBoxModel;
 import org.chorem.lima.combobox.renderer.AccountComboBoxRenderer;
 import org.chorem.lima.dto.AccountDTO;
 import org.chorem.lima.item.Item;
 import org.chorem.lima.service.util.ServiceHelper;
-import org.chorem.lima.util.AccountToStringConverter;
+import org.chorem.lima.ui.transaction.autocomplete.AccountToStringConverter;
+import org.chorem.lima.ui.transaction.model.AccountComboBoxModel;
+import org.chorem.lima.widgets.JWideComboBox;
 import org.jdesktop.swingx.JXDatePicker;
 import org.jdesktop.swingx.autocomplete.AutoCompleteDecorator;
=20

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/Lette=
ringView.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/LetteringVi=
ew.jaxx	2010-04-09 16:10:45 UTC (rev 2840)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/LetteringVi=
ew.jaxx	2010-04-09 16:12:23 UTC (rev 2841)
@@ -15,95 +15,86 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  ##% -->
=20
-<Table insets=3D'0,0,0,0' fill=3D"both">
+<Table fill=3D"both">
     <script>
-        protected void addLettering() {};
-        protected void removeLettering() {};
-        protected void precedentAccount() {};
-        protected void nextAccount() {};
+    <![CDATA[
+        import org.chorem.lima.entity.Account;
+        import org.jdesktop.swingx.autocomplete.AutoCompleteDecorator;
+        import org.jdesktop.swingx.autocomplete.ObjectToStringConverter;
+
+        // Swingx auto complete (for account) :
+        AutoCompleteDecorator.decorate(accountComboBox, new ObjectToStringCo=
nverter() {
+            @Override
+            public String getPreferredStringForItem(Object item) {
+                if (item =3D=3D null) {
+                    return "";
+                }
+                Account account =3D (Account) item;
+                return account.getAccountNumber() + " : " + account.getLabel=
();
+            }
+        });
+
+        protected void addLettering() {
+            // never been implemented :(
+        };
+        protected void removeLettering() {
+            // never been implemented :(
+        };
+    ]]>
     </script>
-    <row weightx=3D"1" weighty=3D"0">
+    <row>
         <cell>
-            <!-- account -->
-            <Table insets=3D'0,0,0,0'>
-                <row weightx=3D"0" weighty=3D"0">
-                    <cell anchor=3D'center' weightx=3D"0" weighty=3D"0">
-                        <!-- precedent -->
-                        <JButton id=3D"precedentButton"
-                                 preferredSize=3D'{new Dimension(24,24)}'
-                                 verticalAlignment=3D'0'
-                                 verticalTextPosition=3D'0'
-                                 opaque=3D'true'
-                                 borderPainted=3D'false'
-                                 focusPainted=3D'false'
-                                 enabled=3D'true'
-                                 horizontalTextPosition=3D'0'
-                                 onActionPerformed=3D'precedentAccount()'
-                                />
-                    </cell>
-                    <cell anchor=3D'center' weightx=3D"0" weighty=3D"0">
-                        <!-- next -->
-                        <JButton id=3D"nextButton"
-                                 preferredSize=3D'{new Dimension(24,24)}'
-                                 verticalAlignment=3D'0'
-                                 verticalTextPosition=3D'0'
-                                 opaque=3D'true'
-                                 borderPainted=3D'false'
-                                 focusPainted=3D'false'
-                                 enabled=3D'true'
-                                 horizontalTextPosition=3D'0'
-                                 onActionPerformed=3D'nextAccount()'
-                                />
-                    </cell>
-                </row>
+            <Table>
                 <!-- account -->
-                <row fill=3D"horizontal" weightx=3D"1" weighty=3D"0" anchor=
=3D"center">
+                <row fill=3D"horizontal" weightx=3D"1" anchor=3D"center">
                     <cell anchor=3D"east">
                         <JLabel text=3D"lima.account"/>
                     </cell>
-                    <cell weightx=3D"0" weighty=3D"0">
-                        <JPanel id=3D"accountPanel"/>
+                    <cell>
+                        <org.chorem.lima.widgets.JWideComboBox id=3D"account=
ComboBox"
+                            model=3D"{new org.chorem.lima.ui.transaction.mod=
el.AccountComboBoxModel()}" />
                     </cell>
                 </row>
-                <!-- since -->
-                <row fill=3D"horizontal" weightx=3D"1" weighty=3D"0" anchor=
=3D"center">
+                <!-- from -->
+                <row fill=3D"horizontal" weightx=3D"1" anchor=3D"center">
                     <cell anchor=3D"east">
-                        <JLabel text=3D"lima.since"/>
+                        <JLabel text=3D"lima.lettering.from"/>
                     </cell>
                     <cell>
-                        <JPanel id=3D"sincePanel"/>
+                        <org.chorem.lima.widgets.JWideComboBox id=3D"fromPer=
iodComoboBox" />
                     </cell>
                 </row>
                 <!-- to -->
-                <row fill=3D"horizontal" weightx=3D"1" weighty=3D"0" anchor=
=3D"center">
+                <row fill=3D"horizontal" weightx=3D"1" anchor=3D"center">
                     <cell anchor=3D"east">
-                        <JLabel text=3D"lima.to"/>
+                        <JLabel text=3D"lima.lettering.to"/>
                     </cell>
                     <cell>
-                        <JPanel id=3D"toPanel"/>
+                        <org.chorem.lima.widgets.JWideComboBox id=3D"toPerio=
dComoboBox" />
                     </cell>
                 </row>
             </Table>
         </cell>
         <cell>
             <!-- entries -->
-            <Table insets=3D'0,0,0,0' fill=3D"both">
+            <Table fill=3D"both">
                 <row columns=3D"3">
                     <cell>
-                        <JLabel text=3D"lima.entries"/>
+                        <JLabel text=3D"lima.lettering.entries"/>
                     </cell>
                 </row>
                 <row>
                     <cell>
-                        <JRadioButton buttonGroup=3D'entryButtons' text=3D'l=
ima.lettered' value=3D'{_("lima.lettered")}'
-                                      selected=3D'true'/>
+                        <JRadioButton buttonGroup=3D'entryButtons' text=3D'l=
ima.lettering.lettered'
+                            value=3D'{_("lima.lettering.lettered")}' selecte=
d=3D'true'/>
                     </cell>
                     <cell>
-                        <JRadioButton buttonGroup=3D'entryButtons' text=3D'l=
ima.not.lettered'
-                                      value=3D'{_("lima.not.lettered")}'/>
+                        <JRadioButton buttonGroup=3D'entryButtons' text=3D'l=
ima.lettering.notlettered'
+                            value=3D'{_("lima.lettering.notlettered")}'/>
                     </cell>
                     <cell>
-                        <JRadioButton buttonGroup=3D'entryButtons' text=3D'l=
ima.all' value=3D'{_("lima.all")}'/>
+                        <JRadioButton buttonGroup=3D'entryButtons' text=3D'l=
ima.lettering.letteredall'
+                            value=3D'{_("lima.lettering.letteredall")}'/>
                     </cell>
                 </row>
             </Table>
@@ -111,18 +102,21 @@
     </row>
     <row columns=3D"2" weightx=3D"1" weighty=3D"1" anchor=3D"center" fill=3D=
"both">
         <cell>
-            <!-- table -->
-            <JScrollPane id=3D"tablePanel"/>
+            <JScrollPane>
+                <org.jdesktop.swingx.JXTable id=3D"letteringTable" />
+            </JScrollPane>
         </cell>
     </row>
     <row>
         <cell>
             <!-- add lettering -->
-            <JButton id=3D"addButton" text=3D"lima.add.lettering" onActionPe=
rformed=3D"addLettering()"/>
+            <JButton id=3D"addButton" text=3D"lima.lettering.add"
+                onActionPerformed=3D"addLettering()"/>
         </cell>
         <cell>
             <!-- remove lettering -->
-            <JButton id=3D"removeButton" text=3D"lima.remove.lettering" onAc=
tionPerformed=3D"removeLettering()"/>
+            <JButton id=3D"removeButton" text=3D"lima.lettering.remove"
+                onActionPerformed=3D"removeLettering()"/>
         </cell>
     </row>
 </Table>
\ No newline at end of file

Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/Letter=
ingViewImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/LetteringVi=
ewImpl.java	2010-04-09 16:10:45 UTC (rev 2840)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/LetteringVi=
ewImpl.java	2010-04-09 16:12:23 UTC (rev 2841)
@@ -1,127 +0,0 @@
-/**
- * *##% Lima Main
- * Copyright (C) 2008 CodeLutin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*
- */
-
-package org.chorem.lima.ui.transaction;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.chorem.lima.LimaContext;
-import org.chorem.lima.combobox.JWideComboBox;
-import org.chorem.lima.combobox.model.AccountComboBoxModel;
-import org.chorem.lima.combobox.renderer.AccountComboBoxRenderer;
-import org.chorem.lima.combobox.renderer.PeriodComboBoxRenderer;
-import org.chorem.lima.dto.AccountDTO;
-import org.chorem.lima.dto.PeriodDTO;
-import org.chorem.lima.service.util.ServiceHelper;
-import org.chorem.lima.util.AccountToStringConverter;
-import org.nuiton.util.Resource;
-import org.jdesktop.swingx.JXTable;
-import org.jdesktop.swingx.autocomplete.AutoCompleteDecorator;
-
-import javax.swing.*;
-import java.awt.*;
-import java.util.List;
-import java.util.Vector;
-
-import jaxx.runtime.JAXXContext;
-
-/**
- * @author ore
- */
-public class LetteringViewImpl extends LetteringView {
-
-  =20
-
-    /**
-     * log
-     */
-    private static final Log log =3D LogFactory.getLog(LetteringViewImpl.cla=
ss);
-    private final JWideComboBox accountComboBox;
-
-    /**
-     * @param parentContext
-     */
-    public LetteringViewImpl(JAXXContext parentContext) {
-        super(parentContext);
-
-        /** Calling services */
-        List<AccountDTO> accounts =3D ServiceHelper.getAllFlatAccount(
-                LimaContext.getContext().getDataManager().getAccountModel().=
getData());
-        /** Creating accounting model */
-        Vector<AccountDTO> v1 =3D new Vector<AccountDTO>(accounts);
-        AccountComboBoxModel model =3D new AccountComboBoxModel(v1);
-        accountComboBox =3D new JWideComboBox();
-        accountComboBox.setPreferredSize(new Dimension(200, 25));
-        accountComboBox.setModel(model);
-        LimaContext.getContext().getDataManager().getAccountModel().addPrope=
rtyChangeListener(model);
-        accountComboBox.setRenderer(AccountComboBoxRenderer.getInstance());
-        accountPanel.add(accountComboBox);
-
-        /** AutoCompletion */
-        AutoCompleteDecorator.decorate(accountComboBox, AccountToStringConve=
rter.getInstance());
-
-        Icon forwardIcon =3D Resource.getIcon("toolbarButtonGraphics/navigat=
ion/Forward24.gif");
-        Icon backIcon =3D Resource.getIcon("toolbarButtonGraphics/navigation=
/Back24.gif");
-        nextButton.setIcon(forwardIcon);
-        precedentButton.setIcon(backIcon);
-
-        /** Creating period model */
-        List<PeriodDTO> periodes =3D LimaContext.getContext().getNeogiaFacto=
ry().getPeriodService().getAllPeriod(
-                LimaContext.getContext().getNeogiaFactory().getStatusService=
().getAllStatus()
-        );
-        Vector<PeriodDTO> v2 =3D new Vector<PeriodDTO>();
-        for (PeriodDTO period : periodes) {
-            v2.addElement(period);
-            v2.addAll(period.getChildren());
-        }
-        JWideComboBox sinceComboBox =3D new JWideComboBox(v2);
-        sinceComboBox.setRenderer(PeriodComboBoxRenderer.getInstance());
-        sinceComboBox.setPreferredSize(new Dimension(200, 25));
-        sincePanel.add(sinceComboBox);
-
-        JWideComboBox toComboBox =3D new JWideComboBox(v2);
-        toComboBox.setRenderer(PeriodComboBoxRenderer.getInstance());
-        toComboBox.setPreferredSize(new Dimension(200, 25));
-        toPanel.add(toComboBox);
-
-        JXTable table =3D new JXTable();
-        tablePanel.setViewportView(table);
-    }
-
-    /**
-     *
-     */
-    @Override
-    protected void nextAccount() {
-        if (!(accountComboBox.getSelectedIndex() =3D=3D accountComboBox.getM=
odel().getSize() - 1)) {
-            accountComboBox.setSelectedIndex(accountComboBox.getSelectedInde=
x() + 1);
-        }
-
-    }
-
-    /**
-     *
-     */
-    @Override
-    protected void precedentAccount() {
-        if (!(accountComboBox.getSelectedIndex() =3D=3D 0)) {
-            accountComboBox.setSelectedIndex(accountComboBox.getSelectedInde=
x() - 1);
-        }
-    }
-}

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/Searc=
hTransactionView.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/SearchTrans=
actionView.jaxx	2010-04-09 16:10:45 UTC (rev 2840)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/SearchTrans=
actionView.jaxx	2010-04-09 16:12:23 UTC (rev 2841)
@@ -28,7 +28,7 @@
         <Table fill=3D"horizontal" insets=3D'5,5,5,5' anchor=3D"north" weigh=
ty=3D"1" weightx=3D"1">
             <row>
                 <cell>
-                    <JButton id=3D"addButton" text=3D"lima.add" width=3D"100=
" onActionPerformed=3D"addCriteriaWidget()"/>
+                    <JButton id=3D"addButton" text=3D"lima.common.add" width=
=3D"100" onActionPerformed=3D"addCriteriaWidget()"/>
                 </cell>
                 <cell>
                     <JLabel text=3D"lima.search.items.where" width=3D"200"/>
@@ -49,10 +49,10 @@
             </row>
             <row>
                 <cell>
-                    <JButton id=3D"okButton" onActionPerformed=3D"doSearch()=
" text=3D"lima.ok"/>
+                    <JButton id=3D"okButton" onActionPerformed=3D"doSearch()=
" text=3D"lima.common.ok"/>
                 </cell>
                 <cell>
-                    <JButton id=3D"cancelButton" text=3D"lima.cancel" onActi=
onPerformed=3D"windowClosing()"/>
+                    <JButton id=3D"cancelButton" text=3D"lima.common.cancel"=
 onActionPerformed=3D"windowClosing()"/>
                 </cell>
             </row>
         </Table>

Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/Transact=
ionHelper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/Transaction=
Helper.java	                        (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/Transaction=
Helper.java	2010-04-09 16:12:23 UTC (rev 2841)
@@ -0,0 +1,79 @@
+/* *##% Lima Main
+ * Copyright (C) 2008 - 2010 CodeLutin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*
+ */
+
+package org.chorem.lima.ui.transaction;
+
+import org.chorem.lima.entity.Entry;
+import org.chorem.lima.entity.Transaction;
+
+/**
+ * TODO add comment here.
+ *=20
+ * @author chatellier
+ * @version $Revision$
+ *=20
+ * Last update : $Date$
+ * By : $Author$
+ */
+public class TransactionHelper {
+
+    /**
+     * Get total credit for a transaction.
+     *=20
+     * @param transaction transaction to get credit
+     * @return total credit
+     */
+    public static double getCredit(Transaction transaction) {
+        double credit =3D 0;
+        for (Entry entry : transaction.getEntry()) {
+            // TODO EC-20100407 voir si le modele correspond (amount, credit=
,debit)
+            if (!entry.getDebit()) {
+                credit +=3D entry.getAmount();
+            }
+        }
+        return credit;
+    }
+
+    /**
+     * Get total debit for a transaction.
+     *=20
+     * @param transaction transaction to get debit
+     * @return total debit
+     */
+    public static double getDebit(Transaction transaction) {
+        double debit =3D 0;
+        for (Entry entry : transaction.getEntry()) {
+            // TODO EC-20100407 voir si le modele correspond (amount, credit=
,debit)
+            if (entry.getDebit()) {
+                debit +=3D entry.getAmount();
+            }
+        }
+        return debit;
+    }
+
+    /**
+     * Return true if transaction is balanced (credit =3D=3D debit).
+     *=20
+     * @param transaction transaction to test
+     * @return {@code true} if transaction is balanced
+     */
+    public static boolean isBalanced(Transaction transaction) {
+        boolean balanced =3D getDebit(transaction) =3D=3D getCredit(transact=
ion);
+        return balanced;
+    }
+}


Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/transa=
ction/TransactionHelper.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/Trans=
actionView.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/Transaction=
View.jaxx	2010-04-09 16:10:45 UTC (rev 2840)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/Transaction=
View.jaxx	2010-04-09 16:12:23 UTC (rev 2841)
@@ -16,11 +16,15 @@
  ##% -->
=20
 <Table>
+    <TransactionViewHandler id=3D"handler" javaBean=3D"new TransactionViewHa=
ndler(this)" />
+    <Boolean id=3D"selectedRow" javaBean=3D"false" />
+
     <script>
     <![CDATA[
    =20
     ]]>
     </script>
+
     <!-- <JPopupMenu id=3D"MenuRightPanel">
         <JMenuItem text=3D"lima.add.transaction" onActionPerformed=3D'addEmp=
tyTransaction()'/>
         <JMenuItem text=3D"lima.print"/>
@@ -29,7 +33,7 @@
         <JMenuItem text=3D"lima.add" onActionPerformed=3D'addEmptyTransactio=
n()'/>
         <JMenuItem text=3D"lima.print"/>
     </JPopupMenu> -->
-    <row fill=3D"horizontal" weightx=3D"0.75" weighty=3D"0" anchor=3D"center=
">
+    <row fill=3D"horizontal" weightx=3D"1" weighty=3D"0" anchor=3D"center">
         <cell>
             <JLabel id=3D"entryBookLabel" text=3D"lima.transaction.entrybook=
"/>
         </cell>
@@ -46,26 +50,34 @@
         </cell>
     </row>
     <row>
-        <cell fill=3D"both" weightx=3D"1" weighty=3D"1" rows=3D'3' columns=
=3D'4'>
+        <cell fill=3D"both" weightx=3D"1" weighty=3D"1" rows=3D"3" columns=
=3D"4">
             <JScrollPane>
+                <org.chorem.lima.ui.transaction.table.TransactionTableModel
+                    id=3D"transactionTableModel" />
                 <org.chorem.lima.ui.transaction.table.TransactionTable
-                    id=3D"transactionsTable" sortable=3D"false" rowHeight=3D=
"22"
+                    id=3D"transactionTable" sortable=3D"false" rowHeight=3D"=
22"
+                     constructorParams=3D"getHandler()" model=3D"{getTransac=
tionTableModel()}"
                     selectionMode=3D"{ListSelectionModel.SINGLE_SELECTION}"
-                    highlighters=3D"{HighlighterFactory.createAlternateStrip=
ing(Color.WHITE,new Color(250,250,250))}" />
+                    highlighters=3D"{org.jdesktop.swingx.decorator.Highlight=
erFactory.createAlternateStriping(Color.WHITE,new Color(250,250,250))}" />
+                <javax.swing.ListSelectionModel javaBean=3D"getTransactionTa=
ble().getSelectionModel()"
+                    onValueChanged=3D"setSelectedRow(transactionTable.getSel=
ectedRow() !=3D -1)"/>
             </JScrollPane>
         </cell>
         <cell>
-            <JButton id=3D"addButton" text=3D"lima.add.transaction" onAction=
Performed=3D"addEmptyTransaction()" width=3D"150"/>
+            <JButton text=3D"lima.add.transaction"
+                onActionPerformed=3D"getHandler().addEmptyTransaction()"/>
         </cell>
     </row>
     <row>
         <cell>
-            <JButton id=3D"removeButton" text=3D"lima.remove.transaction" on=
ActionPerformed=3D"removeTransaction()" width=3D"150"/>
+            <JButton text=3D"lima.remove.transaction"
+                onActionPerformed=3D"getHandler().removeTransaction()"
+                enabled=3D"{isSelectedRow()}"/>
         </cell>
     </row>
     <row>
         <cell>
-            <JButton text=3D"lima.add.entry" onActionPerformed=3D"addEmptyEn=
try()" width=3D"150"/>
+            <JButton text=3D"lima.add.entry" onActionPerformed=3D"getHandler=
().addEmptyEntry()"/>
         </cell>
     </row>
 </Table>
\ No newline at end of file

Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/Transact=
ionViewHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/Transaction=
ViewHandler.java	                        (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/Transaction=
ViewHandler.java	2010-04-09 16:12:23 UTC (rev 2841)
@@ -0,0 +1,112 @@
+/* *##% Lima Swing
+ * Copyright (C) 2008 - 2010 CodeLutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US=
A.
+ * ##%*/
+
+package org.chorem.lima.ui.transaction;
+
+import static org.nuiton.i18n.I18n._;
+
+import javax.swing.JOptionPane;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.chorem.lima.entity.Entry;
+import org.chorem.lima.entity.Transaction;
+import org.chorem.lima.table.model.TransactionTableModel;
+import org.chorem.lima.ui.transaction.table.TransactionTable;
+
+/**
+ * Handler associated with account view.
+ *=20
+ * @author chatellier
+ * @version $Revision$
+ *=20
+ * Last update : $Date$
+ * By : $Author$
+ */
+public class TransactionViewHandler {
+
+    /** log. */
+    private static final Log log =3D LogFactory.getLog(TransactionViewHandle=
r.class);
+
+    protected TransactionView view;
+
+    protected TransactionViewHandler(TransactionView view) {
+        this.view =3D view;
+    }
+
+    public void addEmptyTransaction() {
+       =20
+    }
+   =20
+    public void removeTransaction() {
+       =20
+    }
+   =20
+    public void addEmptyEntry() {
+       =20
+    }
+   =20
+    /**
+     * Delete selected row in table (could be transaction or entry).
+     *=20
+     * Called by model.
+     */
+    public void deleteSelectedRow() {
+
+        TransactionTable table =3D (TransactionTable)view.getTransactionTabl=
e();
+        TransactionTableModel model =3D table.getModel();
+
+        int indexSelectedRow =3D table.getSelectedRow();
+        if (indexSelectedRow !=3D -1) {
+
+            Object selectedValue =3D model.getElementAt(indexSelectedRow);
+
+            String message =3D null;
+            if (selectedValue instanceof Transaction) {
+                message =3D _("lima.question.remove.transaction");
+            }
+            else {
+                message =3D _("lima.question.remove.entry");
+            }
+
+            int response =3D JOptionPane.showConfirmDialog(view, message,
+                    _("lima.transaction.confirmdelete"), JOptionPane.YES_NO_=
OPTION);
+
+            if (response =3D=3D JOptionPane.YES_OPTION) {
+
+                if (selectedValue instanceof Transaction) {
+                    // TODO EC-20100409 implements this
+                    if (log.isWarnEnabled()) {
+                        log.warn("TODO implement Transaction deletion");
+                    }
+                }
+                else if (selectedValue instanceof Entry) {
+                    // TODO EC-20100409 implements this
+                    if (log.isWarnEnabled()) {
+                        log.warn("TODO implement Entry deletion");
+                    }
+                }
+            }
+        }
+        else {
+            if (log.isWarnEnabled()) {
+                log.warn("Call delete selected row without selection");
+            }
+        }
+    }
+}


Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/transa=
ction/TransactionViewHandler.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL


--===============7394427501591489299==--