branch feature/newReportBuilder updated (5e5d8f2 -> faab6df)
This is an automated email from the git hooks/post-receive script. New change to branch feature/newReportBuilder in repository lima. See http://git.chorem.org/lima.git from 5e5d8f2 refs #769 création d'un nouveau module pour la partie web de lima et création du rapport balance avec jasper report new faab6df refs #769 mise à jour des dépendances et des pom The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit faab6df7f8ea23861bb6269f253cc86aaf85f5f8 Author: dcosse <japbiw74> Date: Fri Nov 7 17:57:57 2014 +0100 refs #769 mise à jour des dépendances et des pom Summary of changes: .../api/report/BalanceBeanReportService.java | 22 +++++++ lima-business/pom.xml | 45 +-------------- .../ejb/report/BalanceBeanReportServiceImpl.java | 22 +++++++ .../lima/beans/BalanceReportAccountImpl.java | 22 +++++++ .../org/chorem/lima/filter/FilterGenerator.java | 20 +++---- lima-swing/pom.xml | 9 +++ .../src/main/java/org/chorem/lima/LimaSplash.java | 6 +- .../main/java/org/chorem/lima/ui/BetaLayerUI.java | 9 +-- .../AccountCondition/AccountConditionView.css | 21 +++++++ .../BigDecimalConditionView.css | 21 +++++++ .../EntryBookConditionHandler.java | 2 +- .../EntryBookCondition/EntryBookConditionView.css | 21 +++++++ .../Filter/StringCondition/StringConditionView.css | 21 +++++++ .../ui/Filter/dateCondition/DateConditionView.css | 21 +++++++ .../DateIntervalConditionView.css | 21 +++++++ .../FinancialPeriodConditionHandler.java | 2 +- .../FinancialPeriodConditionView.css | 21 +++++++ .../FinancialTransactionConditionView.css | 21 +++++++ .../FiscalPeriodConditionHandler.java | 2 +- .../FiscalPeriodConditionView.css | 21 +++++++ .../java/org/chorem/lima/ui/MainViewHandler.java | 1 - .../lima/ui/account/AccountTreeTableRenderer.java | 9 ++- .../ui/celleditor/BigDecimalTableCellRenderer.java | 6 +- .../lima/ui/combobox/LetterComboBoxModel.java | 3 +- .../chorem/lima/ui/common/AccountListRenderer.java | 6 +- .../lima/ui/common/EntryBookListRenderer.java | 8 +-- .../ui/common/FinancialPeriodListRenderer.java | 10 ++-- .../lima/ui/common/FiscalPeriodListRenderer.java | 10 ++-- .../lima/ui/common/GenericComboBoxModel.java | 3 +- .../FinancialPeriodViewHandler.java | 7 +-- .../FinancialTransactionSearchTableModel.java | 2 +- .../FinancialTransactionSearchView.css | 21 +++++++ .../FinancialTransactionUnbalancedView.jaxx | 7 +-- .../org/chorem/lima/ui/home/AbstractHomePane.java | 5 +- .../lima/ui/importexport/ImportExportWaitView.css | 21 +++++++ .../org/chorem/lima/ui/lettering/LetteringView.css | 21 +++++++ .../lima/ui/lettering/LetteringViewHandler.java | 11 +--- .../lima/ui/lettering/LettringSelectionModel.java | 2 +- .../lima/ui/vatchart/VatChartViewHandler.java | 7 +-- .../org/chorem/lima/util/BigDecimalToString.java | 22 +++++++ .../java/org/chorem/lima/util/ReportDialogView.css | 21 +++++++ .../org/chorem/lima/widgets/JWideComboBox.java | 5 +- .../chorem/lima/widgets/ScrollBasicComboPopup.java | 3 +- .../lima/ui/account/AccountViewHandlerTest.java | 7 +-- lima-web/pom.xml | 41 +++++++++++++ .../chorem/lima/web/action/DocumentService.java | 12 ++-- .../web/action/balance/BalanceReportBuilder.java | 22 +++++++ .../chorem/lima/web/service/HttpServerService.java | 36 +++++++++--- .../org/chorem/lima/web/utils/DocumentsEnum.java | 6 +- .../org/chorem/lima/web/action/ReportTest.java | 3 - ofbizNeogia/src/org/ofbiz/lima/AccountService.java | 5 +- ofbizNeogia/src/org/ofbiz/lima/EntryService.java | 7 ++- ofbizNeogia/src/org/ofbiz/lima/JournalService.java | 5 +- ofbizNeogia/src/org/ofbiz/lima/PeriodService.java | 5 +- ofbizNeogia/src/org/ofbiz/lima/StatusService.java | 5 +- .../src/org/ofbiz/lima/TransactionService.java | 11 ++-- pom.xml | 67 +++++++++++++--------- 57 files changed, 590 insertions(+), 203 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/newReportBuilder in repository lima. See http://git.chorem.org/lima.git commit faab6df7f8ea23861bb6269f253cc86aaf85f5f8 Author: dcosse <japbiw74> Date: Fri Nov 7 17:57:57 2014 +0100 refs #769 mise à jour des dépendances et des pom --- .../api/report/BalanceBeanReportService.java | 22 +++++++ lima-business/pom.xml | 45 +-------------- .../ejb/report/BalanceBeanReportServiceImpl.java | 22 +++++++ .../lima/beans/BalanceReportAccountImpl.java | 22 +++++++ .../org/chorem/lima/filter/FilterGenerator.java | 20 +++---- lima-swing/pom.xml | 9 +++ .../src/main/java/org/chorem/lima/LimaSplash.java | 6 +- .../main/java/org/chorem/lima/ui/BetaLayerUI.java | 9 +-- .../AccountCondition/AccountConditionView.css | 21 +++++++ .../BigDecimalConditionView.css | 21 +++++++ .../EntryBookConditionHandler.java | 2 +- .../EntryBookCondition/EntryBookConditionView.css | 21 +++++++ .../Filter/StringCondition/StringConditionView.css | 21 +++++++ .../ui/Filter/dateCondition/DateConditionView.css | 21 +++++++ .../DateIntervalConditionView.css | 21 +++++++ .../FinancialPeriodConditionHandler.java | 2 +- .../FinancialPeriodConditionView.css | 21 +++++++ .../FinancialTransactionConditionView.css | 21 +++++++ .../FiscalPeriodConditionHandler.java | 2 +- .../FiscalPeriodConditionView.css | 21 +++++++ .../java/org/chorem/lima/ui/MainViewHandler.java | 1 - .../lima/ui/account/AccountTreeTableRenderer.java | 9 ++- .../ui/celleditor/BigDecimalTableCellRenderer.java | 6 +- .../lima/ui/combobox/LetterComboBoxModel.java | 3 +- .../chorem/lima/ui/common/AccountListRenderer.java | 6 +- .../lima/ui/common/EntryBookListRenderer.java | 8 +-- .../ui/common/FinancialPeriodListRenderer.java | 10 ++-- .../lima/ui/common/FiscalPeriodListRenderer.java | 10 ++-- .../lima/ui/common/GenericComboBoxModel.java | 3 +- .../FinancialPeriodViewHandler.java | 7 +-- .../FinancialTransactionSearchTableModel.java | 2 +- .../FinancialTransactionSearchView.css | 21 +++++++ .../FinancialTransactionUnbalancedView.jaxx | 7 +-- .../org/chorem/lima/ui/home/AbstractHomePane.java | 5 +- .../lima/ui/importexport/ImportExportWaitView.css | 21 +++++++ .../org/chorem/lima/ui/lettering/LetteringView.css | 21 +++++++ .../lima/ui/lettering/LetteringViewHandler.java | 11 +--- .../lima/ui/lettering/LettringSelectionModel.java | 2 +- .../lima/ui/vatchart/VatChartViewHandler.java | 7 +-- .../org/chorem/lima/util/BigDecimalToString.java | 22 +++++++ .../java/org/chorem/lima/util/ReportDialogView.css | 21 +++++++ .../org/chorem/lima/widgets/JWideComboBox.java | 5 +- .../chorem/lima/widgets/ScrollBasicComboPopup.java | 3 +- .../lima/ui/account/AccountViewHandlerTest.java | 7 +-- lima-web/pom.xml | 41 +++++++++++++ .../chorem/lima/web/action/DocumentService.java | 12 ++-- .../web/action/balance/BalanceReportBuilder.java | 22 +++++++ .../chorem/lima/web/service/HttpServerService.java | 36 +++++++++--- .../org/chorem/lima/web/utils/DocumentsEnum.java | 6 +- .../org/chorem/lima/web/action/ReportTest.java | 3 - ofbizNeogia/src/org/ofbiz/lima/AccountService.java | 5 +- ofbizNeogia/src/org/ofbiz/lima/EntryService.java | 7 ++- ofbizNeogia/src/org/ofbiz/lima/JournalService.java | 5 +- ofbizNeogia/src/org/ofbiz/lima/PeriodService.java | 5 +- ofbizNeogia/src/org/ofbiz/lima/StatusService.java | 5 +- .../src/org/ofbiz/lima/TransactionService.java | 11 ++-- pom.xml | 67 +++++++++++++--------- 57 files changed, 590 insertions(+), 203 deletions(-) diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/api/report/BalanceBeanReportService.java b/lima-business-api/src/main/java/org/chorem/lima/business/api/report/BalanceBeanReportService.java index c94f9d6..401f69b 100644 --- a/lima-business-api/src/main/java/org/chorem/lima/business/api/report/BalanceBeanReportService.java +++ b/lima-business-api/src/main/java/org/chorem/lima/business/api/report/BalanceBeanReportService.java @@ -1,5 +1,27 @@ package org.chorem.lima.business.api.report; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.beans.BalanceReport; import java.util.Date; diff --git a/lima-business/pom.xml b/lima-business/pom.xml index ab0714e..d892ce1 100644 --- a/lima-business/pom.xml +++ b/lima-business/pom.xml @@ -36,14 +36,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.pdfbox</groupId> - <artifactId>pdfbox</artifactId> - </dependency> - <dependency> - <groupId>org.apache.pdfbox</groupId> - <artifactId>pdfbox-examples</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> @@ -71,10 +63,7 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> @@ -113,23 +102,9 @@ <artifactId>jboss-transaction-api_1.2_spec</artifactId> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - </dependency> - <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> </dependency> - - <dependency> - <groupId>net.sf.jasperreports</groupId> - <artifactId>jasperreports</artifactId> - </dependency> - </dependencies> <build> @@ -151,24 +126,6 @@ <pluginManagement> <plugins> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jasperreports-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>compile-reports</goal> - </goals> - </execution> - </executions> - <dependencies> - <!--note this must be repeated here to pick up correct xml validation --> - <dependency> - <groupId>net.sf.jasperreports</groupId> - <artifactId>jasperreports</artifactId> - </dependency> - </dependencies> - </plugin> - <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/BalanceBeanReportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/BalanceBeanReportServiceImpl.java index d3cf917..47af558 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/BalanceBeanReportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/BalanceBeanReportServiceImpl.java @@ -1,5 +1,27 @@ package org.chorem.lima.business.ejb.report; +/* + * #%L + * Lima :: business + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import org.apache.commons.lang3.StringUtils; diff --git a/lima-callao/src/main/java/org/chorem/lima/beans/BalanceReportAccountImpl.java b/lima-callao/src/main/java/org/chorem/lima/beans/BalanceReportAccountImpl.java index b69f7db..6b6df1a 100644 --- a/lima-callao/src/main/java/org/chorem/lima/beans/BalanceReportAccountImpl.java +++ b/lima-callao/src/main/java/org/chorem/lima/beans/BalanceReportAccountImpl.java @@ -1,5 +1,27 @@ package org.chorem.lima.beans; +/* + * #%L + * Lima :: callao + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.apache.commons.lang3.StringUtils; diff --git a/lima-callao/src/main/java/org/chorem/lima/filter/FilterGenerator.java b/lima-callao/src/main/java/org/chorem/lima/filter/FilterGenerator.java index 7bd7285..a024c8c 100644 --- a/lima-callao/src/main/java/org/chorem/lima/filter/FilterGenerator.java +++ b/lima-callao/src/main/java/org/chorem/lima/filter/FilterGenerator.java @@ -23,16 +23,6 @@ package org.chorem.lima.filter; */ import org.apache.commons.lang3.StringUtils; -import org.chorem.lima.clause.AndClause; -import org.chorem.lima.clause.BooleanClause; -import org.chorem.lima.clause.Clause; -import org.chorem.lima.clause.DateClause; -import org.chorem.lima.clause.NotClause; -import org.chorem.lima.clause.NumberClause; -import org.chorem.lima.clause.OrClause; -import org.chorem.lima.clause.SetClause; -import org.chorem.lima.clause.StringClause; -import org.chorem.lima.clause.SubFilterClause; import org.chorem.lima.beans.AbstractBigDecimalCondition; import org.chorem.lima.beans.AbstractStringCondition; import org.chorem.lima.beans.AccountCondition; @@ -49,6 +39,16 @@ import org.chorem.lima.beans.FiscalPeriodCondition; import org.chorem.lima.beans.LetteringCondition; import org.chorem.lima.beans.VisitorCondition; import org.chorem.lima.beans.VoucherCondition; +import org.chorem.lima.clause.AndClause; +import org.chorem.lima.clause.BooleanClause; +import org.chorem.lima.clause.Clause; +import org.chorem.lima.clause.DateClause; +import org.chorem.lima.clause.NotClause; +import org.chorem.lima.clause.NumberClause; +import org.chorem.lima.clause.OrClause; +import org.chorem.lima.clause.SetClause; +import org.chorem.lima.clause.StringClause; +import org.chorem.lima.clause.SubFilterClause; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FiscalPeriod; diff --git a/lima-swing/pom.xml b/lima-swing/pom.xml index f2a02f3..9defa9a 100644 --- a/lima-swing/pom.xml +++ b/lima-swing/pom.xml @@ -181,6 +181,15 @@ <artifactId>commons-lang</artifactId> </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-flyway</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> </dependencies> <build> diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java b/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java index d7864a5..79eff6e 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java @@ -25,11 +25,7 @@ package org.chorem.lima; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.awt.AlphaComposite; -import java.awt.Color; -import java.awt.Font; -import java.awt.Graphics2D; -import java.awt.SplashScreen; +import java.awt.*; /** * Utility class used to manage information on slash screen. diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/BetaLayerUI.java b/lima-swing/src/main/java/org/chorem/lima/ui/BetaLayerUI.java index 744212f..bfca2ae 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/BetaLayerUI.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/BetaLayerUI.java @@ -22,15 +22,12 @@ package org.chorem.lima.ui; -import java.awt.Color; -import java.awt.Font; -import java.awt.Graphics2D; - -import javax.swing.JComponent; - import org.jdesktop.jxlayer.JXLayer; import org.jdesktop.jxlayer.plaf.AbstractLayerUI; +import javax.swing.*; +import java.awt.*; + /** * Layer qui affiche "beta version". * diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.css b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.css index 83dfb00..7d53060 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.css @@ -1,3 +1,24 @@ +/* + * #%L + * Lima :: Swing + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ #accountConditionFrame { title : "lima.account"; preferredSize : {new Dimension(400, 100)}; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/BigDecimalConditionView.css b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/BigDecimalConditionView.css index fcc62c5..f05a438 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/BigDecimalConditionView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/BigDecimalConditionView.css @@ -1,3 +1,24 @@ +/* + * #%L + * Lima :: Swing + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ #bigDecimalConditionFrame { preferredSize : {new Dimension(200, 100)}; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java index 118328c..fb5ad34 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java @@ -32,7 +32,7 @@ import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.Filter.ConditionHandler; import org.chorem.lima.ui.Filter.financialTransactionCondition.FinancialTransactionConditionHandler; -import javax.swing.JList; +import javax.swing.*; import javax.swing.event.ListSelectionEvent; import java.util.List; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionView.css b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionView.css index 3612e1b..ce19934 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionView.css @@ -1,3 +1,24 @@ +/* + * #%L + * Lima :: Swing + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ #entryBookConditionFrame { title : "lima.entryBook"; preferredSize : {new Dimension(400, 100)}; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.css b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.css index cd5334e..d0689bb 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.css @@ -1,3 +1,24 @@ +/* + * #%L + * Lima :: Swing + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ #stringConditionFrame { preferredSize : {new Dimension(200, 100)}; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.css b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.css index ca978f8..6b4f358 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.css @@ -1,3 +1,24 @@ +/* + * #%L + * Lima :: Swing + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ #dateConditionFrame { title : "lima.date"; preferredSize : {new Dimension(200, 100)}; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.css b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.css index e8f2bba..597ef8e 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.css @@ -1,3 +1,24 @@ +/* + * #%L + * Lima :: Swing + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ #dateIntervaleConditionFrame { title : "lima.dates.interval"; preferredSize : {new Dimension(200, 100)}; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java index 840d61e..8064a3d 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java @@ -33,7 +33,7 @@ import org.chorem.lima.ui.Filter.ConditionHandler; import org.chorem.lima.ui.Filter.financialTransactionCondition.FinancialTransactionConditionHandler; import org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchViewHandler; -import javax.swing.JList; +import javax.swing.*; import javax.swing.event.ListSelectionEvent; import java.util.List; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionView.css b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionView.css index f52b5ca..35012a0 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionView.css @@ -1,3 +1,24 @@ +/* + * #%L + * Lima :: Swing + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ #financialPeriodConditionFrame { title : "lima.financialPeriod"; preferredSize : {new Dimension(200, 100)}; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionView.css b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionView.css index 81f6b62..c520609 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionView.css @@ -1,3 +1,24 @@ +/* + * #%L + * Lima :: Swing + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ #allRadioButton { text : "lima.filter.condition.one"; buttonGroup : "radioButtons"; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java index 4cb46bc..3807655 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java @@ -32,7 +32,7 @@ import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.Filter.ConditionHandler; import org.chorem.lima.ui.Filter.financialTransactionCondition.FinancialTransactionConditionHandler; -import javax.swing.JList; +import javax.swing.*; import javax.swing.event.ListSelectionEvent; import java.util.List; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionView.css b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionView.css index 4284fe1..a534d69 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionView.css @@ -1,3 +1,24 @@ +/* + * #%L + * Lima :: Swing + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ #fiscalPeriodConditionFrame { title : "lima.fiscalPeriod"; preferredSize : {new Dimension(200, 100)}; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java index 62e70bb..1bdba49 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java @@ -31,7 +31,6 @@ import org.chorem.lima.LimaMain; import org.chorem.lima.LimaSwingApplicationContext; import org.chorem.lima.LimaSwingConfig; import org.chorem.lima.enums.ImportExportEnum; -import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.account.AccountView; import org.chorem.lima.ui.celleditor.NumberSeparatorCellRenderer; import org.chorem.lima.ui.celleditor.NumberSeparatorTableCellRenderer; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTableRenderer.java b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTableRenderer.java index cef9783..0db64e1 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTableRenderer.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTableRenderer.java @@ -22,14 +22,13 @@ package org.chorem.lima.ui.account; -import java.awt.Component; - -import javax.swing.JTree; -import javax.swing.tree.DefaultTreeCellRenderer; - import org.chorem.lima.entity.Account; import org.jdesktop.swingx.treetable.MutableTreeTableNode; +import javax.swing.*; +import javax.swing.tree.DefaultTreeCellRenderer; +import java.awt.*; + /** * Account renderer in account tree. * diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java b/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java index 5aab64e..001b895 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java @@ -23,10 +23,8 @@ package org.chorem.lima.ui.celleditor; import org.chorem.lima.util.BigDecimalToString; -import javax.swing.JLabel; -import javax.swing.JTable; -import javax.swing.SwingConstants; -import java.awt.Component; +import javax.swing.*; +import java.awt.*; import java.math.BigDecimal; public class BigDecimalTableCellRenderer extends DefaultLimaTableCellRenderer { diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterComboBoxModel.java b/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterComboBoxModel.java index 0f10802..9e0cb4a 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterComboBoxModel.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterComboBoxModel.java @@ -27,8 +27,7 @@ import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.service.LimaServiceFactory; -import javax.swing.AbstractListModel; -import javax.swing.ComboBoxModel; +import javax.swing.*; import java.util.List; /** diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/common/AccountListRenderer.java b/lima-swing/src/main/java/org/chorem/lima/ui/common/AccountListRenderer.java index 40ae4f6..261a3b9 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/common/AccountListRenderer.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/common/AccountListRenderer.java @@ -24,10 +24,8 @@ package org.chorem.lima.ui.common; import org.chorem.lima.entity.Account; -import javax.swing.DefaultListCellRenderer; -import javax.swing.JLabel; -import javax.swing.JList; -import java.awt.Component; +import javax.swing.*; +import java.awt.*; public class AccountListRenderer extends DefaultListCellRenderer { diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookListRenderer.java b/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookListRenderer.java index 8993cb2..e8f300b 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookListRenderer.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookListRenderer.java @@ -22,13 +22,11 @@ package org.chorem.lima.ui.common; -import java.awt.Component; - -import javax.swing.DefaultListCellRenderer; -import javax.swing.JList; - import org.chorem.lima.entity.EntryBook; +import javax.swing.*; +import java.awt.*; + /** * EntryBook renderer for fiscal period retaining earning list. * diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialPeriodListRenderer.java b/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialPeriodListRenderer.java index b963a0e..b8e4433 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialPeriodListRenderer.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialPeriodListRenderer.java @@ -22,14 +22,12 @@ package org.chorem.lima.ui.common; -import java.awt.Component; -import java.text.DateFormat; - -import javax.swing.DefaultListCellRenderer; -import javax.swing.JList; - import org.chorem.lima.entity.FinancialPeriod; +import javax.swing.*; +import java.awt.*; +import java.text.DateFormat; + /** * Financial period list renderer. * diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/common/FiscalPeriodListRenderer.java b/lima-swing/src/main/java/org/chorem/lima/ui/common/FiscalPeriodListRenderer.java index 0f15790..0237743 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/common/FiscalPeriodListRenderer.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/common/FiscalPeriodListRenderer.java @@ -22,14 +22,12 @@ package org.chorem.lima.ui.common; -import java.awt.Component; -import java.text.DateFormat; - -import javax.swing.DefaultListCellRenderer; -import javax.swing.JList; - import org.chorem.lima.entity.FiscalPeriod; +import javax.swing.*; +import java.awt.*; +import java.text.DateFormat; + /** * Fiscal period list renderer. * diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/common/GenericComboBoxModel.java b/lima-swing/src/main/java/org/chorem/lima/ui/common/GenericComboBoxModel.java index da8a496..e990a99 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/common/GenericComboBoxModel.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/common/GenericComboBoxModel.java @@ -22,10 +22,9 @@ package org.chorem.lima.ui.common; +import javax.swing.*; import java.util.List; -import javax.swing.DefaultComboBoxModel; - /** * Model generique pour les objects lima. * diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java index 887f476..2ccee6c 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java @@ -43,12 +43,7 @@ import org.chorem.lima.util.BigDecimalToString; import org.chorem.lima.util.ErrorHelper; import org.jdesktop.swingx.JXTable; -import javax.swing.AbstractAction; -import javax.swing.ActionMap; -import javax.swing.InputMap; -import javax.swing.JComponent; -import javax.swing.JOptionPane; -import javax.swing.KeyStroke; +import javax.swing.*; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.util.Collections; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java index e4f1629..ba0bfbe 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java @@ -27,6 +27,7 @@ import org.chorem.lima.business.api.FinancialPeriodService; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; +import org.chorem.lima.ui.common.FinancialTransactionTableModel; import org.chorem.lima.ui.financialtransaction.AccountColumn; import org.chorem.lima.ui.financialtransaction.BalanceColumn; import org.chorem.lima.ui.financialtransaction.CreditColumn; @@ -34,7 +35,6 @@ import org.chorem.lima.ui.financialtransaction.DateColumn; import org.chorem.lima.ui.financialtransaction.DebitColumn; import org.chorem.lima.ui.financialtransaction.DescriptionColumn; import org.chorem.lima.ui.financialtransaction.EntryBookColumn; -import org.chorem.lima.ui.common.FinancialTransactionTableModel; import org.chorem.lima.ui.financialtransaction.LetterColumn; import org.chorem.lima.ui.financialtransaction.VoucherColumn; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.css b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.css index ff2d98d..786d012 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.css @@ -1,3 +1,24 @@ +/* + * #%L + * Lima :: Swing + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ #toolbar { floatable : false; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx index 179d39c..283d757 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx @@ -6,16 +6,15 @@ %% 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 3 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - $Id: FinancialTransactionUnbalancedView.jaxx 3921 2014-09-19 15:21:43Z sbavencoff $ 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 + You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/gpl-3.0.html>. #L% @@ -95,4 +94,4 @@ model="{getFinancialTransactionUnbalancedTableModel()}"/> </JScrollPane> -</JPanel> \ No newline at end of file +</JPanel> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/home/AbstractHomePane.java b/lima-swing/src/main/java/org/chorem/lima/ui/home/AbstractHomePane.java index fa835e4..c336fb3 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/home/AbstractHomePane.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/home/AbstractHomePane.java @@ -22,11 +22,10 @@ package org.chorem.lima.ui.home; -import java.awt.Color; - -import javax.swing.JEditorPane; +import javax.swing.*; import javax.swing.event.HyperlinkListener; import javax.swing.plaf.basic.BasicEditorPaneUI; +import java.awt.*; /** * Common code for all home page panel. diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.css b/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.css index 58f31ab..1f0e824 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.css @@ -1,3 +1,24 @@ +/* + * #%L + * Lima :: Swing + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ #waitDialog { modal : true; title : "lima.wait"; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css index 0ad9584..b40b962 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css @@ -1,3 +1,24 @@ +/* + * #%L + * Lima :: Swing + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ .toolbar { floatable : false; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java index e1d5e13..92e86a4 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java @@ -8,12 +8,12 @@ * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 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, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -46,12 +46,7 @@ import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.util.BigDecimalToString; import org.chorem.lima.util.ErrorHelper; -import javax.swing.AbstractAction; -import javax.swing.ActionMap; -import javax.swing.InputMap; -import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.KeyStroke; +import javax.swing.*; import java.awt.event.ActionEvent; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringSelectionModel.java b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringSelectionModel.java index 7bcfd37..8fae31a 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringSelectionModel.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringSelectionModel.java @@ -24,7 +24,7 @@ package org.chorem.lima.ui.lettering; import org.apache.commons.lang3.StringUtils; import org.chorem.lima.entity.Entry; -import javax.swing.DefaultListSelectionModel; +import javax.swing.*; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.util.List; 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 78a918c..c1ab881 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 @@ -34,12 +34,7 @@ import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.importexport.ImportExport; import org.jdesktop.swingx.JXTreeTable; -import javax.swing.AbstractAction; -import javax.swing.ActionMap; -import javax.swing.InputMap; -import javax.swing.JComponent; -import javax.swing.JOptionPane; -import javax.swing.KeyStroke; +import javax.swing.*; import javax.swing.tree.TreePath; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; diff --git a/lima-swing/src/main/java/org/chorem/lima/util/BigDecimalToString.java b/lima-swing/src/main/java/org/chorem/lima/util/BigDecimalToString.java index f04e506..5bc903f 100644 --- a/lima-swing/src/main/java/org/chorem/lima/util/BigDecimalToString.java +++ b/lima-swing/src/main/java/org/chorem/lima/util/BigDecimalToString.java @@ -1,5 +1,27 @@ package org.chorem.lima.util; +/* + * #%L + * Lima :: Swing + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.LimaSwingApplicationContext; import org.chorem.lima.LimaSwingConfig; diff --git a/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.css b/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.css index 772781d..8a0e4e0 100644 --- a/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.css +++ b/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.css @@ -1,3 +1,24 @@ +/* + * #%L + * Lima :: Swing + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ #reportDialog { modal : true; } diff --git a/lima-swing/src/main/java/org/chorem/lima/widgets/JWideComboBox.java b/lima-swing/src/main/java/org/chorem/lima/widgets/JWideComboBox.java index 1e41357..38431b3 100644 --- a/lima-swing/src/main/java/org/chorem/lima/widgets/JWideComboBox.java +++ b/lima-swing/src/main/java/org/chorem/lima/widgets/JWideComboBox.java @@ -22,9 +22,8 @@ package org.chorem.lima.widgets; -import javax.swing.ComboBoxModel; -import javax.swing.JComboBox; -import java.awt.Dimension; +import javax.swing.*; +import java.awt.*; /** * Cette combo box surcharge quelques methodes de l'UI par defaut diff --git a/lima-swing/src/main/java/org/chorem/lima/widgets/ScrollBasicComboPopup.java b/lima-swing/src/main/java/org/chorem/lima/widgets/ScrollBasicComboPopup.java index 26c209c..f6f8488 100644 --- a/lima-swing/src/main/java/org/chorem/lima/widgets/ScrollBasicComboPopup.java +++ b/lima-swing/src/main/java/org/chorem/lima/widgets/ScrollBasicComboPopup.java @@ -21,8 +21,7 @@ */ package org.chorem.lima.widgets; -import javax.swing.JComboBox; -import javax.swing.JScrollPane; +import javax.swing.*; import javax.swing.plaf.basic.BasicComboPopup; /** diff --git a/lima-swing/src/test/java/org/chorem/lima/ui/account/AccountViewHandlerTest.java b/lima-swing/src/test/java/org/chorem/lima/ui/account/AccountViewHandlerTest.java index dc5880d..16aed1b 100644 --- a/lima-swing/src/test/java/org/chorem/lima/ui/account/AccountViewHandlerTest.java +++ b/lima-swing/src/test/java/org/chorem/lima/ui/account/AccountViewHandlerTest.java @@ -22,15 +22,14 @@ package org.chorem.lima.ui.account; * #L% */ -import java.util.Collections; -import java.util.List; - +import com.google.common.collect.Lists; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.AccountImpl; import org.junit.Assert; import org.junit.Test; -import com.google.common.collect.Lists; +import java.util.Collections; +import java.util.List; /** * @author David Cossé diff --git a/lima-web/pom.xml b/lima-web/pom.xml index 669412a..5906767 100644 --- a/lima-web/pom.xml +++ b/lima-web/pom.xml @@ -80,6 +80,47 @@ <groupId>net.sf.jasperreports</groupId> <artifactId>jasperreports</artifactId> </dependency> + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>pdfbox</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>pdfbox-examples</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>openejb-core</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>javaee-api</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> <build> diff --git a/lima-web/src/main/java/org/chorem/lima/web/action/DocumentService.java b/lima-web/src/main/java/org/chorem/lima/web/action/DocumentService.java index 13171df..4adf465 100644 --- a/lima-web/src/main/java/org/chorem/lima/web/action/DocumentService.java +++ b/lima-web/src/main/java/org/chorem/lima/web/action/DocumentService.java @@ -30,12 +30,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.pdfbox.examples.fdf.SetField; import org.apache.pdfbox.pdmodel.PDDocument; import org.chorem.lima.LimaTechnicalException; -import org.chorem.lima.business.api.AccountService; -import org.chorem.lima.business.api.ClosedPeriodicEntryBookService; -import org.chorem.lima.business.api.EntryService; -import org.chorem.lima.business.api.FinancialPeriodService; -import org.chorem.lima.business.api.report.BalanceBeanReportService; -import org.chorem.lima.web.action.balance.BalanceReportBuilder; import org.chorem.lima.beans.BalanceReport; import org.chorem.lima.beans.BalanceTrial; import org.chorem.lima.beans.FinancialStatementAmounts; @@ -43,10 +37,15 @@ import org.chorem.lima.beans.GeneralEntryBooksDatas; import org.chorem.lima.beans.GeneralEntryBooksDatasImpl; import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.api.AccountService; +import org.chorem.lima.business.api.ClosedPeriodicEntryBookService; +import org.chorem.lima.business.api.EntryService; +import org.chorem.lima.business.api.FinancialPeriodService; import org.chorem.lima.business.api.FinancialStatementService; import org.chorem.lima.business.api.IdentityService; import org.chorem.lima.business.api.ReportService; import org.chorem.lima.business.api.VatStatementService; +import org.chorem.lima.business.api.report.BalanceBeanReportService; import org.chorem.lima.business.utils.EntryComparator; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.ClosedPeriodicEntryBook; @@ -56,6 +55,7 @@ import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.Identity; import org.chorem.lima.entity.VatStatement; import org.chorem.lima.service.LimaServiceFactory; +import org.chorem.lima.web.action.balance.BalanceReportBuilder; import org.chorem.lima.web.utils.DocumentsEnum; import javax.swing.*; diff --git a/lima-web/src/main/java/org/chorem/lima/web/action/balance/BalanceReportBuilder.java b/lima-web/src/main/java/org/chorem/lima/web/action/balance/BalanceReportBuilder.java index 2cf2eb6..41db852 100644 --- a/lima-web/src/main/java/org/chorem/lima/web/action/balance/BalanceReportBuilder.java +++ b/lima-web/src/main/java/org/chorem/lima/web/action/balance/BalanceReportBuilder.java @@ -1,5 +1,27 @@ package org.chorem.lima.web.action.balance; +/* + * #%L + * Lima :: web + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import net.sf.jasperreports.engine.JRException; import net.sf.jasperreports.engine.JasperCompileManager; import net.sf.jasperreports.engine.JasperExportManager; diff --git a/lima-web/src/main/java/org/chorem/lima/web/service/HttpServerService.java b/lima-web/src/main/java/org/chorem/lima/web/service/HttpServerService.java index 21a9eb0..17159eb 100644 --- a/lima-web/src/main/java/org/chorem/lima/web/service/HttpServerService.java +++ b/lima-web/src/main/java/org/chorem/lima/web/service/HttpServerService.java @@ -1,20 +1,42 @@ package org.chorem.lima.web.service; +/* + * #%L + * Lima :: web + * %% + * Copyright (C) 2008 - 2014 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.apache.commons.io.Charsets; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.service.LimaServiceFactory; -import org.chorem.lima.web.action.DocumentService; -import org.chorem.lima.web.action.balance.BalanceReportBuilder; import org.chorem.lima.beans.BalanceReport; import org.chorem.lima.business.LimaServiceConfig; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.utils.DocumentsEnum; import org.chorem.lima.business.utils.FormatsEnum; import org.chorem.lima.entity.Account; +import org.chorem.lima.service.LimaServiceFactory; +import org.chorem.lima.web.action.DocumentService; +import org.chorem.lima.web.action.balance.BalanceReportBuilder; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; @@ -223,16 +245,16 @@ public class HttpServerService { resp.setContentType(FormatsEnum.HTML.getMimeType()); StringBuilder pageContent = new StringBuilder(); - String serverAdress = "http://"; + String serverAddress = "http://"; log.info("Page load"); /** create server Address : static config if exist or dynamical adress */ if (serverAddressConfig.equals("")) { - serverAdress += req.getServerName() + serverAddress += req.getServerName() + ":" + req.getServerPort(); } else { - serverAdress += serverAddressConfig + ":" + serverAddress += serverAddressConfig + ":" + LimaServiceConfig.getInstance().getHttpPort(); } @@ -263,7 +285,7 @@ public class HttpServerService { + "</head>\n" + "<body>\n" + "<table class=\"padding\">\n" + "<tr><td><img src=\"?img=puzzle_icon_mini.png\"/></td>\n" + "<td><h1>LIMA Documents Report</h1></td></tr>\n" + "<tr><td class=\"tdright\"><img src=\"?img=identity.png\"/></td>\n" + "<td rowspan=3><form method=GET action=") - .append(serverAdress).append(">\n") + .append(serverAddress).append(">\n") .append(t("lima-business.document.date.begin")) .append("<input value=\"") .append(DATEFORMAT.format(beginDatePicker)) diff --git a/lima-web/src/main/java/org/chorem/lima/web/utils/DocumentsEnum.java b/lima-web/src/main/java/org/chorem/lima/web/utils/DocumentsEnum.java index 44e5924..bf10d78 100644 --- a/lima-web/src/main/java/org/chorem/lima/web/utils/DocumentsEnum.java +++ b/lima-web/src/main/java/org/chorem/lima/web/utils/DocumentsEnum.java @@ -27,11 +27,11 @@ import static org.nuiton.i18n.I18n.t; public enum DocumentsEnum { - GENERAL_ENTRYBOOK(t("lima-business.document.generalentrybook"), "lima_general_entybook"), - ENTRYBOOKS(t("lima-business.document.entrybook"), "lima_entrybooks"), + GENERAL_ENTRY_BOOK(t("lima-business.document.generalentrybook"), "lima_general_entybook"), + ENTRY_BOOKS(t("lima-business.document.entrybook"), "lima_entrybooks"), BALANCE(t("lima-business.document.balance"), "lima_balance"), LEDGER(t("lima-business.document.ledger"), "lima_ledger"), - FINANCIALSTATEMENT(t("lima-business.document.financialstatement"), "lima_financialstatements"), + FINANCIAL_STATEMENT(t("lima-business.document.financialstatement"), "lima_financialstatements"), VAT(t("lima-business.document.vat"), "lima_vat"), ACCOUNT(t("lima-business.document.account"), "lima_account"); diff --git a/lima-web/src/test/java/org/chorem/lima/web/action/ReportTest.java b/lima-web/src/test/java/org/chorem/lima/web/action/ReportTest.java index e7c8b51..dbd1039 100644 --- a/lima-web/src/test/java/org/chorem/lima/web/action/ReportTest.java +++ b/lima-web/src/test/java/org/chorem/lima/web/action/ReportTest.java @@ -22,10 +22,7 @@ package org.chorem.lima.web.action; * #L% */ -import com.google.common.collect.Lists; import net.sf.jasperreports.engine.JRException; -import org.chorem.lima.business.api.report.BalanceBeanReportService; -import org.chorem.lima.business.ejb.report.BalanceBeanReportServiceImpl; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; diff --git a/ofbizNeogia/src/org/ofbiz/lima/AccountService.java b/ofbizNeogia/src/org/ofbiz/lima/AccountService.java index 670ec4b..6d2dee5 100644 --- a/ofbizNeogia/src/org/ofbiz/lima/AccountService.java +++ b/ofbizNeogia/src/org/ofbiz/lima/AccountService.java @@ -1,8 +1,6 @@ package org.ofbiz.lima; -import java.util.List; -import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.ofbiz.base.util.UtilMisc; @@ -17,6 +15,9 @@ import org.ofbiz.service.DispatchContext; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.ServiceUtil; +import java.util.List; +import java.util.Map; + /** * * @author ore diff --git a/ofbizNeogia/src/org/ofbiz/lima/EntryService.java b/ofbizNeogia/src/org/ofbiz/lima/EntryService.java index bef381f..f776c3b 100644 --- a/ofbizNeogia/src/org/ofbiz/lima/EntryService.java +++ b/ofbizNeogia/src/org/ofbiz/lima/EntryService.java @@ -1,9 +1,6 @@ package org.ofbiz.lima; -import java.sql.Timestamp; -import java.util.List; -import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.ofbiz.accounting.transaction.developed.GlEntry; @@ -19,6 +16,10 @@ import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; import org.ofbiz.service.ServiceUtil; +import java.sql.Timestamp; +import java.util.List; +import java.util.Map; + /** * * @author ore diff --git a/ofbizNeogia/src/org/ofbiz/lima/JournalService.java b/ofbizNeogia/src/org/ofbiz/lima/JournalService.java index bab6ebc..6778793 100644 --- a/ofbizNeogia/src/org/ofbiz/lima/JournalService.java +++ b/ofbizNeogia/src/org/ofbiz/lima/JournalService.java @@ -1,8 +1,6 @@ package org.ofbiz.lima; -import java.util.List; -import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.ofbiz.base.util.UtilMisc; @@ -18,6 +16,9 @@ import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; import org.ofbiz.service.ServiceUtil; +import java.util.List; +import java.util.Map; + /** * * @author ore diff --git a/ofbizNeogia/src/org/ofbiz/lima/PeriodService.java b/ofbizNeogia/src/org/ofbiz/lima/PeriodService.java index 95556bb..d4a7af1 100644 --- a/ofbizNeogia/src/org/ofbiz/lima/PeriodService.java +++ b/ofbizNeogia/src/org/ofbiz/lima/PeriodService.java @@ -1,8 +1,6 @@ package org.ofbiz.lima; -import java.util.List; -import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.ofbiz.base.util.UtilMisc; @@ -12,6 +10,9 @@ import org.ofbiz.entity.GenericFindException; import org.ofbiz.service.DispatchContext; import org.ofbiz.service.ServiceUtil; +import java.util.List; +import java.util.Map; + /** * * @author ore diff --git a/ofbizNeogia/src/org/ofbiz/lima/StatusService.java b/ofbizNeogia/src/org/ofbiz/lima/StatusService.java index 9c9b186..294d49f 100644 --- a/ofbizNeogia/src/org/ofbiz/lima/StatusService.java +++ b/ofbizNeogia/src/org/ofbiz/lima/StatusService.java @@ -1,8 +1,6 @@ package org.ofbiz.lima; -import java.util.List; -import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.ofbiz.base.util.UtilMisc; @@ -14,6 +12,9 @@ import org.ofbiz.entity.condition.EntityOperator; import org.ofbiz.service.DispatchContext; import org.ofbiz.service.ServiceUtil; +import java.util.List; +import java.util.Map; + /** * * @author ore diff --git a/ofbizNeogia/src/org/ofbiz/lima/TransactionService.java b/ofbizNeogia/src/org/ofbiz/lima/TransactionService.java index 63efab9..92726d7 100644 --- a/ofbizNeogia/src/org/ofbiz/lima/TransactionService.java +++ b/ofbizNeogia/src/org/ofbiz/lima/TransactionService.java @@ -1,11 +1,6 @@ package org.ofbiz.lima; -import java.sql.Timestamp; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.ofbiz.accounting.transaction.generated.AcctgTransactionItemBase; @@ -21,6 +16,12 @@ import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; import org.ofbiz.service.ServiceUtil; +import java.sql.Timestamp; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + /** * * @author ore diff --git a/pom.xml b/pom.xml index 5d82f3a..47e1016 100644 --- a/pom.xml +++ b/pom.xml @@ -174,35 +174,43 @@ <signatureVersion>1.0</signatureVersion> <!-- customized libs version --> - <jettyPluginVersion>9.2.2.v20140723</jettyPluginVersion> - <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> - <nuitonConfigVersion>3.0-rc-1</nuitonConfigVersion> + <eugeneVersion>2.13</eugeneVersion> + <nuitonConfigVersion>3.0-rc-2</nuitonConfigVersion> <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> <nuitonProfilingVersion>3.0</nuitonProfilingVersion> - <nuitonCsvVersion>3.0-rc-4</nuitonCsvVersion> <nuitonConverterVersion>1.0</nuitonConverterVersion> - <eugeneVersion>2.13</eugeneVersion> - <topiaVersion>3.0-beta-14</topiaVersion> + <nuitonCsvVersion>3.0-rc-4</nuitonCsvVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> + <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> + <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> + <topiaVersion>3.0-beta-14</topiaVersion> - <swinglabsVersion>3.0.4</swinglabsVersion> + <commonsCodecVersion>1.9</commonsCodecVersion> + <commonsEmailVersion>1.3.3</commonsEmailVersion> + <commonsIoVersion>2.4</commonsIoVersion> + <commonsLang3Version>3.3.2</commonsLang3Version> + <commonsLoggingVersion>1.2</commonsLoggingVersion> + <commonsLangVersion>2.6</commonsLangVersion> + <dom4jVersion>1.6.1</dom4jVersion> + <googleGuavaVersion>18.0</googleGuavaVersion> <!-- h2Version 1.4.180 is beta, and db created with 1.3 are not compatible yet so don't use it for the moment--> <h2Version>1.3.176</h2Version> - <hibernateVersion>4.3.6.Final</hibernateVersion> - <openejbJavaeeApiVersion>6.0-6</openejbJavaeeApiVersion> - <dom4jVersion>1.6.1</dom4jVersion> - <jdomVersion>2.0.5</jdomVersion> + <hibernateVersion>4.3.7.Final</hibernateVersion> <itextVersion>4.2.1</itextVersion> - <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> - - <jaxxVersion>2.10</jaxxVersion> - <openEjbVersion>4.7.0</openEjbVersion> + <jasperreportsVersion>5.6.1</jasperreportsVersion> + <javaxServletVersion>3.1.0</javaxServletVersion> + <jaxxVersion>2.16.1</jaxxVersion> + <jbossTransactionVersion>1.0.0.Final</jbossTransactionVersion> + <jdomVersion>2.0.5</jdomVersion> + <jettyPluginVersion>9.2.3.v20140905</jettyPluginVersion> + <junitVersion>4.11</junitVersion> + <log4jVersion>1.2.17</log4jVersion> + <openejbJavaeeApiVersion>6.0-6</openejbJavaeeApiVersion> + <openEjbVersion>4.7.1</openEjbVersion> + <pdfboxVersion>1.8.7</pdfboxVersion> <slf4jVersion>1.7.7</slf4jVersion> + <swinglabsVersion>3.0.4</swinglabsVersion> <swingxVersion>1.6.5-1</swingxVersion> - <pdfboxVersion>1.8.6</pdfboxVersion> - <jbossTransactionVersion>1.0.0.Final</jbossTransactionVersion> - <commonsCodecVersion>1.9</commonsCodecVersion> - <jasperreportsVersion>5.6.1</jasperreportsVersion> <!-- license to use --> <license.licenseName>gpl_v3</license.licenseName> @@ -507,7 +515,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>17.0</version> + <version>${googleGuavaVersion}</version> </dependency> <dependency> @@ -519,39 +527,39 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.3.2</version> + <version>${commonsLang3Version}</version> </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.2</version> + <version>${commonsLoggingVersion}</version> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.6</version> + <version>${commonsLangVersion}</version> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.4</version> + <version>${commonsIoVersion}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> - <version>1.1</version> + <version>${commonsEmailVersion}</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.17</version> + <version>${log4jVersion}</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> + <version>${junitVersion}</version> <scope>test</scope> </dependency> @@ -561,6 +569,11 @@ <version>${jasperreportsVersion}</version> </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${javaxServletVersion}</version> + </dependency> </dependencies> </dependencyManagement> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm