[Lima-commits] r3367 - in trunk: lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/financialperiod lima-swing/src/main/resources/i18n

13 Apr 2012

Author: echatellier
Date: 2012-04-13 16:44:59 +0200 (Fri, 13 Apr 2012)
New Revision: 3367

Url: http://chorem.org/repositories/revision/lima/3367

Log:
Financial period ui refactoring

Added:
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/package-info.java
Modified:
   trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionImpl.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java
   trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties
   trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties

Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionImpl.java
===================================================================

--- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionImpl.java	2012-04-13 13:46:24 UTC (rev 3366)
+++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionImpl.java	2012-04-13 14:44:59 UTC (rev 3367)
@@ -46,11 +46,11 @@
     @Override
     public BigDecimal getAmountDebit() {
         BigDecimal result = new BigDecimal(0);
-        /*for (Entry entryFT : getEntry()) {
+        for (Entry entryFT : getEntry()) {
             if (entryFT.isDebit()) {
                 result.add(entryFT.getAmount());
             }
-        }*/
+        }
         return result;
     }
 
@@ -60,11 +60,11 @@
     @Override
     public BigDecimal getAmountCredit() {
         BigDecimal result = new BigDecimal(0);
-        /*for (Entry entryFT : getEntry()) {
+        for (Entry entryFT : getEntry()) {
             if (!entryFT.isDebit()) {
                 result.add(entryFT.getAmount());
             }
-        }*/
+        }
         return result;
     }
 }

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java	2012-04-13 13:46:24 UTC (rev 3366)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java	2012-04-13 14:44:59 UTC (rev 3367)
@@ -25,112 +25,78 @@
 
 package org.chorem.lima.ui.financialperiod;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.chorem.lima.business.LimaException;
-import org.chorem.lima.business.api.FinancialPeriodService;
-import org.chorem.lima.business.monitorable.FinancialPeriodServiceMonitorable;
-import org.chorem.lima.entity.ClosedPeriodicEntryBook;
-import org.chorem.lima.entity.ClosedPeriodicEntryBookImpl;
-import org.chorem.lima.service.LimaServiceFactory;
-import org.jdesktop.swingx.JXTable;
-import org.jdesktop.swingx.decorator.ColorHighlighter;
-import org.jdesktop.swingx.decorator.ComponentAdapter;
-import org.jdesktop.swingx.decorator.HighlightPredicate;
-import org.jdesktop.swingx.decorator.Highlighter;
-
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-import java.text.SimpleDateFormat;
 
