This is an automated email from the git hooks/post-receive script. New commit to branch feature/1207 in repository lima. See http://git.chorem.org/lima.git commit 248ce540b90ad1de855962267b56169a84454287 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 24 17:49:49 2015 +0200 rebase to develop (refs #1207) --- .../lima/business/ejb/FinancialStatementServiceImpl.java | 10 +++++----- .../org/chorem/lima/business/ejb/ImportServiceImpl.java | 14 +++++++------- .../FinancialStatementChartTreeTableModel.java | 4 ++-- .../FinancialTransactionSearchViewHandler.java | 1 + .../org/chorem/lima/ui/vatchart/VatChartViewHandler.java | 4 ++-- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java index 4fb4cb7..12458ea 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java @@ -40,7 +40,7 @@ import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.FinancialStatementService; import org.chorem.lima.business.api.ReportService; -import org.chorem.lima.business.exceptions.AlreadyExistFinancialStatement; +import org.chorem.lima.business.exceptions.AlreadyExistFinancialStatementException; import org.chorem.lima.business.exceptions.LimaException; import org.chorem.lima.business.exceptions.NotAllowedLabelException; import org.chorem.lima.entity.Account; @@ -80,7 +80,7 @@ public class FinancialStatementServiceImpl extends AbstractLimaService implement } }; - protected void validateNewFinancialStatement(FinancialStatement masterFinancialStatement, FinancialStatement financialStatement) throws AlreadyExistFinancialStatement, NotAllowedLabelException { + protected void validateNewFinancialStatement(FinancialStatement masterFinancialStatement, FinancialStatement financialStatement) throws AlreadyExistFinancialStatementException, NotAllowedLabelException { if (financialStatement.getLabel().contains("/")) { throw new NotAllowedLabelException(financialStatement.getLabel()); } @@ -91,7 +91,7 @@ public class FinancialStatementServiceImpl extends AbstractLimaService implement } Map indexedSubFinancialStatements = Maps.uniqueIndex(masterSubFinancialStatements, GET_LABEL); if (indexedSubFinancialStatements.get(financialStatement.getLabel()) != null){ - throw new AlreadyExistFinancialStatement(financialStatement.getLabel(), masterFinancialStatement.getLabel()); + throw new AlreadyExistFinancialStatementException(financialStatement.getLabel(), masterFinancialStatement.getLabel()); } } } @@ -112,11 +112,11 @@ public class FinancialStatementServiceImpl extends AbstractLimaService implement @Override public FinancialStatement createFinancialStatement(FinancialStatement parentFinancialStatement, - FinancialStatement financialStatement) throws AlreadyExistFinancialStatement, NotAllowedLabelException { + FinancialStatement financialStatement) throws AlreadyExistFinancialStatementException, NotAllowedLabelException { validateNewFinancialStatement(parentFinancialStatement, financialStatement); Preconditions.checkState(parentFinancialStatement.isPersisted(), "parents statement must be persited"); - Preconditions.checkState(! financialStatement.isPersisted(), " statement to create must be not persited"); + Preconditions.checkState(!financialStatement.isPersisted(), " statement to create must be not persited"); FinancialStatementTopiaDao financialStatementTopiaDao = getDaoHelper().getFinancialStatementDao(); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java index b9d34b6..766b126 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java @@ -54,7 +54,7 @@ import org.chorem.lima.business.ejb.ebp.EntryBookEBPModel; import org.chorem.lima.business.ejb.ebp.EntryEBPModel; import org.chorem.lima.business.exceptions.AlreadyExistAccountException; import org.chorem.lima.business.exceptions.AlreadyExistEntryBookException; -import org.chorem.lima.business.exceptions.AlreadyExistFinancialStatement; +import org.chorem.lima.business.exceptions.AlreadyExistFinancialStatementException; import org.chorem.lima.business.exceptions.AlreadyExistVatStatementException; import org.chorem.lima.business.exceptions.BeginAfterEndFiscalPeriodException; import org.chorem.lima.business.exceptions.ImportEbpException; @@ -348,7 +348,7 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ return results; } - protected FinancialStatement returnFinancialStatement (final FinancialStatement rootFinancialStatement, String subFinancialStatementLabel) throws AlreadyExistFinancialStatement, NotAllowedLabelException { + protected FinancialStatement returnFinancialStatement (final FinancialStatement rootFinancialStatement, String subFinancialStatementLabel) throws AlreadyExistFinancialStatementException, NotAllowedLabelException { FinancialStatement targetedFinancialStatement = null; if (rootFinancialStatement != null) { Collection<FinancialStatement> subFinancialStatements = rootFinancialStatement.getSubFinancialStatements(); @@ -470,12 +470,12 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ } result.increaseCreated(); - } catch (AlreadyExistFinancialStatement | NotAllowedLabelException e) { + } catch (AlreadyExistFinancialStatementException | NotAllowedLabelException e) { result.addException(e); } } - private FinancialStatement getRootFinancialStatement(Map<String, FinancialStatement> orderedFinancialStatements, final FinancialStatementImport financialStatementBean, final FinancialStatement financialStatement) throws AlreadyExistFinancialStatement, NotAllowedLabelException { + private FinancialStatement getRootFinancialStatement(Map<String, FinancialStatement> orderedFinancialStatements, final FinancialStatementImport financialStatementBean, final FinancialStatement financialStatement) throws AlreadyExistFinancialStatementException, NotAllowedLabelException { FinancialStatement rootFinancialStatement = orderedFinancialStatements.get(financialStatementBean.getLabel()); if (rootFinancialStatement == null) { @@ -490,7 +490,7 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ return rootFinancialStatement; } - private FinancialStatement getBrancheFinancialStatement(String[] masterNames, final FinancialStatement branchesFinancialStatement) throws AlreadyExistFinancialStatement, NotAllowedLabelException { + private FinancialStatement getBrancheFinancialStatement(String[] masterNames, final FinancialStatement branchesFinancialStatement) throws AlreadyExistFinancialStatementException, NotAllowedLabelException { FinancialStatement _branchesFinancialStatement = branchesFinancialStatement; if (_branchesFinancialStatement != null) { // 0 is root, start from 1 @@ -502,7 +502,7 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ return _branchesFinancialStatement; } - protected void createRootFinancialStatement(Map<String, FinancialStatement> orderedFinancialStatements, final FinancialStatement financialStatement, final FinancialStatement branchesFinancialStatement) throws AlreadyExistFinancialStatement, NotAllowedLabelException { + protected void createRootFinancialStatement(Map<String, FinancialStatement> orderedFinancialStatements, final FinancialStatement financialStatement, final FinancialStatement branchesFinancialStatement) throws AlreadyExistFinancialStatementException, NotAllowedLabelException { // if the master finacial statement has been modified then the current one is replace by the new one. FinancialStatement _financialStatement = financialStatementService.createFinancialStatement(branchesFinancialStatement, financialStatement); FinancialStatement targetedRootFinancialStatement = returnRootFinancialStatement(_financialStatement); @@ -527,7 +527,7 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ return alreadyCreated; } - protected FinancialStatement createRootFinancialStatement(Map<String, FinancialStatement> orderedFinancialStatements, String rootMasterName, FinancialStatement rootFinancialStatement) throws AlreadyExistFinancialStatement, NotAllowedLabelException { + protected FinancialStatement createRootFinancialStatement(Map<String, FinancialStatement> orderedFinancialStatements, String rootMasterName, FinancialStatement rootFinancialStatement) throws AlreadyExistFinancialStatementException, NotAllowedLabelException { if (rootFinancialStatement == null) { rootFinancialStatement = financialStatementService.newFinancialStatement(); rootFinancialStatement.setLabel(rootMasterName); diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java index e2687e8..b4d2a03 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java @@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaSwingConfig; import org.chorem.lima.business.LimaServiceFactory; import org.chorem.lima.business.api.FinancialStatementService; -import org.chorem.lima.business.exceptions.AlreadyExistFinancialStatement; +import org.chorem.lima.business.exceptions.AlreadyExistFinancialStatementException; import org.chorem.lima.business.exceptions.NotAllowedLabelException; import org.chorem.lima.entity.FinancialStatement; import org.chorem.lima.entity.FinancialStatementImpl; @@ -216,7 +216,7 @@ public class FinancialStatementChartTreeTableModel extends AbstractTreeTableMode modelSupport.fireTreeStructureChanged(path); - } catch (AlreadyExistFinancialStatement alreadyExistFinancialStatement) { + } catch (AlreadyExistFinancialStatementException alreadyExistFinancialStatement) { errorHelper.showErrorMessage(t("lima.financialStatement.error.alreadyExistFinancialStatement", alreadyExistFinancialStatement.getFinancialStatementLabel(), alreadyExistFinancialStatement.getMasterLabel())); } catch (NotAllowedLabelException notAllowedLabel) { diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java index 2b65659..b6bf37f 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java @@ -45,6 +45,7 @@ import javax.swing.AbstractAction; import javax.swing.ActionMap; import javax.swing.InputMap; import javax.swing.JComponent; +import javax.swing.JSplitPane; import javax.swing.KeyStroke; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java index cc1c383..0d255c8 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java @@ -28,6 +28,7 @@ import org.chorem.lima.business.api.VatStatementService; import org.chorem.lima.entity.VatStatement; import org.chorem.lima.entity.VatStatementImpl; import org.chorem.lima.enums.ImportExportEnum; +import org.chorem.lima.enums.VatStatementsChartEnum; import org.chorem.lima.ui.importexport.ImportExport; import org.jdesktop.swingx.JXTreeTable; @@ -222,8 +223,7 @@ public class VatChartViewHandler implements ServiceListener { if (form.getDeleteVatStatementChart().isSelected()) { vatStatementService.removeAllVatStatement(); } - VatStatementsChartEnum vatStatementsEnum = - (VatStatementsChartEnum) value; + VatStatementsChartEnum vatStatementsEnum = (VatStatementsChartEnum) value; ImportExport importExport = new ImportExport(view); importExport.importExport(ImportExportEnum.CSV_VAT_IMPORT, null, vatStatementsEnum.getDefaultFileUrl(), true); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.