r3149 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod - Lima-commits

27 May 2011

Author: vsalaun
Date: 2011-05-27 14:29:39 +0200 (Fri, 27 May 2011)
New Revision: 3149

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

Log:
#400 empeche la reorganisation automatique des periodes comptables

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/FinancialPeriodView.jaxx
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java

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	2011-05-27 12:09:14 UTC (rev 3148)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java	2011-05-27 12:29:39 UTC (rev 3149)
@@ -28,6 +28,7 @@
 import static org.nuiton.i18n.I18n._;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import javax.swing.table.AbstractTableModel;
 import org.apache.commons.logging.Log;
@@ -37,6 +38,7 @@
 import org.chorem.lima.business.ImportServiceMonitorable;
 import org.chorem.lima.business.LimaException;
 import org.chorem.lima.business.ServiceListener;
+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;
@@ -63,7 +65,7 @@
     protected FinancialPeriodServiceMonitorable financialPeriodService;
     
     /** Datas cache */
-    protected List<ClosedPeriodicEntryBook> cacheDataList;
+    protected List<Object> cacheDataList;
     
     public FinancialPeriodTableModel() {
         financialPeriodService =
@@ -78,7 +80,13 @@
     
     @Override
     public int getRowCount() {
-        return cacheDataList.size();
+        int result = 0;
+        
+        if (cacheDataList != null) {
+            result = cacheDataList.size();
+        }
+
+        return result;
     }
 
 
@@ -122,7 +130,7 @@
     }
 
     public ClosedPeriodicEntryBook getFinancialPeriodAtRow(int row) throws LimaException {
-        return cacheDataList.get(row);
+        return (ClosedPeriodicEntryBook) cacheDataList.get(row);
     }
     
     
@@ -138,7 +146,7 @@
         Object result = null;
 
         ClosedPeriodicEntryBook closedPeriodicEntryBook
-                = cacheDataList.get(rowIndex);
+                = (ClosedPeriodicEntryBook) cacheDataList.get(rowIndex);
             
             if (closedPeriodicEntryBook != null){
                 EntryBook entryBook = closedPeriodicEntryBook.getEntryBook();
@@ -169,33 +177,38 @@
         return result;
     }
     
-    public void getDataList(){
-        List<ClosedPeriodicEntryBook> results =
-            new ArrayList<ClosedPeriodicEntryBook>();
+    public List<Object> getDataList(){
+        List<Object> results =
+            new ArrayList<Object>();
         try {
-            results = financialPeriodService.//getAllClosedPeriodicEntryBooks();
+            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 );
             }
         }
-        cacheDataList=results;
+        return results;
     }
     
+    public void refresh(){
+        cacheDataList = getDataList();
+        fireTableDataChanged();
+    }
+    
     public void blockFinancialPeriod(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException {
         financialPeriodService.
             blockClosedPeriodicEntryBook(closedPeriodicEntryBook);
-        getDataList();
-        fireTableDataChanged();
+        refresh();
     }
 
 
     @Override
     public void notifyMethod(String serviceName, String methodeName) {
         if (methodeName.contains("FiscalPeriod") || methodeName.contains("importAll")){
-            getDataList();
-            fireTableDataChanged();
+            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	2011-05-27 12:09:14 UTC (rev 3148)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx	2011-05-27 12:29:39 UTC (rev 3149)
@@ -25,20 +25,26 @@
 
 <Table>
     <FinancialPeriodViewHandler id="handler" javaBean="new FinancialPeriodViewHandler(this)" />
-    <org.chorem.lima.ui.financialperiod.FinancialPeriodTableModel id="modelFinancialPeriodTable"/>
-    
     <Boolean id="selectedPeriod" javaBean="false" />
-        <script>
+
+    <script>
     <![CDATA[
-    getModelFinancialPeriodTable().getDataList();
+    import org.chorem.lima.entity.FiscalPeriod;
+    import org.chorem.lima.entity.FinancialPeriod;
+    
+    void $afterCompleteSetup() {
+        getHandler().refresh();
+    }
         
     ]]>
     </script>
     <row>
         <cell fill="both" weightx="1" weighty="1">
             <JScrollPane>
+                <org.chorem.lima.ui.financialperiod.FinancialPeriodTableModel
+                    id="modelFinancialPeriodTable"/>
                 <org.chorem.lima.ui.financialperiod.FinancialPeriodTable
-                    id="financialPeriodTable" rowHeight="24"
+                    id="financialPeriodTable" sortable="false" rowHeight="24"
                      constructorParams="getHandler()" model="{getModelFinancialPeriodTable()}"
                     selectionMode="{ListSelectionModel.SINGLE_INTERVAL_SELECTION}"
                     columnControlVisible="true" />

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	2011-05-27 12:09:14 UTC (rev 3148)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java	2011-05-27 12:29:39 UTC (rev 3149)
@@ -51,6 +51,10 @@
     
     protected FinancialPeriodView view;
     
+    protected FinancialPeriodTable table;
+    
+    protected FinancialPeriodTableModel tableModel;
+    
     protected FinancialPeriodViewHandler(FinancialPeriodView view) {
         this.view = view;
     }
@@ -80,4 +84,9 @@
     public FinancialPeriodView getView() {
         return view;
     }
+    
+    public void refresh() {
+        tableModel = (FinancialPeriodTableModel)getView().getFinancialPeriodTable().getModel();
+        tableModel.refresh();
+    }
 }

    

r3149 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod

vsalaun＠users.chorem.org

tags

participants (1)