-public class FinancialPeriodTable extends JXTable
-        implements KeyListener, MouseListener {
+import org.chorem.lima.entity.ClosedPeriodicEntryBook;
+import org.jdesktop.swingx.JXTable;
+import org.jdesktop.swingx.decorator.ColorHighlighter;
+import org.jdesktop.swingx.decorator.ComponentAdapter;
+import org.jdesktop.swingx.decorator.HighlightPredicate;
+import org.jdesktop.swingx.decorator.Highlighter;
+import org.jdesktop.swingx.decorator.HighlighterFactory;
 
+/**
+ * Financial period table adding color hidhlighter and key management.
+ * 
+ * @author chatellier
+ * @version $Revision$
+ * 
+ * Last update : $Date$
+ * By : $Author$
+ */
+public class FinancialPeriodTable extends JXTable implements KeyListener, MouseListener {
+
+    /** serialVersionUID. */
     private static final long serialVersionUID = -1960326844433064178L;
 
-    private static final Log log =
-            LogFactory.getLog(FinancialPeriodTableModel.class);
-
     protected FinancialPeriodViewHandler handler;
 
     protected FinancialPeriodTableModel model;
 
-    protected FinancialPeriodService financialPeriodService;
-
-    private Highlighter colorTransaction;
-
-    /*
-    * Constructor, call highlighter
-    */
+    /**
+     * Constructor, install highlighter.
+     * 
+     * @param handler
+     */
     public FinancialPeriodTable(FinancialPeriodViewHandler handler) {
-
         this.handler = handler;
+        model = handler.view.getFinancialPeriodTableModel();
 
         addKeyListener(this);
         addMouseListener(this);
 
-        model = this.handler.getView().modelFinancialPeriodTable;
-        financialPeriodService =
-                LimaServiceFactory.getService(
-                        FinancialPeriodServiceMonitorable.class);
-
         //highlight financial financial transactions
-        addMonthColor();
+        addStripingColor();
         addBlockColor();
     }
 
-    /*
+    /**
      * Color the background row in grey if the month number is even (pair in french)
      */
-    protected void addMonthColor() {
-        HighlightPredicate predicate = new HighlightPredicate() {
-            @Override
-            public boolean isHighlighted(Component renderer,
-                                         ComponentAdapter adapter) {
-                ClosedPeriodicEntryBook closedPeriodicEntryBook
-                        = (ClosedPeriodicEntryBook) model.getElementAt(adapter.row);
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM");
-                int month = Integer.parseInt(simpleDateFormat.format(
-                        closedPeriodicEntryBook.getFinancialPeriod().getBeginDate()));
-                // true if month is even 
-                return month % 2 == 0;
-
-            }
-        };
-        colorTransaction =
-                new ColorHighlighter(predicate, new Color(222, 222, 222), null);
+    protected void addStripingColor() {
+        Highlighter colorTransaction = HighlighterFactory.createSimpleStriping(new Color(233,233,233));
         addHighlighter(colorTransaction);
     }
 
-    /*
-    * Color the font in red if period are closed
-    */
+    /**
+     * Color the font in red if period are closed
+     */
     protected void addBlockColor() {
         HighlightPredicate predicate = new HighlightPredicate() {
             @Override
             public boolean isHighlighted(Component renderer,
                                          ComponentAdapter adapter) {
                 ClosedPeriodicEntryBook closedPeriodicEntryBook =
-                        new ClosedPeriodicEntryBookImpl();
-                ClosedPeriodicEntryBook selectedClosedPeriodicEntryBook =
                         (ClosedPeriodicEntryBook) model.getElementAt(adapter.row);
-                // true if locked 
-                try {
-                    closedPeriodicEntryBook =
-                            financialPeriodService.getClosedPeriodicEntryBook(
-                                    selectedClosedPeriodicEntryBook.getEntryBook(),
-                                    selectedClosedPeriodicEntryBook.getFinancialPeriod());
-                } catch (LimaException eee) {
-                    log.debug("Can't get closePeriodicEntryBook", eee);
-                }
                 return closedPeriodicEntryBook.getLocked();
             }
         };
-        colorTransaction =
+        Highlighter colorTransaction =
                 new ColorHighlighter(predicate, null, new Color(222, 0, 0));
         addHighlighter(colorTransaction);
     }

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java	2012-04-13 13:46:24 UTC (rev 3366)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java	2012-04-13 14:44:59 UTC (rev 3367)
@@ -25,77 +25,63 @@
 
 package org.chorem.lima.ui.financialperiod;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.chorem.lima.business.LimaException;
-import org.chorem.lima.business.ServiceListener;
-import org.chorem.lima.business.monitorable.FinancialPeriodServiceMonitorable;
-import org.chorem.lima.business.monitorable.FiscalPeriodServiceMonitorable;
-import org.chorem.lima.business.monitorable.ImportServiceMonitorable;
-import org.chorem.lima.business.utils.FinancialPeriodComparator;
-import org.chorem.lima.entity.ClosedPeriodicEntryBook;
-import org.chorem.lima.entity.EntryBook;
-import org.chorem.lima.entity.FinancialPeriod;
-import org.chorem.lima.service.LimaServiceFactory;
+import static org.nuiton.i18n.I18n._;
 
-import javax.swing.table.AbstractTableModel;
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
-import static org.nuiton.i18n.I18n._;
+import javax.swing.table.AbstractTableModel;
 
+import org.chorem.lima.entity.ClosedPeriodicEntryBook;
+import org.chorem.lima.entity.EntryBook;
+import org.chorem.lima.entity.FinancialPeriod;
+
 /**
- * TODO add comment here.
+ * Financial period table model.
  *
  * @author chatellier
  * @version $Revision$
- *          <p/>
- *          Last update : $Date$
- *          By : $Author$
+ * 
+ * Last update : $Date$
+ * By : $Author$
  */
-public class FinancialPeriodTableModel extends AbstractTableModel implements ServiceListener {
+public class FinancialPeriodTableModel extends AbstractTableModel {
 
     /** serialVersionUID. */
     private static final long serialVersionUID = 77027335135838258L;
 
-    private static final Log log =
-            LogFactory.getLog(FinancialPeriodTableModel.class);
-
-    /** service */
-    protected FinancialPeriodServiceMonitorable financialPeriodService;
-
     /** Datas cache */
-    protected List<Object> cacheDataList;
+    protected List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks;
 
     public FinancialPeriodTableModel() {
-        financialPeriodService =
-                LimaServiceFactory.getService(
-                        FinancialPeriodServiceMonitorable.class);
-        LimaServiceFactory.addServiceListener(ImportServiceMonitorable.class, this);
-        LimaServiceFactory.addServiceListener(FiscalPeriodServiceMonitorable.class, this);
+
     }
 
+    /**
+     * Update model data list.
+     * 
+     * @param closedPeriodicEntryBooks new data
+     */
+    public void setClosedPeriodicEntryBooks(List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks) {
+        this.closedPeriodicEntryBooks = closedPeriodicEntryBooks;
+        fireTableDataChanged();
+    }
 
     @Override
     public int getRowCount() {
         int result = 0;
-
-        if (cacheDataList != null) {
-            result = cacheDataList.size();
+        if (closedPeriodicEntryBooks != null) {
+            result = closedPeriodicEntryBooks.size();
         }
-
         return result;
     }
 
-
     @Override
     public int getColumnCount() {
         return 3;
     }
 
-
     @Override
     public String getColumnName(int columnIndex) {
 
@@ -103,111 +89,69 @@
 
         switch (columnIndex) {
             case 0:
-                result = _("lima.table.period");
+                result = _("lima.ui.financialperiod.period");
                 break;
             case 1:
-                result = _("lima.table.entrybook");
+                result = _("lima.ui.financialperiod.entrybook");
                 break;
             case 2:
-                result = _("lima.table.closure");
+                result = _("lima.ui.financialperiod.closure");
                 break;
         }
 
         return result;
     }
 
-
     @Override
     public Class<?> getColumnClass(int columnIndex) {
         // both String
         return String.class;
     }
 
-
     @Override
     public boolean isCellEditable(int rowIndex, int columnIndex) {
         return false;
     }
 
-    public ClosedPeriodicEntryBook getFinancialPeriodAtRow(int row) throws LimaException {
-        return (ClosedPeriodicEntryBook) cacheDataList.get(row);
-    }
-
-
-    public Object getElementAt(int row) {
-
-        Object currentRow = cacheDataList.get(row);
+    public ClosedPeriodicEntryBook getElementAt(int row) {
+        ClosedPeriodicEntryBook currentRow = closedPeriodicEntryBooks.get(row);
         return currentRow;
     }
 
-
     @Override
     public Object getValueAt(int rowIndex, int columnIndex) {
         Object result = null;
 
-        ClosedPeriodicEntryBook closedPeriodicEntryBook
-                = (ClosedPeriodicEntryBook) cacheDataList.get(rowIndex);
+        ClosedPeriodicEntryBook closedPeriodicEntryBook = closedPeriodicEntryBooks.get(rowIndex);
 
-        if (closedPeriodicEntryBook != null) {
-            EntryBook entryBook = closedPeriodicEntryBook.getEntryBook();
-            FinancialPeriod financialPeriod =
-                    closedPeriodicEntryBook.getFinancialPeriod();
-
-            SimpleDateFormat simpleDateFormat
-                    = new SimpleDateFormat("dd MMM yyyy");
-
-            switch (columnIndex) {
-                case 0:
-                    result = simpleDateFormat.format(financialPeriod.getBeginDate())
-                             + " - " + simpleDateFormat.format(financialPeriod.getEndDate());
-                    break;
-                case 1:
-                    result = entryBook.getCode() + " - " + entryBook.getLabel();
-                    break;
-                case 2:
-                    if (closedPeriodicEntryBook.getLocked()) {
-                        result = _("lima.common.closed");
-                    } else {
-                        result = _("lima.common.open");
-                    }
-                    break;
-            }
+        switch (columnIndex) {
+            case 0:
+                // FIXME echatellier 20120413 remove hardcoded french date format
+                DateFormat df = new SimpleDateFormat("dd MMM yyyy");
+                FinancialPeriod financialPeriod = closedPeriodicEntryBook.getFinancialPeriod();
+                result = df.format(financialPeriod.getBeginDate())
+                         + " - " + df.format(financialPeriod.getEndDate());
+                break;
+            case 1:
+                EntryBook entryBook = closedPeriodicEntryBook.getEntryBook();
+                result = entryBook.getCode() + " - " + entryBook.getLabel();
+                break;
+            case 2:
+                if (closedPeriodicEntryBook.getLocked()) {
+                    result = _("lima.common.closed");
+                } else {
+                    result = _("lima.common.open");
+                }
+                break;
         }
+
         return result;
     }
 
-    public List<Object> getDataList() {
-        List<Object> results =
-                new ArrayList<Object>();
-        try {
-            List<ClosedPeriodicEntryBook> closedPeriodicEntryBook = financialPeriodService.//getAllClosedPeriodicEntryBooks();
-                    getAllClosedPeriodicEntryBooksFromUnblockedFiscalPeriod();
-            Collections.sort(closedPeriodicEntryBook, new FinancialPeriodComparator());
-            results.addAll(closedPeriodicEntryBook);
-        } catch (LimaException eee) {
-            if (log.isDebugEnabled()) {
-                log.debug("Can't get closedperiodicentrybook list", eee);
-            }
-        }
-        return results;
-    }
-
-    public void refresh() {
-        cacheDataList = getDataList();
-        fireTableDataChanged();
-    }
-
-    public void blockFinancialPeriod(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException {
+    /*public void blockFinancialPeriod(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException {
         financialPeriodService.
                 blockClosedPeriodicEntryBook(closedPeriodicEntryBook);
         refresh();
-    }
+    }*/
 
-
-    @Override
-    public void notifyMethod(String serviceName, String methodeName) {
-        if (methodeName.contains("FiscalPeriod") || methodeName.contains("importAll")) {
-            refresh();
-        }
-    }
 }

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx	2012-04-13 13:46:24 UTC (rev 3366)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx	2012-04-13 14:44:59 UTC (rev 3367)
@@ -5,7 +5,7 @@
   $Id$
   $HeadURL$
   %%
-  Copyright (C) 2008 - 2010 CodeLutin
+  Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric
   %%
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as
@@ -32,32 +32,27 @@
     org.chorem.lima.ui.financialperiod.FinancialPeriodTableModel
   </import>
 
-  <FinancialPeriodViewHandler id="handler"
-                              javaBean="new FinancialPeriodViewHandler(this)"/>
+  <FinancialPeriodViewHandler id="handler" constructorParams="this"/>
   <Boolean id="selectedPeriod" javaBean="false"/>
 
-  <script>
-    <![CDATA[
-
+  <script><![CDATA[
     void $afterCompleteSetup() {
-        getHandler().refresh();
-    }
-        
-    ]]>
-  </script>
+        getHandler().init();
+    } 
+  ]]></script>
+
   <row>
     <cell fill="both" weightx="1" weighty="1">
       <JScrollPane>
-        <FinancialPeriodTableModel
-          id="modelFinancialPeriodTable"/>
+        <FinancialPeriodTableModel id="financialPeriodTableModel"/>
         <FinancialPeriodTable
           id="financialPeriodTable" sortable="false" rowHeight="24"
           constructorParams="getHandler()"
-          model="{getModelFinancialPeriodTable()}"
+          model="{financialPeriodTableModel}"
           selectionMode="{ListSelectionModel.SINGLE_INTERVAL_SELECTION}"
           columnControlVisible="true"/>
         <ListSelectionModel
-          javaBean="getFinancialPeriodTable().getSelectionModel()"
+          javaBean="financialPeriodTable.getSelectionModel()"
           onValueChanged="setSelectedPeriod(financialPeriodTable.getSelectedRow() != -1)"/>
       </JScrollPane>
     </cell>
@@ -65,7 +60,7 @@
       <Table>
         <row>
           <cell>
-            <JButton id="blockButton" text="lima.charts.financialperiod.block"
+            <JButton text="lima.ui.financialperiod.block"
                      enabled="{isSelectedPeriod()}"
                      onActionPerformed="getHandler().blockFinancialPeriod();"/>
           </cell>

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java	2012-04-13 13:46:24 UTC (rev 3366)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java	2012-04-13 14:44:59 UTC (rev 3367)
@@ -5,7 +5,7 @@
  * $Id$
  * $HeadURL$
  * %%
- * Copyright (C) 2008 - 2010 CodeLutin
+ * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -25,40 +25,74 @@
 
 package org.chorem.lima.ui.financialperiod;
 
+import static org.nuiton.i18n.I18n._;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.swing.JOptionPane;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.chorem.lima.business.LimaException;
+import org.chorem.lima.business.LimaRuntimeException;
+import org.chorem.lima.business.ServiceListener;
+import org.chorem.lima.business.api.FinancialPeriodService;
+import org.chorem.lima.business.api.FiscalPeriodService;
+import org.chorem.lima.business.api.ImportService;
+import org.chorem.lima.business.utils.FinancialPeriodComparator;
 import org.chorem.lima.entity.ClosedPeriodicEntryBook;
-import org.chorem.lima.util.DialogHelper;
+import org.chorem.lima.service.LimaServiceFactory;
 import org.jdesktop.swingx.JXTable;
 
-import javax.swing.JOptionPane;
-
-import static org.nuiton.i18n.I18n._;
-
 /**
- * TODO add comment here.
+ * Handler for FinancialPeriodView.
  *
  * @author chatellier
  * @version $Revision$
- *          <p/>
- *          Last update : $Date$
- *          By : $Author$
+ * 
+ * Last update : $Date$
+ * By : $Author$
  */
-public class FinancialPeriodViewHandler {
+public class FinancialPeriodViewHandler implements ServiceListener {
 
     private static final Log log = LogFactory.getLog(FinancialPeriodViewHandler.class);
 
+    protected FinancialPeriodService financialPeriodService;
+
     protected FinancialPeriodView view;
 
-    protected FinancialPeriodTable table;
-
-    protected FinancialPeriodTableModel tableModel;
-
     protected FinancialPeriodViewHandler(FinancialPeriodView view) {
         this.view = view;
+        
+        financialPeriodService = LimaServiceFactory.getService(FinancialPeriodService.class);
+        LimaServiceFactory.addServiceListener(ImportService.class, this);
+        LimaServiceFactory.addServiceListener(FiscalPeriodService.class, this);
     }
 
+    /**
+     * Init view.
+     */
+    public void init() {
+        try {
+            // get data from service
+            List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks = financialPeriodService.
+                    getAllClosedPeriodicEntryBooksFromUnblockedFiscalPeriod();
+            Collections.sort(closedPeriodicEntryBooks, new FinancialPeriodComparator());
+            if (log.isDebugEnabled()) {
+                log.debug(String.format("Loaded %d closed periodic entry book", closedPeriodicEntryBooks.size()));
+            }
+
+            // notify ui
+            view.getFinancialPeriodTableModel().setClosedPeriodicEntryBooks(closedPeriodicEntryBooks);
+        } catch (LimaException ex) {
+            throw new LimaRuntimeException("Can't get closed periodic eb list", ex);
+        }
+    }
+
+    /**
+     * Block selected period.
+     */
     public void blockFinancialPeriod() {
         JXTable financialPeriodeTable = view.getFinancialPeriodTable();
         int selectedRow = financialPeriodeTable.getSelectedRow();
@@ -66,27 +100,24 @@
 
         // blocked it
         try {
-            ClosedPeriodicEntryBook closedPeriodicEntryBook = model.getFinancialPeriodAtRow(selectedRow);
-            int response = JOptionPane.showConfirmDialog(view, _("lima.charts.financialperiod.question.blocked"),
-                                                         _("lima.common.question"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
+            ClosedPeriodicEntryBook closedPeriodicEntryBook = model.getElementAt(selectedRow);
+            int response = JOptionPane.showConfirmDialog(view, _("lima.ui.financialperiod.blockmessage"),
+                _("lima.ui.financialperiod.blocktitle"),
+                JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
 
             if (response == JOptionPane.YES_OPTION) {
-                model.blockFinancialPeriod(closedPeriodicEntryBook);
+                financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodicEntryBook);
+                model.fireTableRowsUpdated(selectedRow, selectedRow);
             }
         } catch (LimaException eee) {
-            if (log.isErrorEnabled()) {
-                log.error("Can't block financialperiod", eee);
-            }
-            DialogHelper.showMessageDialog(eee.getMessage());
+            throw new LimaRuntimeException("Can't block financialperiod", eee);
         }
     }
 
-    public FinancialPeriodView getView() {
-        return view;
+    @Override
+    public void notifyMethod(String serviceName, String methodName) {
+        if (serviceName.contains("FiscalPeriod") || methodName.contains("importAll")) {
+            init();
+        }
     }
-
-    public void refresh() {
-        tableModel = (FinancialPeriodTableModel) getView().getFinancialPeriodTable().getModel();
-        tableModel.refresh();
-    }
 }

Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/package-info.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/package-info.java	                        (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/package-info.java	2012-04-13 14:44:59 UTC (rev 3367)
@@ -0,0 +1,30 @@
+/*
+ * #%L
+ * 
+ * 
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2012 Codelutin, Chatellier Eric
+ * %%
+ * 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>.
+ * #L%
+ */
+/**
+ * Gestion des périodes comptables.
+ * 
+ * Affichage, et cloture par période.
+ */
+package org.chorem.lima.ui.financialperiod;


Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/package-info.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL

Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties
===================================================================
--- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties	2012-04-13 13:46:24 UTC (rev 3366)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties	2012-04-13 14:44:59 UTC (rev 3367)
@@ -293,6 +293,12 @@
 lima.ui.entrybook.label=
 lima.ui.entrybook.remove=
 lima.ui.entrybook.update=
+lima.ui.financialperiod.block=
+lima.ui.financialperiod.blockmessage=
+lima.ui.financialperiod.blocktitle=
+lima.ui.financialperiod.closure=
+lima.ui.financialperiod.entrybook=
+lima.ui.financialperiod.period=
 lima.ui.financialtransaction.account=
 lima.ui.financialtransaction.balance=
 lima.ui.financialtransaction.buttonback=

Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
===================================================================
--- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties	2012-04-13 13:46:24 UTC (rev 3366)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties	2012-04-13 14:44:59 UTC (rev 3367)
@@ -272,6 +272,12 @@
 lima.ui.entrybook.label=Libellé
 lima.ui.entrybook.remove=Supprimer
 lima.ui.entrybook.update=Modifier
+lima.ui.financialperiod.block=Cloturer une période
+lima.ui.financialperiod.blockmessage=Êtes vous sûre de vouloir clôturer cette période ? Cette action est irréversible \!
+lima.ui.financialperiod.blocktitle=Clôture
+lima.ui.financialperiod.closure=Clôture
+lima.ui.financialperiod.entrybook=Journal
+lima.ui.financialperiod.period=Période
 lima.ui.financialtransaction.account=Compte
 lima.ui.financialtransaction.balance=Balance
 lima.ui.financialtransaction.buttonback=←
@@ -296,7 +302,7 @@
 lima.ui.fiscalperiod.block.confirmation=Ètes vous sûre de vouloir clôturer cette période ? Cette action est irréversible \!
 lima.ui.fiscalperiod.block.newyear=Voulez vous créer un nouvel exercice?
 lima.ui.fiscalperiod.block.retainedearningstitle=Report à nouveau
-lima.ui.fiscalperiod.block.title=Cloture de l'excercice
+lima.ui.fiscalperiod.block.title=Cloture de l'exercice
 lima.ui.fiscalperiod.closed=Cloturé
 lima.ui.fiscalperiod.closure=Cloture
 lima.ui.fiscalperiod.fiscalperiod=Exercice

    

[Lima-commits] r3367 - in trunk: lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/financialperiod lima-swing/src/main/resources/i18n

echatellier＠users.chorem.org