r3526 - in trunk: . lima-swing lima-swing/src/main/java/org/chorem/lima/ui lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction - Lima-commits

13 Jul 2012

Author: mallon
Date: 2012-07-13 18:42:21 +0200 (Fri, 13 Jul 2012)
New Revision: 3526

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

Log:
fixes #645 L etat des composants (Taille de colonnes d un tableau, par exemple) sont sauvegardes pour l ensemble des panneaux (Donc, lors de la fermeture, puis de la re-ouverture de lima, les etats ne sont pas reinitialises.).

Modified:
   trunk/lima-swing/pom.xml
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java
   trunk/pom.xml

Modified: trunk/lima-swing/pom.xml
===================================================================

--- trunk/lima-swing/pom.xml	2012-07-13 11:54:39 UTC (rev 3525)
+++ trunk/lima-swing/pom.xml	2012-07-13 16:42:21 UTC (rev 3526)
@@ -104,8 +104,15 @@
       <artifactId>openejb-loader</artifactId>
       <scope>runtime</scope>
     </dependency>
+
+      <dependency>
+          <groupId>org.nuiton</groupId>
+          <artifactId>nuiton-widgets</artifactId>
+      </dependency>
+
   </dependencies>
 
+
   <!-- ************************************************************* -->
   <!-- *** Project Information ************************************* -->
   <!-- ************************************************************* -->

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx	2012-07-13 11:54:39 UTC (rev 3525)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx	2012-07-13 16:42:21 UTC (rev 3526)
@@ -228,7 +228,7 @@
   </JMenuBar>
   <BetaLayerUI id="betaLayer" />
   <JPanel id="mainPanel" layout='{new BorderLayout()}' decorator="boxed">
-    <JTabbedPane id="contentTabbedPane" constraints="BorderLayout.CENTER"/>
+    <JTabbedPane id="contentTabbedPane" constraints="BorderLayout.CENTER" onStateChanged="getHandler().swingSession.save()"/>
   </JPanel>
 
 </JFrame>

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java	2012-07-13 11:54:39 UTC (rev 3525)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java	2012-07-13 16:42:21 UTC (rev 3526)
@@ -25,22 +25,10 @@
 
 package org.chorem.lima.ui;
 
-import static org.nuiton.i18n.I18n._;
-
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.net.URL;
-import java.util.Locale;
-
-import javax.swing.JButton;
-import javax.swing.JTabbedPane;
-
 import jaxx.runtime.JAXXContext;
 import jaxx.runtime.SwingUtil;
 import jaxx.runtime.swing.AboutPanel;
 import jaxx.runtime.swing.editor.config.ConfigUIHelper;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.chorem.lima.LimaConfig;
@@ -68,7 +56,18 @@
 import org.chorem.lima.ui.vatchart.VatChartView;
 import org.chorem.lima.ui.vatreports.VatReportView;
 import org.nuiton.util.DesktopUtil;
+import org.nuiton.widget.SwingSession;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.net.URL;
+import java.util.Locale;
+
+import static org.nuiton.i18n.I18n._;
+
 /**
  * Handler for main view.
  * <p/>
@@ -86,6 +85,8 @@
     /** to use log facility, just put in your code: log.info(\"...\"); */
     static private Log log = LogFactory.getLog(MainViewHandler.class);
 
