Author: jpepin Date: 2010-07-12 15:08:29 +0200 (Mon, 12 Jul 2010) New Revision: 2967 Url: http://chorem.org/repositories/revision/lima/2967 Log: Debug lima-swing. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookTypeListModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableCellRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/util/DialogHelper.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-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -19,8 +19,6 @@ package org.chorem.lima.ui.accountsreports; import static org.nuiton.i18n.I18n._; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.ui.combobox.AccountComboBoxModel; @@ -36,10 +34,6 @@ */ public class AccountsReportsViewHandler { - /** log. */ - private static final Log log = - LogFactory.getLog(AccountsReportsViewHandler.class); - protected AccountsReportsView view; protected AccountsReportsTableModel tableModel; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -29,7 +29,6 @@ import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.business.LimaException; import org.chorem.lima.business.ReportService; -import org.chorem.lima.entity.Account; import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.util.ErrorHelper; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -19,8 +19,6 @@ package org.chorem.lima.ui.balance; import static org.nuiton.i18n.I18n._; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.BalanceTrial; import org.chorem.lima.business.FinancialTransactionService; import org.chorem.lima.service.LimaServiceFactory; @@ -37,10 +35,6 @@ */ public class BalanceViewHandler { - /** log. */ - private static final Log log = - LogFactory.getLog(BalanceViewHandler.class); - protected BalanceView view; /** service **/ Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBoxModel.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBoxModel.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -35,7 +35,10 @@ public class AccountComboBoxModel extends AbstractListModel implements ComboBoxModel { - private static final Log log = LogFactory.getLog(FinancialPeriodTableModel.class); + private static final long serialVersionUID = -4513156210596401121L; + + private static final Log log = + LogFactory.getLog(FinancialPeriodTableModel.class); protected Object selectedAccount; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountRenderer.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountRenderer.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -1,3 +1,21 @@ +/* *##% 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, USA. + * ##%*/ + package org.chorem.lima.ui.combobox; import java.awt.Component; @@ -10,7 +28,9 @@ public class AccountRenderer extends DefaultListCellRenderer { - @Override + private static final long serialVersionUID = -2756100193253351274L; + + @Override public Component getListCellRendererComponent(JList list, Object value, int index, Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookComboBoxModel.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookComboBoxModel.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -39,7 +39,10 @@ */ public class EntryBookComboBoxModel extends DefaultComboBoxModel { - private static final Log log = LogFactory.getLog(FinancialPeriodTableModel.class); + private static final long serialVersionUID = -2198896334751124051L; + + private static final Log log = + LogFactory.getLog(FinancialPeriodTableModel.class); protected Object selectedEntryBook; @@ -48,7 +51,8 @@ protected List<EntryBook> cacheDatas; public EntryBookComboBoxModel() { - entryBookService = LimaServiceFactory.getInstance().getEntryBookService(); + entryBookService = + LimaServiceFactory.getInstance().getEntryBookService(); cacheDatas = getDataList(); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookRenderer.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookRenderer.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -12,6 +12,8 @@ public class EntryBookRenderer extends DefaultListCellRenderer { + private static final long serialVersionUID = 8415102235262629812L; + @Override public Component getListCellRendererComponent(JList list, Object value, Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookTypeListModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookTypeListModel.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookTypeListModel.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -1,6 +1,3 @@ -package org.chorem.lima.ui.combobox; - - /* *##% Lima Swing * Copyright (C) 2008 - 2010 CodeLutin * @@ -19,6 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ##%*/ +package org.chorem.lima.ui.combobox; + import static org.nuiton.i18n.I18n._; import javax.swing.AbstractListModel; import javax.swing.ComboBoxModel; @@ -30,10 +29,14 @@ */ public class EntryBookTypeListModel extends AbstractListModel implements ComboBoxModel { - protected Object selectedObject; + private static final long serialVersionUID = 3777447499815020502L; + protected Object selectedObject; + /** Data. TODO put string in another place, don't use hard coded string. */ - protected Object[] data = new Object[]{ _("lima.entrybook.type1"), _("lima.entrybook.type2"), _("lima.entrybook.type3"), _("lima.entrybook.type4"), _("lima.entrybook.type5")}; + protected Object[] data = new Object[]{ _("lima.entrybook.type1"), + _("lima.entrybook.type2"), _("lima.entrybook.type3"), + _("lima.entrybook.type4"), _("lima.entrybook.type5")}; public EntryBookTypeListModel() { super(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -19,10 +19,8 @@ package org.chorem.lima.ui.combobox; import java.util.List; - import javax.swing.AbstractListModel; import javax.swing.ComboBoxModel; -import javax.swing.event.ListDataListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.FinancialPeriodService; @@ -43,7 +41,9 @@ */ public class FinancialPeriodComboBoxModel extends AbstractListModel implements ComboBoxModel { - private static final Log log = + private static final long serialVersionUID = 5272891704755358592L; + + private static final Log log = LogFactory.getLog(FinancialPeriodTableModel.class); protected Object selectedFinancialPeriod; @@ -55,7 +55,8 @@ protected FiscalPeriod selectedFiscalPeriod; public FinancialPeriodComboBoxModel() { - financialPeriodService = LimaServiceFactory.getInstance().getFinancialPeriodService(); + financialPeriodService = + LimaServiceFactory.getInstance().getFinancialPeriodService(); datasCache=getDataList(); } @@ -88,7 +89,8 @@ List<FinancialPeriod> result = null; try { if (selectedFiscalPeriod != null){ - result = (List<FinancialPeriod>) selectedFiscalPeriod.getFinancialPeriod(); + result = (List<FinancialPeriod>) + selectedFiscalPeriod.getFinancialPeriod(); } else { result = financialPeriodService.getUnblockedFinancialPeriods(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxRenderer.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxRenderer.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -18,20 +18,18 @@ package org.chorem.lima.ui.combobox; -import static org.nuiton.i18n.I18n._; - import java.awt.Component; import java.text.SimpleDateFormat; - import javax.swing.DefaultListCellRenderer; import javax.swing.JLabel; import javax.swing.JList; - import org.chorem.lima.entity.FinancialPeriod; public class FinancialPeriodComboBoxRenderer extends DefaultListCellRenderer { + private static final long serialVersionUID = -6130397429740718196L; + @Override public Component getListCellRendererComponent(JList list, Object value, Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -22,21 +22,20 @@ import javax.swing.AbstractListModel; import javax.swing.ComboBoxModel; -import javax.swing.event.ListDataListener; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.FiscalPeriodService; import org.chorem.lima.business.LimaException; -import org.chorem.lima.entity.Account; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.financialperiod.FinancialPeriodTableModel; public class FiscalPeriodComboBoxModel extends AbstractListModel implements ComboBoxModel{ - - private static final Log log = LogFactory.getLog(FinancialPeriodTableModel.class); + private static final long serialVersionUID = 1L; + + private static final Log log = LogFactory.getLog(FinancialPeriodTableModel.class); + protected Object selectedFiscalPeriod; protected FiscalPeriodService fiscalPeriodService; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxRenderer.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxRenderer.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -27,6 +27,8 @@ public class FiscalPeriodComboBoxRenderer extends DefaultListCellRenderer { + private static final long serialVersionUID = 7131001128874614788L; + @Override public Component getListCellRendererComponent(JList list, Object value, Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -20,8 +20,6 @@ import java.awt.Color; import java.awt.Component; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.FinancialTransaction; import org.jdesktop.swingx.JXTable; @@ -42,9 +40,6 @@ /** serialVersionUID. */ private static final long serialVersionUID = 3133690382049594727L; - /** log. */ - private static final Log log = LogFactory.getLog(EntryBooksReportsTable.class); - protected EntryBooksReportsViewHandler handler; protected EntryBooksReportsTableModel model; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -19,9 +19,6 @@ package org.chorem.lima.ui.entrybooksreports; import static org.nuiton.i18n.I18n._; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.ui.combobox.EntryBookComboBoxModel; @@ -37,10 +34,6 @@ */ public class EntryBooksReportsViewHandler { - /** log. */ - private static final Log log = - LogFactory.getLog(EntryBooksReportsViewHandler.class); - protected EntryBooksReportsView view; protected EntryBooksReportsTable table; 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 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -37,7 +37,9 @@ public class FinancialPeriodTable extends JXTable { - private static final Log log = + private static final long serialVersionUID = -1960326844433064178L; + + private static final Log log = LogFactory.getLog(FinancialPeriodTableModel.class); protected FinancialPeriodViewHandler handler; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -19,7 +19,6 @@ package org.chorem.lima.ui.financialstatementchart; import static org.nuiton.i18n.I18n._; -import javax.swing.JFileChooser; import javax.swing.JOptionPane; import javax.swing.tree.TreePath; import org.apache.commons.logging.Log; @@ -35,7 +34,6 @@ import org.chorem.lima.ui.importexport.ImportExportForm; import org.chorem.lima.util.DialogHelper; import org.chorem.lima.util.ErrorHelper; -import org.chorem.lima.util.FileChooseView; import org.jdesktop.swingx.JXTreeTable; /** Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTable.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTable.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -20,23 +20,10 @@ import java.awt.Color; import java.awt.Component; -import java.awt.Font; -import java.text.SimpleDateFormat; - -import javax.swing.border.LineBorder; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.FinancialStatementAmounts; import org.chorem.lima.business.FinancialPeriodService; -import org.chorem.lima.business.LimaException; -import org.chorem.lima.entity.ClosedPeriodicEntryBook; -import org.chorem.lima.entity.ClosedPeriodicEntryBookImpl; -import org.chorem.lima.entity.FinancialStatement; -import org.chorem.lima.entity.FinancialStatementImpl; import org.chorem.lima.service.LimaServiceFactory; import org.jdesktop.swingx.JXTable; -import org.jdesktop.swingx.decorator.BorderHighlighter; import org.jdesktop.swingx.decorator.ColorHighlighter; import org.jdesktop.swingx.decorator.ComponentAdapter; import org.jdesktop.swingx.decorator.HighlightPredicate; @@ -44,11 +31,10 @@ public class FinancialStatementReportTable extends JXTable { - private static final Log log = - LogFactory.getLog(FinancialStatementReportTableModel.class); + private static final long serialVersionUID = 154211277688304679L; + + protected FinancialStatementReportViewHandler handler; - protected FinancialStatementReportViewHandler handler; - protected FinancialStatementReportTableModel model; protected FinancialPeriodService financialPeriodService; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableCellRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableCellRenderer.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableCellRenderer.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -21,7 +21,6 @@ import javax.swing.table.*; import javax.swing.*; import org.chorem.lima.beans.FinancialStatementAmounts; -import org.chorem.lima.entity.FinancialStatement; import java.awt.*; @@ -32,7 +31,9 @@ public class FinancialStatementReportTableCellRenderer extends DefaultTableCellRenderer { - @Override + private static final long serialVersionUID = 4682358397738816778L; + + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { @@ -64,24 +65,6 @@ } } } - // Alignement des cellules - /* switch (column) { - case 0: - this.setHorizontalAlignment(JLabel.LEFT); - break; - case 1: - this.setHorizontalAlignment(JLabel.RIGHT); - break; - case 2: - this.setHorizontalAlignment(JLabel.RIGHT); - break; - case 3: - this.setHorizontalAlignment(JLabel.RIGHT); - break; - case 4: - this.setHorizontalAlignment(JLabel.RIGHT); - break; - }*/ return this; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -20,20 +20,14 @@ package org.chorem.lima.ui.financialstatementreport; import static org.nuiton.i18n.I18n._; -import java.util.ArrayList; import java.util.Date; import java.util.List; import javax.swing.table.AbstractTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.beans.BalanceTrial; import org.chorem.lima.beans.FinancialStatementAmounts; -import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.business.FinancialStatementService; import org.chorem.lima.business.LimaException; -import org.chorem.lima.business.ReportService; -import org.chorem.lima.entity.Account; -import org.chorem.lima.entity.FinancialStatement; import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.util.ErrorHelper; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -18,13 +18,8 @@ package org.chorem.lima.ui.financialstatementreport; -import static org.nuiton.i18n.I18n._; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.lima.beans.BalanceTrial; import org.chorem.lima.business.FinancialTransactionService; import org.chorem.lima.service.LimaServiceFactory; -import org.chorem.lima.ui.financialperiod.FinancialPeriodView; /** @@ -38,10 +33,6 @@ */ public class FinancialStatementReportViewHandler { - /** log. */ - private static final Log log = - LogFactory.getLog(FinancialStatementReportViewHandler.class); - protected FinancialStatementReportView view; /** service **/ 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 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -23,9 +23,6 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.util.Date; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.ui.celleditor.AccountTableCellEditor; @@ -49,9 +46,6 @@ /** serialVersionUID. */ private static final long serialVersionUID = 3133690382049594727L; - /** log. */ - private static final Log log = LogFactory.getLog(FinancialTransactionTable.class); - protected FinancialTransactionViewHandler handler; private Highlighter colorTransaction; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -23,9 +23,6 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.util.Date; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.ui.celleditor.AccountTableCellEditor; @@ -50,9 +47,6 @@ /** serialVersionUID. */ private static final long serialVersionUID = 3133690382049594727L; - /** log. */ - private static final Log log = LogFactory.getLog(FinancialTransactionUnbalancedTable.class); - protected FinancialTransactionUnbalancedViewHandler handler; private Highlighter colorTransaction; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTable.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTable.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -20,13 +20,9 @@ import java.awt.Color; import java.awt.Component; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.FiscalPeriodService; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; -import org.chorem.lima.ui.financialperiod.FinancialPeriodTableModel; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.ColorHighlighter; import org.jdesktop.swingx.decorator.ComponentAdapter; @@ -36,10 +32,10 @@ public class FiscalPeriodTable extends JXTable { -private static final Log log = LogFactory.getLog(FinancialPeriodTableModel.class); + private static final long serialVersionUID = -8462838870024505659L; + + protected FiscalPeriodViewHandler handler; - protected FiscalPeriodViewHandler handler; - protected FiscalPeriodTableModel model; protected FiscalPeriodService financialPeriodService; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeViewHandler.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeViewHandler.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -2,17 +2,10 @@ import static org.nuiton.i18n.I18n._; import java.awt.Color; -import java.awt.Font; import java.util.List; -import javax.swing.BorderFactory; import javax.swing.JEditorPane; -import javax.swing.JPanel; -import javax.swing.border.Border; -import javax.swing.border.EtchedBorder; import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; -import javax.swing.plaf.basic.BasicEditorPaneUI; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaContext; @@ -28,8 +21,6 @@ import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.MainView; -import com.sun.codemodel.internal.JLabel; - public class HomeViewHandler implements HyperlinkListener { private static final Log log = LogFactory.getLog(HomeViewHandler.class); @@ -112,7 +103,8 @@ entryBookPane.addHyperlinkListener(this); fiscalYearPane.addHyperlinkListener(this); dailyPane.addHyperlinkListener(this); - String htmlBegin = "<font face='sans-serif' size=3><p style=vertical-align:'bottom', horizontal-align:'center'>"; + String htmlBegin = "<font face='sans-serif' size=3>" + + "<p style=vertical-align:'bottom', horizontal-align:'center'>"; String htmlEnd = "</p></font>"; try { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTable.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTable.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -20,9 +20,6 @@ import java.awt.Color; import java.awt.Component; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.lima.entity.Account; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.ColorHighlighter; import org.jdesktop.swingx.decorator.ComponentAdapter; @@ -41,9 +38,6 @@ /** serialVersionUID. */ private static final long serialVersionUID = 3133690382049594727L; - /** log. */ - private static final Log log = LogFactory.getLog(LedgerTable.class); - protected LedgerViewHandler handler; private Highlighter colorReportsDatas; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -19,8 +19,6 @@ package org.chorem.lima.ui.ledger; import static org.nuiton.i18n.I18n._; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.BalanceTrial; @@ -35,10 +33,6 @@ */ public class LedgerViewHandler { - /** log. */ - private static final Log log = - LogFactory.getLog(LedgerViewHandler.class); - protected LedgerView view; protected LedgerTableModel model; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/util/DialogHelper.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/util/DialogHelper.java 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/java/org/chorem/lima/util/DialogHelper.java 2010-07-12 13:08:29 UTC (rev 2967) @@ -19,17 +19,10 @@ package org.chorem.lima.util; import static org.nuiton.i18n.I18n._; - import java.awt.Component; - -import javax.swing.JEditorPane; import javax.swing.JFrame; import javax.swing.JOptionPane; -import javax.swing.JScrollPane; import javax.swing.JTextArea; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.util.Resource; /** @@ -38,11 +31,6 @@ */ public class DialogHelper { - /** - * log - */ - private static final Log log = LogFactory.getLog(DialogHelper.class); - public static int showConfirmDialog(String message) { String[] response = {_("lima.response.yes"), _("lima.response.no")}; return JOptionPane.showOptionDialog(null, 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 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties 2010-07-12 13:08:29 UTC (rev 2967) @@ -184,17 +184,37 @@ lima.transaction.period=Period lima.voucher=Voucher lima.warning.nimbus.landf=Could not find Numbus Look&Feel +limahome.chartaccounts.create= +limahome.chartaccounts.modify= +limahome.chartaccounts.nothing= +limahome.chartaccounts.state1_2= +limahome.chartaccounts.state2_2= limahome.chartaccounts1= limahome.chartaccounts2= limahome.createchartaccounts= limahome.createchartaccounts1= limahome.createchartaccounts2= limahome.entrybooknoopen= +limahome.entrybooks.create= +limahome.entrybooks.modify= +limahome.entrybooks.nothing= +limahome.entrybooks.state.single= +limahome.entrybooks.state1_2.plural= +limahome.entrybooks.state2_2.plural= limahome.entrybooks1= limahome.entrybooks2= +limahome.fiscalperiod.closed= +limahome.fiscalperiod.create= +limahome.fiscalperiod.modify= +limahome.fiscalperiod.noopen= +limahome.fiscalperiod.opened= limahome.fiscalperiodclosed= limahome.fiscalperiodnoopen= limahome.fiscalperiodopened= +limahome.transaction.balanced= +limahome.transaction.create= +limahome.transaction.modifiy= +limahome.transaction.unbalanced= limahome.transactionbalanced= limahome.transactionunbalanced= update= 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 2010-07-12 10:37:10 UTC (rev 2966) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties 2010-07-12 13:08:29 UTC (rev 2967) @@ -184,24 +184,24 @@ lima.transaction.period=P\u00E9riode lima.voucher=Document lima.warning.nimbus.landf=Le look and feel nymbus n'a pas \u00E9t\u00E9 trouv\u00E9 +limahome.chartaccounts.create=Cr\u00E9er le plan des comptes +limahome.chartaccounts.modify=Modifier le plan des comptes limahome.chartaccounts.nothing=Aucun compte \! limahome.chartaccounts.state1_2=Le plan comptable possede limahome.chartaccounts.state2_2=comptes -limahome.chartaccounts.create=Cr\u00E9er le plan des comptes -limahome.chartaccounts.modify=Modifier le plan des comptes +limahome.entrybooks.create=Cr\u00E9er les journaux +limahome.entrybooks.modify=Modifier les journaux limahome.entrybooks.nothing=Aucun journal ouvert \! -limahome.entrybooks.modify=Modifier les journaux -limahome.entrybooks.create=Cr\u00E9er les journaux +limahome.entrybooks.state.single=Le journal est \: limahome.entrybooks.state1_2.plural=Les limahome.entrybooks.state2_2.plural=journaux sont \: -limahome.entrybooks.state.single=Le journal est \: limahome.fiscalperiod.closed=exercices clotur\u00E9s -limahome.fiscalperiod.opened=exercices ouverts -limahome.fiscalperiod.noopen=Aucun exercice ouvert \! limahome.fiscalperiod.create=Cr\u00E9er un exercice limahome.fiscalperiod.modify=Modifier les exercices +limahome.fiscalperiod.noopen=Aucun exercice ouvert \! +limahome.fiscalperiod.opened=exercices ouverts limahome.transaction.balanced=Toutes les \u00E9critures sont \u00E9quilibr\u00E9es +limahome.transaction.create=Modifier les \u00E9critures +limahome.transaction.modifiy=Modifier les \u00E9critures non \u00E9quilibr\u00E9es limahome.transaction.unbalanced=\u00E9critures ne sont pas \u00E9quilibr\u00E9es \! -limahome.transaction.modifiy=Modifier les \u00E9critures non \u00E9quilibr\u00E9es -limahome.transaction.create=Modifier les \u00E9critures update=