Author: sbavencoff Date: 2014-07-11 08:50:04 +0200 (Fri, 11 Jul 2014) New Revision: 3848 Url: http://forge.chorem.org/projects/lima/repository/revisions/3848 Log: fixes #977 : Rapport : suppression des menus Removed: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/ Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 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 2014-07-10 15:28:04 UTC (rev 3847) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2014-07-11 06:50:04 UTC (rev 3848) @@ -164,29 +164,7 @@ onActionPerformed='getHandler().showLetteringView(this)' actionIcon='lettering'/> </JMenu> - <JMenu text="lima.reports" mnemonic="{'R'}"> - <JMenuItem text="lima.reports.accounts" - onActionPerformed='getHandler().showAccountReports(this)' - actionIcon='reports-account'/> - <JMenuItem text="lima.reports.entrybooks" - onActionPerformed='getHandler().showEntryBookReports(this)' - actionIcon='reports-entrybook'/> - <JMenuItem text="lima.reports.balance" - onActionPerformed='getHandler().showBalanceView(this)' - actionIcon='reports-balance'/> - <JMenuItem text="lima.reports.ledger" - onActionPerformed='getHandler().showLedgerView(this)' - actionIcon='reports-ledger'/> - <JMenuItem text="lima.reports.financialstatement" - onActionPerformed='getHandler().showFinancialStatementReportsView(this)' - actionIcon='reports-financialstatement'/> - <!-- useless #669--> - <!--<JMenuItem text="lima.reports.vat"--> - <!--onActionPerformed='getHandler().showVatReportView(this)'--> - <!--actionIcon='reports-vatstatement'/>--> - </JMenu> - <JMenu text="lima.menu.help" mnemonic="{'H'}"> <!--<JMenuItem id="help" text='lima.menu.help.help' actionIcon="help"--> 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 2014-07-10 15:28:04 UTC (rev 3847) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2014-07-11 06:50:04 UTC (rev 3848) @@ -37,15 +37,11 @@ import org.chorem.lima.enums.ImportExportEnum; import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.account.AccountView; -import org.chorem.lima.ui.accountsreports.AccountsReportsView; -import org.chorem.lima.ui.balance.BalanceReportsView; import org.chorem.lima.ui.celleditor.NumberSeparatorCellRenderer; import org.chorem.lima.ui.celleditor.NumberSeparatorTableCellRenderer; import org.chorem.lima.ui.entrybook.EntryBookView; -import org.chorem.lima.ui.entrybooksreports.EntryBooksReportsView; import org.chorem.lima.ui.financialperiod.FinancialPeriodView; import org.chorem.lima.ui.financialstatementchart.FinancialStatementChartView; -import org.chorem.lima.ui.financialstatementreport.FinancialStatementReportView; import org.chorem.lima.ui.financialtransaction.FinancialTransactionView; import org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchView; import org.chorem.lima.ui.financialtransactionunbalanced.FinancialTransactionUnbalancedView; @@ -53,17 +49,22 @@ import org.chorem.lima.ui.home.HomeView; import org.chorem.lima.ui.identity.IdentityForm; import org.chorem.lima.ui.importexport.ImportExport; -import org.chorem.lima.ui.ledger.LedgerView; import org.chorem.lima.ui.lettering.LetteringView; 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 javax.swing.DefaultCellEditor; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JEditorPane; +import javax.swing.JScrollPane; +import javax.swing.JTabbedPane; +import javax.swing.UIManager; import javax.swing.border.LineBorder; import javax.swing.plaf.BorderUIResource; -import java.awt.*; +import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; @@ -446,33 +447,6 @@ } /** - * Show account table report to view an account on a period - * - * @param rootContext the root application context - */ - public void showAccountReports(JAXXContext rootContext) { - MainView mainView = getUI(rootContext); - AccountsReportsView accountsReportsView = - new AccountsReportsView(mainView); - showTab(mainView, t("lima.reports.accounts"), accountsReportsView); - swingSession.add(accountsReportsView); - } - - /** - * Show entry book table report to view an account on a period - * - * @param rootContext the root application context - */ - public void showEntryBookReports(JAXXContext rootContext) { - MainView mainView = getUI(rootContext); - EntryBooksReportsView entryBooksReportsView = - new EntryBooksReportsView(mainView); - showTab(mainView, t("lima.reports.entrybooks"), entryBooksReportsView); - swingSession.add(entryBooksReportsView); - } - - - /** * Show financial transactions view to create entries * * @param rootContext the root application context @@ -510,36 +484,6 @@ swingSession.add(letteringView); } - public void showBalanceView(JAXXContext rootContext) { - MainView mainView = getUI(rootContext); - BalanceReportsView balanceView = new BalanceReportsView(mainView); - showTab(mainView, t("lima.reports.balance"), balanceView); - swingSession.add(balanceView); - } - - public void showLedgerView(JAXXContext rootContext) { - MainView mainView = getUI(rootContext); - LedgerView ledgerView = new LedgerView(mainView); - showTab(mainView, t("lima.reports.ledger"), ledgerView); - swingSession.add(ledgerView); - } - - public void showFinancialStatementReportsView(JAXXContext rootContext) { - MainView mainView = getUI(rootContext); - FinancialStatementReportView financialStatementReportView = - new FinancialStatementReportView(mainView); - showTab(mainView, t("lima.reports.financialstatement"), - financialStatementReportView); - swingSession.add(financialStatementReportView); - } - - public void showVatReportView(JAXXContext rootContext) { - MainView mainView = getUI(rootContext); - VatReportView vatReportView = new VatReportView(mainView); - showTab(mainView, t("lima.reports.vat"), vatReportView); - swingSession.add(vatReportView); - } - public void showImportExportView(JAXXContext rootContext, ImportExportEnum type) { MainView mainView = getUI(rootContext);