+    protected SwingSession swingSession;
+
     /**
      * Methode pour initialiser l'ui principale sans l'afficher.
      *
@@ -97,6 +98,8 @@
         // show main ui
         MainView ui = new MainView(rootContext);
 
+        swingSession = new SwingSession(createFileLimaState(), false);
+
         LimaContext.MAIN_UI_ENTRY_DEF.setContextValue(rootContext, ui);
 
         // set fullscreen propery on main ui
@@ -105,6 +108,26 @@
         return ui;
     }
 
+    //Creation of xml lima state file
+    protected File createFileLimaState(){
+        File limaStateDir = new File("././.lima/reports");
+        File limaState = new File("././.lima/reports/limaState.xml");
+
+        try {
+            if(!limaStateDir.exists()){
+                limaStateDir.mkdirs();
+            }
+            if(!limaState.exists()){
+                limaState.createNewFile();
+            }
+        } catch (Exception ex) {
+            if (log.isInfoEnabled()) {
+                log.info("can't create lima state file : " + ex.getMessage(), ex);
+            }
+        }
+        return limaState;
+    }
+
     public void changeLanguage(MainView mainUI, Locale newLocale) {
         LimaConfig config = mainUI.getConfig();
 
@@ -124,6 +147,8 @@
      * @param ui l'ui principale de l'application
      */
     public void close(MainView ui) {
+        /*Save Lima state*/
+        swingSession.save();
         if (log.isInfoEnabled()) {
             log.info("Lima quitting...");
         }
@@ -291,6 +316,7 @@
         MainView mainView = getUI(rootContext);
         AccountView accountView = new AccountView(mainView);
         showTab(mainView, _("lima.charts.account"), accountView);
+        swingSession.add(accountView);
     }
 
     /**
@@ -302,6 +328,7 @@
         MainView mainView = getUI(rootContext);
         EntryBookView entryBookView = new EntryBookView(mainView);
         showTab(mainView, _("lima.common.entrybooks"), entryBookView);
+        swingSession.add(entryBookView);
     }
 
     /**
@@ -313,6 +340,7 @@
         MainView mainView = getUI(rootContext);
         FiscalPeriodView fiscalPeriodView = new FiscalPeriodView(mainView);
         showTab(mainView, _("lima.charts.fiscalyear"), fiscalPeriodView);
+        swingSession.add(fiscalPeriodView);
     }
 
     /**
@@ -325,6 +353,7 @@
         FinancialPeriodView financialPeriodView =
                 new FinancialPeriodView(mainView);
         showTab(mainView, _("lima.charts.financialperiod"), financialPeriodView);
+        swingSession.add(financialPeriodView);
     }
 
     /**
@@ -337,6 +366,7 @@
         FinancialStatementChartView financialStatementView =
                 new FinancialStatementChartView(mainView);
         showTab(mainView, _("lima.charts.financialstatement"), financialStatementView);
+        swingSession.add(financialStatementView);
     }
 
     /**
@@ -348,6 +378,7 @@
         MainView mainView = getUI(rootContext);
         VatChartView vatChartView = new VatChartView(mainView);
         showTab(mainView, _("lima.charts.vatstatement"), vatChartView);
+        swingSession.add(vatChartView);
     }
 
     /**
@@ -360,6 +391,7 @@
         AccountsReportsView accountsReportsView =
                 new AccountsReportsView(mainView);
         showTab(mainView, _("lima.reports.accounts"), accountsReportsView);
+        swingSession.add(accountsReportsView);
     }
 
     /**
@@ -372,6 +404,7 @@
         EntryBooksReportsView entryBooksReportsView =
                 new EntryBooksReportsView(mainView);
         showTab(mainView, _("lima.reports.entrybooks"), entryBooksReportsView);
+        swingSession.add(entryBooksReportsView);
     }
 
 
@@ -386,6 +419,7 @@
                 new FinancialTransactionView(mainView);
         showTab(mainView, _("lima.entries.writetransaction"),
                 transactionView);
+        swingSession.add(transactionView);
     }
 
     public void showTransactionUnbalancedView(JAXXContext rootContext) {
@@ -394,6 +428,7 @@
                 new FinancialTransactionUnbalancedView(mainView);
         showTab(mainView, _("lima.entries.searchunbalancedtransaction"),
                 searchResultView);
+        swingSession.add(searchResultView);
     }
 
     public void showTransactionSearchView(JAXXContext rootContext) {
@@ -401,24 +436,28 @@
         FinancialTransactionSearchView searchView =
                 new FinancialTransactionSearchView(mainView);
         showTab(mainView, _("lima.entries.searchtransaction"), searchView);
+        swingSession.add(searchView);
     }
 
     public void showLetteringView(JAXXContext rootContext) {
         MainView mainView = getUI(rootContext);
         LetteringView letteringView = new LetteringView(mainView);
         showTab(mainView, _("lima.entries.lettering"), letteringView);
+        swingSession.add(letteringView);
     }
 
     public void showBalanceView(JAXXContext rootContext) {
         MainView mainView = getUI(rootContext);
         BalanceView balanceView = new BalanceView(mainView);
         showTab(mainView, _("lima.reports.balance"), balanceView);
+        swingSession.add(balanceView);
     }
 
     public void showLedgerView(JAXXContext rootContext) {
         MainView mainView = getUI(rootContext);
         LedgerView ledgerView = new LedgerView(mainView);
         showTab(mainView, _("lima.reports.ledger"), ledgerView);
+        swingSession.add(ledgerView);
     }
 
     public void showFinancialStatementReportsView(JAXXContext rootContext) {
@@ -427,13 +466,14 @@
                 new FinancialStatementReportView(mainView);
         showTab(mainView, _("lima.reports.financialstatement"),
                 financialStatementReportView);
+        swingSession.add(financialStatementReportView);
     }
 
     public void showVatReportView(JAXXContext rootContext) {
         MainView mainView = getUI(rootContext);
         VatReportView vatReportView = new VatReportView(mainView);
         showTab(mainView, _("lima.reports.vat"), vatReportView);
-
+        swingSession.add(vatReportView);
     }
 
     public void showImportExportView(JAXXContext rootContext,

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java	2012-07-13 11:54:39 UTC (rev 3525)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java	2012-07-13 16:42:21 UTC (rev 3526)
@@ -26,8 +26,6 @@
 package org.chorem.lima.ui.financialtransaction;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.chorem.lima.entity.Account;
 import org.chorem.lima.entity.Entry;
 import org.chorem.lima.entity.EntryBook;
@@ -69,8 +67,6 @@
     /** serialVersionUID. */
     private static final long serialVersionUID = 3133690382049594727L;
 
-    private static final Log log = LogFactory.getLog(FinancialTransactionTable.class);
-
     protected FinancialTransactionViewHandler handler;
 
     private int x_tab;

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx	2012-07-13 11:54:39 UTC (rev 3525)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx	2012-07-13 16:42:21 UTC (rev 3526)
@@ -22,7 +22,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<Table>
+<Table name="test">
 
   <import>
     javax.swing.ListSelectionModel

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java	2012-07-13 11:54:39 UTC (rev 3525)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java	2012-07-13 16:42:21 UTC (rev 3526)
@@ -96,23 +96,23 @@
      */
     public void init() {
           
-            // fiscal periods
-            List<FiscalPeriod> fiscalPeriods = fiscalPeriodService.getAllUnblockedFiscalPeriods();
-            view.getFiscalPeriodComboBoxModel().setObjects(fiscalPeriods);
-            if (log.isDebugEnabled()) {
-                log.debug(String.format("Loaded %d fiscal periods", fiscalPeriods.size()));
-            }
-            if (!fiscalPeriods.isEmpty()) {
-                view.getFiscalPeriodComboBoxModel().setSelectedItem(fiscalPeriods.get(0));
-            }
-    
-            // entry books
-            List<EntryBook> allEntryBooks = entryBookService.getAllEntryBooks();
-            view.getEntryBookComboBoxModel().setObjects(allEntryBooks);    
-            
-            if (log.isDebugEnabled()) {
-                log.debug(String.format("Loaded %d entry books", allEntryBooks.size()));
-            }
+        // fiscal periods
+        List<FiscalPeriod> fiscalPeriods = fiscalPeriodService.getAllUnblockedFiscalPeriods();
+        view.getFiscalPeriodComboBoxModel().setObjects(fiscalPeriods);
+        if (log.isDebugEnabled()) {
+            log.debug(String.format("Loaded %d fiscal periods", fiscalPeriods.size()));
+        }
+        if (!fiscalPeriods.isEmpty()) {
+            view.getFiscalPeriodComboBoxModel().setSelectedItem(fiscalPeriods.get(0));
+        }
+
+        // entry books
+        List<EntryBook> allEntryBooks = entryBookService.getAllEntryBooks();
+        view.getEntryBookComboBoxModel().setObjects(allEntryBooks);
+
+        if (log.isDebugEnabled()) {
+            log.debug(String.format("Loaded %d entry books", allEntryBooks.size()));
+        }
     }
 
     /**

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2012-07-13 11:54:39 UTC (rev 3525)
+++ trunk/pom.xml	2012-07-13 16:42:21 UTC (rev 3526)
@@ -236,6 +236,12 @@
         <version>1.7.0</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.nuiton</groupId>
+        <artifactId>nuiton-widgets</artifactId>
+        <version>1.1.1</version>
+      </dependency>
+
     </dependencies>
   </dependencyManagement>

    

r3526 - in trunk: . lima-swing lima-swing/src/main/java/org/chorem/lima/ui lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction

mallon＠users.chorem.org

tags

participants (1)