- Lima-commits - mailman.cloud.codelutin.com

r2798 - trunk/lima-main/src/main/java/org/chorem/lima/combobox
by echatellier＠users.chorem.org March 1, 2010

March 1, 2010

Author: echatellier Date: 2010-03-01 14:50:09 +0100 (Mon, 01 Mar 2010) New Revision: 2798 Modified: trunk/lima-main/src/main/java/org/chorem/lima/combobox/JWideComboBox.java Log: AJout de commentaire pour savoir a quoi sert ce componsant !!! Modified: trunk/lima-main/src/main/java/org/chorem/lima/combobox/JWideComboBox.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/combobox/JWideComboBox.java 2010-03-01 10:27:57 UTC (rev 2797) +++ trunk/lima-main/src/main/java/org/chorem/lima/combobox/JWideComboBox.java 2010-03-01 13:50:09 UTC (rev 2798) @@ -26,12 +26,17 @@ import java.awt.*; import java.util.Vector; - /** + * Cette combo box surcharge quelques methodes de l'UI par defaut + * pour que le composant popup soit plus grand que la combobox + * elle même. + * * @author ore */ public class JWideComboBox extends JComboBox { + private boolean layingOut = false; + /** * */ @@ -60,8 +65,6 @@ super(aModel); } - private boolean layingOut = false; - /** * */

1 0

r2797 - trunk
by echatellier＠users.chorem.org March 1, 2010

March 1, 2010

Author: echatellier Date: 2010-03-01 11:27:57 +0100 (Mon, 01 Mar 2010) New Revision: 2797 Modified: trunk/pom.xml Log: Update to swingx 1.6 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-01 10:16:48 UTC (rev 2796) +++ trunk/pom.xml 2010-03-01 10:27:57 UTC (rev 2797) @@ -100,7 +100,7 @@ <dependency> <groupId>org.swinglabs</groupId> <artifactId>swingx</artifactId> - <version>${swing.version}</version> + <version>${swingx.version}</version> </dependency> <dependency> @@ -185,8 +185,8 @@ <projectId>lima</projectId>  - <callao.version>0.1.2</callao.version> - <nuiton-utils.version>1.1.2</nuiton-utils.version> + <callao.version>0.1.3-SNAPSHOT</callao.version> + <nuiton-utils.version>1.1.4</nuiton-utils.version> <eugene.version>1.0.0</eugene.version> <topia.version>2.2.0</topia.version> @@ -201,7 +201,7 @@   <axis.version>1.3</axis.version> - <swing.version>1.0</swing.version> + <swingx.version>1.6</swingx.version>  <license.licenseName>gpl_v3</license.licenseName>

1 0

r2796 - trunk/lima-main/src/main/java/org/chorem/lima/ui
by echatellier＠users.chorem.org March 1, 2010

March 1, 2010

Author: echatellier Date: 2010-03-01 11:16:48 +0100 (Mon, 01 Mar 2010) New Revision: 2796 Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java Log: Remove moved code, undeprecate, still used outside application init Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java 2010-03-01 10:10:13 UTC (rev 2795) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java 2010-03-01 10:16:48 UTC (rev 2796) @@ -19,28 +19,17 @@ package org.chorem.lima.ui; -import static org.nuiton.i18n.I18n._; - import java.awt.Window; -import java.io.IOException; -import java.net.URL; -import javax.swing.JOptionPane; - import jaxx.runtime.JAXXContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaContext; -import org.chorem.lima.LimaSplash; -import org.chorem.lima.dto.AccountDTO; -import org.chorem.lima.imports.XMLImport; /** * Barre de progression * * @author Rémi Chapelet - * @deprecated since 0.3.2 (replaced by {@link LimaSplash}) */ public class ProgressBarImpl extends ProgressBar { @@ -76,37 +65,4 @@ // // } - public void loadDefaultAccount(AccountDTO accountRoot) { - if (log.isDebugEnabled()) { - log.debug("Account root : " + accountRoot); - } - if (accountRoot.getChildren().isEmpty()) { - if (log.isDebugEnabled()) { - log.debug("No existing accounts"); - } - - String[] response = {_("lima.response.yes"), _("lima.response.no")}; - int n = JOptionPane.showOptionDialog(this, - _("lima.question.load.accounts"), - _("lima.question"), - JOptionPane.YES_NO_OPTION, - JOptionPane.QUESTION_MESSAGE, - null, //do not use a custom Icon - response, //the titles of buttons - response[1]); //default button title - if (n == JOptionPane.YES_OPTION) { - XMLImport imports = new XMLImport(); - URL urlFile = ProgressBarImpl.class.getResource("/import/default_pcg.xml"); - try { - imports.importAccount(urlFile.openStream()); - } catch (IOException eee) { - log.error("Erreur chargement du fichier 'default_pcg.xml'", eee); - } - } else { - LimaContext.getContext().getDataManager().resetAccountModel(); - } - } - } - - }

1 0

r2795 - trunk/lima-service-callao
by echatellier＠users.chorem.org March 1, 2010

March 1, 2010

Author: echatellier Date: 2010-03-01 11:10:13 +0100 (Mon, 01 Mar 2010) New Revision: 2795 Modified: trunk/lima-service-callao/pom.xml Log: Remove duplicated dependency Modified: trunk/lima-service-callao/pom.xml =================================================================== --- trunk/lima-service-callao/pom.xml 2010-03-01 09:45:35 UTC (rev 2794) +++ trunk/lima-service-callao/pom.xml 2010-03-01 10:10:13 UTC (rev 2795) @@ -20,16 +20,11 @@ <artifactId>lima-service</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>org.chorem.callao</groupId> <artifactId>callao-service</artifactId> </dependency> <dependency> - <groupId>org.chorem.callao</groupId> - <artifactId>callao-service</artifactId> - </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency>

1 0

r2794 - trunk/lima-main/src/main/java/org/chorem/lima
by echatellier＠users.chorem.org March 1, 2010

March 1, 2010

Author: echatellier Date: 2010-03-01 10:45:35 +0100 (Mon, 01 Mar 2010) New Revision: 2794 Modified: trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java Log: Remove duplicated header Modified: trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java 2010-03-01 09:32:36 UTC (rev 2793) +++ trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java 2010-03-01 09:45:35 UTC (rev 2794) @@ -16,20 +16,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -/** - * ##% Copyright (C) 2008 Code Lutin, Tony Chemit - * This program is free software; you - * can redistribute it and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. This program is - * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU General Public License for more details. You - * should have received a copy of the GNU General Public License along with this - * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - * - Suite 330, Boston, MA 02111-1307, USA. - * ##% - */ + package org.chorem.lima; import jaxx.runtime.Util;

1 0

r2793 - trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao
by echatellier＠users.chorem.org March 1, 2010

March 1, 2010

Author: echatellier Date: 2010-03-01 10:32:36 +0100 (Mon, 01 Mar 2010) New Revision: 2793 Modified: trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/CallaoTransactionService.java Log: Fix a potential / by 0 durring progression update Modified: trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/CallaoTransactionService.java =================================================================== --- trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/CallaoTransactionService.java 2010-02-26 16:39:12 UTC (rev 2792) +++ trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/CallaoTransactionService.java 2010-03-01 09:32:36 UTC (rev 2793) @@ -36,7 +36,6 @@ import org.chorem.lima.service.callao.convertObject.ConvertTransaction; import org.chorem.lima.service.util.ProgressListener; import org.chorem.lima.service.util.ServiceHelper; -import javax.swing.JProgressBar; import static org.nuiton.i18n.I18n._; import org.chorem.callao.service.TransactionServiceImpl; @@ -127,25 +126,29 @@ List<org.chorem.callao.service.dto.TransactionDTO> listTransactionCallao = transactionServiceImpl.getAllTransactionDTO(); // Récupère le nombre de transactions + // TODO le depart a 70 est tres bizar ici + // cela suppose que l'on connait l'ordre de chargement par l'UI double nbTransactions = listTransactionCallao.size(); - double incremente = 30 / nbTransactions; - double value = 70; - for (org.chorem.callao.service.dto.TransactionDTO transactionCallao : listTransactionCallao) { - // Converti la transaction Callao en transaction Lima - TransactionDTO transactionLima = convertTransaction.transactionCallaoToTransactionLima(transactionCallao,journals,periods,status); - // Recherche de toutes les entrées comptables pour cette transaction - List<EntryDTO> listEntryLima = entryServ.getEntryByTransaction(transactionLima, accounts); - // Pour toutes les entrées comptables Lima - for (EntryDTO entryLima : listEntryLima) { - transactionLima.addChild(entryLima); + if (nbTransactions > 0) { + double incremente = 30 / nbTransactions; + double value = 70; + for (org.chorem.callao.service.dto.TransactionDTO transactionCallao : listTransactionCallao) { + // Converti la transaction Callao en transaction Lima + TransactionDTO transactionLima = convertTransaction.transactionCallaoToTransactionLima(transactionCallao,journals,periods,status); + // Recherche de toutes les entrées comptables pour cette transaction + List<EntryDTO> listEntryLima = entryServ.getEntryByTransaction(transactionLima, accounts); + // Pour toutes les entrées comptables Lima + for (EntryDTO entryLima : listEntryLima) { + transactionLima.addChild(entryLima); + } + listTransactionLima.add(transactionLima); + // Incrémente la barre de chargement + value = value + incremente; + + if (progress != null) { + progress.updateProgression(value, _("lima.progressBar.load.etape5")); + } } - listTransactionLima.add(transactionLima); - // Incrémente la barre de chargement - value = value + incremente; - - if (progress != null) { - progress.updateProgression(value, _("lima.progressBar.load.etape5")); - } } return listTransactionLima; }

1 0

r2792 - in trunk: lima-service-callao ofbizNeogia
by echatellier＠users.chorem.org Feb. 26, 2010

Feb. 26, 2010

Author: echatellier Date: 2010-02-26 17:39:12 +0100 (Fri, 26 Feb 2010) New Revision: 2792 Modified: trunk/lima-service-callao/ trunk/ofbizNeogia/ Log: set svn:ignore Property changes on: trunk/lima-service-callao ___________________________________________________________________ Modified: svn:ignore - target *.ipr *.iws *.iml .classpath .project + target *.ipr *.iws *.iml .classpath .project .settings Property changes on: trunk/ofbizNeogia ___________________________________________________________________ Modified: svn:ignore - lib build .ant-targets-build.xml + lib build .ant-targets-build.xml .classpath .project

1 0

r2791 - trunk/lima-service-callao
by echatellier＠users.chorem.org Feb. 26, 2010

Feb. 26, 2010

Author: echatellier Date: 2010-02-26 17:38:47 +0100 (Fri, 26 Feb 2010) New Revision: 2791 Modified: trunk/lima-service-callao/ Log: set svn:ignore Property changes on: trunk/lima-service-callao ___________________________________________________________________ Modified: svn:ignore - target *.ipr *.iws *.iml + target *.ipr *.iws *.iml .classpath .project

1 0

r2790 - in trunk/lima-main: . src/main/java/org/chorem/lima src/main/java/org/chorem/lima/ui src/main/resources src/main/resources/images
by echatellier＠users.chorem.org Feb. 26, 2010

Feb. 26, 2010

Author: echatellier Date: 2010-02-26 17:37:18 +0100 (Fri, 26 Feb 2010) New Revision: 2790 Added: trunk/lima-main/src/main/java/org/chorem/lima/LimaSplash.java trunk/lima-main/src/main/resources/images/ trunk/lima-main/src/main/resources/images/splash.png Modified: trunk/lima-main/pom.xml trunk/lima-main/src/main/java/org/chorem/lima/DataManager.java trunk/lima-main/src/main/java/org/chorem/lima/Main.java trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java Log: Replace progress bar by a splash screen (image is not final). Modified: trunk/lima-main/pom.xml =================================================================== --- trunk/lima-main/pom.xml 2010-02-26 16:36:36 UTC (rev 2789) +++ trunk/lima-main/pom.xml 2010-02-26 16:37:18 UTC (rev 2790) @@ -224,6 +224,9 @@ <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> </manifest> + <manifestEntries> + <SplashScreen-Image>images/splash.png</SplashScreen-Image> + </manifestEntries> </archive> </configuration> </plugin> Modified: trunk/lima-main/src/main/java/org/chorem/lima/DataManager.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/DataManager.java 2010-02-26 16:36:36 UTC (rev 2789) +++ trunk/lima-main/src/main/java/org/chorem/lima/DataManager.java 2010-02-26 16:37:18 UTC (rev 2790) @@ -19,16 +19,21 @@ package org.chorem.lima; -import org.chorem.lima.dto.*; +import java.util.List; + +import org.chorem.lima.dto.AccountDTO; +import org.chorem.lima.dto.JournalDTO; +import org.chorem.lima.dto.PeriodDTO; +import org.chorem.lima.dto.StatusDTO; +import org.chorem.lima.dto.TransactionDTO; +import org.chorem.lima.service.PeriodService; +import org.chorem.lima.service.ServiceFactory; +import org.chorem.lima.service.util.ProgressListener; import org.chorem.lima.service.util.ServiceHelper; import org.chorem.lima.table.model.ClosureTableModel; import org.chorem.lima.table.model.JournalTableModel; import org.chorem.lima.table.model.TransactionDataTableModel; import org.chorem.lima.tree.model.AccountTreeTableModel; -import javax.swing.JProgressBar; -import java.util.List; -import org.chorem.lima.service.PeriodService; -import org.chorem.lima.service.ServiceFactory; /** * Cette classe permet de gérer les données de Lima. Chaque type de données @@ -130,13 +135,13 @@ getPeriodes()), getJournalModel().getData(), ServiceHelper.getAllFlatAccount(getAccountModel().getData()), - getStatus()); + getStatus(), null); transactionModel = new TransactionDataTableModel(data); } return transactionModel; } - public TransactionDataTableModel getTransactionModel(JProgressBar barre) { + public TransactionDataTableModel getTransactionModel(ProgressListener progressListener) { if (transactionModel == null) { @@ -146,7 +151,7 @@ getPeriodes()), getJournalModel().getData(), ServiceHelper.getAllFlatAccount(getAccountModel().getData()), - getStatus(),barre); + getStatus(), progressListener); transactionModel = new TransactionDataTableModel(data); } return transactionModel; Added: trunk/lima-main/src/main/java/org/chorem/lima/LimaSplash.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/LimaSplash.java (rev 0) +++ trunk/lima-main/src/main/java/org/chorem/lima/LimaSplash.java 2010-02-26 16:37:18 UTC (rev 2790) @@ -0,0 +1,99 @@ +package org.chorem.lima; + +import java.awt.AlphaComposite; +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.SplashScreen; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.service.util.ProgressListener; + +/** + * Utility class used to manage information on slash screen. + * + * Currently display: + * <ul> + * <li>Version + * <li>Loading information + * </ul> + * + * @since 0.3.2 + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class LimaSplash implements ProgressListener { + + /** Log. */ + static private Log log = LogFactory.getLog(LimaSplash.class); + + /** Splash screen instance. */ + protected SplashScreen splash; + + /** Splash screen graphics. */ + protected Graphics2D splashGraphics; + + public LimaSplash() { + + splash = SplashScreen.getSplashScreen(); + if (splash != null) { + splashGraphics = splash.createGraphics(); + } + } + + /** + * Init splash (add version). + * + * @param version version to display on splash screen + */ + public void initSplash(String version) { + if (splashGraphics != null) { + splashGraphics.setColor(Color.BLACK); + splashGraphics.drawString("Version : " + version, 300, 90); + } + else { + if (log.isWarnEnabled()) { + log.warn("Can't find splash screen"); + log.warn("Make sure that lima is launched with -splash:image.png VM argument"); + log.warn("or SplashScreen-Image is present in jar manifest."); + } + } + } + + /** + * Update progression. + * + * @param progress progress (between 0.0 and 1.0) + * @param message message can be {@code null} + */ + public void updateProgression(double progress, String message) { + if (splashGraphics != null) { + + splashGraphics.setColor(Color.BLACK); + splashGraphics.drawRect(50, 130, 300, 10); + splashGraphics.fillRect(50, 130, (int)(300.0 * progress), 10); + + if (message != null) { + splashGraphics.setComposite(AlphaComposite.Clear); + splashGraphics.fillRect(50,150, 200, 40); + splashGraphics.setPaintMode(); + splashGraphics.setColor(Color.BLACK); + splashGraphics.drawString(message + "...", 50, 160); + } + + splash.update(); + } + } + + /** + * Close splash screen (if needed). + */ + public void closeSplash() { + if (splash != null) { + splash.close(); + } + } +} Property changes on: trunk/lima-main/src/main/java/org/chorem/lima/LimaSplash.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-main/src/main/java/org/chorem/lima/Main.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/Main.java 2010-02-26 16:36:36 UTC (rev 2789) +++ trunk/lima-main/src/main/java/org/chorem/lima/Main.java 2010-02-26 16:37:18 UTC (rev 2790) @@ -23,12 +23,17 @@ import org.chorem.lima.ui.MainView; import org.chorem.lima.ui.MainViewHandler; -import org.chorem.lima.ui.ProgressBarImpl; +import org.chorem.lima.dto.AccountDTO; +import org.chorem.lima.imports.XMLImport; import org.chorem.lima.service.ServiceFactory; import static org.nuiton.i18n.I18n._; +import java.io.IOException; +import java.net.URL; import java.util.Locale; + +import javax.swing.JOptionPane; import javax.swing.SwingUtilities; import jaxx.runtime.SwingUtil; @@ -158,69 +163,81 @@ // do init ui final MainView ui = uiHandler.initUI(context, context.getConfig().isFullScreen()); - log.info(_("lima.init.ui.done")); + if (log.isInfoEnabled()) { + log.info(_("lima.init.ui.done")); + } - final ProgressBarImpl b = new ProgressBarImpl(ui, ui); + final LimaSplash splash = new LimaSplash(); + splash.initSplash(context.getConfig().getVersion()); - // show ui - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - ui.setVisible(true); - b.setVisible(true); - } - }); - - Thread.sleep(100); /** * Lancement de la barre de chargement * L'application va charger en mémoire les données */ - new Thread() { + Thread t = new Thread() { @Override public void run() { -// ProgressBarImpl b = new ProgressBarImpl(ui, ui); + // ProgressBarImpl b = new ProgressBarImpl(ui, ui); // Chargement des journaux - b.getProgressBar().setString("5% : " + _("lima.progressBar.load.etape1")); - b.getProgressBar().setValue(5); + //b.getProgressBar().setString("5% : " + _("lima.progressBar.load.etape1")); + //b.getProgressBar().setValue(5); + splash.updateProgression(0.05, _("lima.progressBar.load.etape1")); DataManager dataManager = context.getDataManager(); dataManager.getJournalModel(); // Chargement des comptes - b.getProgressBar().setString("30% : " + _("lima.progressBar.load.etape2")); - b.getProgressBar().setValue(30); + //b.getProgressBar().setString("30% : " + _("lima.progressBar.load.etape2")); + //b.getProgressBar().setValue(30); + splash.updateProgression(0.30, _("lima.progressBar.load.etape2")); AccountTreeTableModel accountModel = dataManager.getAccountModel(); - b.loadDefaultAccount(accountModel.getData()); + loadDefaultAccount(accountModel.getData()); // Chargement des status - b.getProgressBar().setString("50% : " + _("lima.progressBar.load.etape3")); - b.getProgressBar().setValue(50); + //b.getProgressBar().setString("50% : " + _("lima.progressBar.load.etape3")); + //b.getProgressBar().setValue(50); + splash.updateProgression(0.50, _("lima.progressBar.load.etape3")); + try { + Thread.sleep(2000); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } dataManager.getStatus(); // Chargement des periodes - b.getProgressBar().setString("60% : " + _("lima.progressBar.load.etape4")); - b.getProgressBar().setValue(60); + //b.getProgressBar().setString("60% : " + _("lima.progressBar.load.etape4")); + //b.getProgressBar().setValue(60); + try { + Thread.sleep(2000); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + splash.updateProgression(0.60, _("lima.progressBar.load.etape4")); dataManager.getPeriodes(); // Chargement des transactions - b.getProgressBar().setString("70% : " + _("lima.progressBar.load.etape5")); - b.getProgressBar().setValue(70); - dataManager.getTransactionModel(b.getProgressBar()); - b.dispose(); + //b.getProgressBar().setString("70% : " + _("lima.progressBar.load.etape5")); + //b.getProgressBar().setValue(70); + splash.updateProgression(0.70, _("lima.progressBar.load.etape5")); + dataManager.getTransactionModel(splash); + //b.dispose(); + + //splash.closeSplash(); } - }.start(); + }; + t.start(); + t.join(); -// // show ui -// SwingUtilities.invokeLater(new Runnable() { -// -// @Override -// public void run() { -// ui.setVisible(true); -// } -// }); + // show ui + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + ui.setVisible(true); + } + }); } public static class ShutdownHook extends Thread { @@ -245,4 +262,41 @@ } } } + + /** + * This method ask for user to laod a default account plan. + * + * @param accountRoot database accounts + */ + public static void loadDefaultAccount(AccountDTO accountRoot) { + if (log.isDebugEnabled()) { + log.debug("Account root : " + accountRoot); + } + if (accountRoot.getChildren().isEmpty()) { + if (log.isDebugEnabled()) { + log.debug("No existing accounts"); + } + + String[] response = {_("lima.response.yes"), _("lima.response.no")}; + int n = JOptionPane.showOptionDialog(null, + _("lima.question.load.accounts"), + _("lima.question"), + JOptionPane.YES_NO_OPTION, + JOptionPane.QUESTION_MESSAGE, + null, //do not use a custom Icon + response, //the titles of buttons + response[1]); //default button title + if (n == JOptionPane.YES_OPTION) { + XMLImport imports = new XMLImport(); + URL urlFile = Main.class.getResource("/import/default_pcg.xml"); + try { + imports.importAccount(urlFile.openStream()); + } catch (IOException eee) { + log.error("Erreur chargement du fichier 'default_pcg.xml'", eee); + } + } else { + LimaContext.getContext().getDataManager().resetAccountModel(); + } + } + } } Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java 2010-02-26 16:36:36 UTC (rev 2789) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java 2010-02-26 16:37:18 UTC (rev 2790) @@ -19,16 +19,20 @@ package org.chorem.lima.ui; -import java.awt.*; +import static org.nuiton.i18n.I18n._; + +import java.awt.Window; import java.io.IOException; import java.net.URL; + import javax.swing.JOptionPane; import jaxx.runtime.JAXXContext; -import org.chorem.lima.LimaContext; -import static org.nuiton.i18n.I18n._; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.lima.LimaContext; +import org.chorem.lima.LimaSplash; import org.chorem.lima.dto.AccountDTO; import org.chorem.lima.imports.XMLImport; @@ -36,6 +40,7 @@ * Barre de progression * * @author Rémi Chapelet + * @deprecated since 0.3.2 (replaced by {@link LimaSplash}) */ public class ProgressBarImpl extends ProgressBar { Added: trunk/lima-main/src/main/resources/images/splash.png =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/images/splash.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r2789 - in trunk: lima-service/src/main/java/org/chorem/lima/service lima-service/src/main/java/org/chorem/lima/service/util lima-service-callao/src/main/java/org/chorem/lima/service/callao lima-service-mock/src/main/java/org/chorem/lima/service/mock lima-service-neogia/src/main/java/org/chorem/lima/service/neogia
by echatellier＠users.chorem.org Feb. 26, 2010

Feb. 26, 2010

Author: echatellier Date: 2010-02-26 17:36:36 +0100 (Fri, 26 Feb 2010) New Revision: 2789 Added: trunk/lima-service/src/main/java/org/chorem/lima/service/util/ProgressListener.java Modified: trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/CallaoTransactionService.java trunk/lima-service-mock/src/main/java/org/chorem/lima/service/mock/MockTransactionService.java trunk/lima-service-neogia/src/main/java/org/chorem/lima/service/neogia/NeogiaTransactionService.java trunk/lima-service/src/main/java/org/chorem/lima/service/TransactionService.java Log: Add a progressListener interface into service to remove dependency on JProgressBar in business code Modified: trunk/lima-service/src/main/java/org/chorem/lima/service/TransactionService.java =================================================================== --- trunk/lima-service/src/main/java/org/chorem/lima/service/TransactionService.java 2010-02-26 14:27:49 UTC (rev 2788) +++ trunk/lima-service/src/main/java/org/chorem/lima/service/TransactionService.java 2010-02-26 16:36:36 UTC (rev 2789) @@ -19,12 +19,13 @@ package org.chorem.lima.service; import java.util.List; + import org.chorem.lima.dto.AccountDTO; import org.chorem.lima.dto.JournalDTO; import org.chorem.lima.dto.PeriodDTO; import org.chorem.lima.dto.StatusDTO; import org.chorem.lima.dto.TransactionDTO; -import javax.swing.JProgressBar; +import org.chorem.lima.service.util.ProgressListener; /** * @@ -37,22 +38,16 @@ * @param periods * @param journals * @param accounts - * @param status + * @param status + * @param progressListener to notify loading progress (can be null) * @return */ public List<TransactionDTO> getAllTransaction( - List<PeriodDTO> periods, - List<JournalDTO> journals, - List<AccountDTO> accounts, - List<StatusDTO> status); - - - public List<TransactionDTO> getAllTransaction( List<PeriodDTO> periods, List<JournalDTO> journals, List<AccountDTO> accounts, List<StatusDTO> status, - JProgressBar barre); + ProgressListener progressListener); /** * @@ -71,7 +66,7 @@ List<StatusDTO> status, TransactionDTO oldTrans, TransactionDTO newTrans); - + /** * * @param trans Added: trunk/lima-service/src/main/java/org/chorem/lima/service/util/ProgressListener.java =================================================================== --- trunk/lima-service/src/main/java/org/chorem/lima/service/util/ProgressListener.java (rev 0) +++ trunk/lima-service/src/main/java/org/chorem/lima/service/util/ProgressListener.java 2010-02-26 16:36:36 UTC (rev 2789) @@ -0,0 +1,40 @@ +/** + * *##% Lima service + * Copyright (C) 2010 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* + */ + +package org.chorem.lima.service.util; + +/** + * Progression listener interface to notify for loading update. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public interface ProgressListener { + + /** + * Update progression. + * + * @param progression progression (between 0.0 and 1.0) + * @param message message (can be null) + */ + void updateProgression(double progression, String message); +} Property changes on: trunk/lima-service/src/main/java/org/chorem/lima/service/util/ProgressListener.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/CallaoTransactionService.java =================================================================== --- trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/CallaoTransactionService.java 2010-02-26 14:27:49 UTC (rev 2788) +++ trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/CallaoTransactionService.java 2010-02-26 16:36:36 UTC (rev 2789) @@ -34,6 +34,7 @@ import org.chorem.lima.service.TransactionService; import org.chorem.lima.service.ServiceFactory; import org.chorem.lima.service.callao.convertObject.ConvertTransaction; +import org.chorem.lima.service.util.ProgressListener; import org.chorem.lima.service.util.ServiceHelper; import javax.swing.JProgressBar; import static org.nuiton.i18n.I18n._; @@ -56,15 +57,16 @@ private ConvertTransaction convertTransaction = new ConvertTransaction(); - - /** + /* + * Duplicated code (merged will null allowed progress). + * * Recherche toutes les transactions dans la bdd. * @param periods * @param journals * @param accounts * @param status * @return - */ + * @Override public List<TransactionDTO> getAllTransaction(List<PeriodDTO> periods, List<JournalDTO> journals, List<AccountDTO> accounts, List<StatusDTO> status) { if (log.isDebugEnabled()) { @@ -95,21 +97,21 @@ listTransactionLima.add(transactionLima); } return listTransactionLima; - } + }*/ /** - * Récupère toutes les transactions avec la possibilité d'augmenter la - * barre de chargement. + * Récupère toutes les transactions avec la possibilité d'augmenter la barre de chargement. + * * @param periods * @param journals * @param accounts * @param status - * @param barre + * @param progress progress (can be null) * @return */ @Override public List<TransactionDTO> getAllTransaction(List<PeriodDTO> periods, List<JournalDTO> journals, - List<AccountDTO> accounts, List<StatusDTO> status,JProgressBar barre) { + List<AccountDTO> accounts, List<StatusDTO> status, ProgressListener progress) { if (log.isDebugEnabled()) { log.debug("getAllTransaction : "); } @@ -125,25 +127,25 @@ List<org.chorem.callao.service.dto.TransactionDTO> listTransactionCallao = transactionServiceImpl.getAllTransactionDTO(); // Récupère le nombre de transactions - float nbTransactions = listTransactionCallao.size(); - float incremente = 30 / nbTransactions; - float value = 70; - for (org.chorem.callao.service.dto.TransactionDTO transactionCallao : listTransactionCallao) - { + double nbTransactions = listTransactionCallao.size(); + double incremente = 30 / nbTransactions; + double value = 70; + for (org.chorem.callao.service.dto.TransactionDTO transactionCallao : listTransactionCallao) { // Converti la transaction Callao en transaction Lima TransactionDTO transactionLima = convertTransaction.transactionCallaoToTransactionLima(transactionCallao,journals,periods,status); // Recherche de toutes les entrées comptables pour cette transaction List<EntryDTO> listEntryLima = entryServ.getEntryByTransaction(transactionLima, accounts); // Pour toutes les entrées comptables Lima - for (EntryDTO entryLima : listEntryLima) - { + for (EntryDTO entryLima : listEntryLima) { transactionLima.addChild(entryLima); } listTransactionLima.add(transactionLima); // Incrémente la barre de chargement - value = value + incremente; - barre.setValue((int)value); - barre.setString((int)value+"% : "+_("lima.progressBar.load.etape5")); + value = value + incremente; + + if (progress != null) { + progress.updateProgression(value, _("lima.progressBar.load.etape5")); + } } return listTransactionLima; } Modified: trunk/lima-service-mock/src/main/java/org/chorem/lima/service/mock/MockTransactionService.java =================================================================== --- trunk/lima-service-mock/src/main/java/org/chorem/lima/service/mock/MockTransactionService.java 2010-02-26 14:27:49 UTC (rev 2788) +++ trunk/lima-service-mock/src/main/java/org/chorem/lima/service/mock/MockTransactionService.java 2010-02-26 16:36:36 UTC (rev 2789) @@ -18,19 +18,24 @@ */ package org.chorem.lima.service.mock; +import java.util.Calendar; +import java.util.LinkedList; +import java.util.List; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.dto.*; +import org.chorem.lima.dto.AccountDTO; +import org.chorem.lima.dto.EntryDTO; +import org.chorem.lima.dto.JournalDTO; +import org.chorem.lima.dto.PeriodDTO; +import org.chorem.lima.dto.StatusDTO; +import org.chorem.lima.dto.TransactionDTO; import org.chorem.lima.service.EntryService; import org.chorem.lima.service.ServiceFactory; import org.chorem.lima.service.TransactionService; +import org.chorem.lima.service.util.ProgressListener; import org.chorem.lima.service.util.ServiceHelper; -import java.util.Calendar; -import java.util.LinkedList; -import java.util.List; -import javax.swing.JProgressBar; - /** * @author ore */ @@ -42,7 +47,8 @@ protected static final Log log = LogFactory.getLog(MockTransactionService.class); @Override - public List<TransactionDTO> getAllTransaction(List<PeriodDTO> periods, List<JournalDTO> journals, List<AccountDTO> accounts, List<StatusDTO> status) { + public List<TransactionDTO> getAllTransaction(List<PeriodDTO> periods, List<JournalDTO> journals, + List<AccountDTO> accounts, List<StatusDTO> status, ProgressListener progress) { if (log.isDebugEnabled()) { log.debug("getAllTransaction : "); } @@ -87,14 +93,6 @@ } @Override - public List<TransactionDTO> getAllTransaction(List<PeriodDTO> periods, - List<JournalDTO> journals, List<AccountDTO> accounts, - List<StatusDTO> status,JProgressBar barre) { - return getAllTransaction(periods,journals,accounts,status); - } - - - @Override public String removeTransaction(TransactionDTO trans,List<StatusDTO> status) { if (log.isDebugEnabled()) { log.debug("removeTransaction : "); Modified: trunk/lima-service-neogia/src/main/java/org/chorem/lima/service/neogia/NeogiaTransactionService.java =================================================================== --- trunk/lima-service-neogia/src/main/java/org/chorem/lima/service/neogia/NeogiaTransactionService.java 2010-02-26 14:27:49 UTC (rev 2788) +++ trunk/lima-service-neogia/src/main/java/org/chorem/lima/service/neogia/NeogiaTransactionService.java 2010-02-26 16:36:36 UTC (rev 2789) @@ -32,27 +32,39 @@ */ package org.chorem.lima.service.neogia; +import java.rmi.RemoteException; +import java.util.Calendar; +import java.util.LinkedList; +import java.util.List; + +import javax.swing.JProgressBar; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.dto.*; +import org.chorem.lima.dto.AccountDTO; +import org.chorem.lima.dto.EntryDTO; +import org.chorem.lima.dto.JournalDTO; +import org.chorem.lima.dto.PeriodDTO; +import org.chorem.lima.dto.StatusDTO; +import org.chorem.lima.dto.TransactionDTO; import org.chorem.lima.service.EntryService; import org.chorem.lima.service.ServiceFactory; import org.chorem.lima.service.TransactionService; import org.chorem.lima.service.neogia.util.NeogiaUtil; +import org.chorem.lima.service.util.ProgressListener; import org.chorem.lima.service.util.ServiceHelper; -import org.ofbiz.webservice.proxies.*; +import org.ofbiz.webservice.proxies.AddTransactionDocument; +import org.ofbiz.webservice.proxies.AddTransactionResponseDocument; +import org.ofbiz.webservice.proxies.GetAllTransactionResponseDocument; +import org.ofbiz.webservice.proxies.RemoveTransactionDocument; +import org.ofbiz.webservice.proxies.UpdateTransactionDocument; +import org.ofbiz.webservice.proxies.UpdateTransactionResponseDocument; import org.ofbiz.webservice.proxies.AddTransactionDocument.AddTransaction; import org.ofbiz.webservice.proxies.RemoveTransactionDocument.RemoveTransaction; import org.ofbiz.webservice.proxies.UpdateTransactionDocument.UpdateTransaction; import org.ofbiz.webservice.wrappers.xsd.GenericValueAcctgTransactionItem; import org.ofbiz.webservice.wrappers.xsd.GenericValueAcctgTransactionItemAndGlPeriod; -import java.rmi.RemoteException; -import java.util.Calendar; -import java.util.LinkedList; -import java.util.List; -import javax.swing.JProgressBar; - /** * @author chemit */ @@ -64,7 +76,8 @@ protected static final Log log = LogFactory.getLog(NeogiaPeriodService.class); @Override - public List<TransactionDTO> getAllTransaction(List<PeriodDTO> periods, List<JournalDTO> journals, List<AccountDTO> accounts, List<StatusDTO> status) { + public List<TransactionDTO> getAllTransaction(List<PeriodDTO> periods, List<JournalDTO> journals, + List<AccountDTO> accounts, List<StatusDTO> status, ProgressListener progress) { if (log.isDebugEnabled()) { log.debug("getAllTransaction : "); } @@ -94,14 +107,6 @@ } @Override - public List<TransactionDTO> getAllTransaction(List<PeriodDTO> periods, - List<JournalDTO> journals, List<AccountDTO> accounts, - List<StatusDTO> status,JProgressBar barre) { - return getAllTransaction(periods,journals,accounts,status); - } - - - @Override public String removeTransaction(TransactionDTO trans,List<StatusDTO> status) { if (log.isDebugEnabled()) { log.debug("removeTransaction : ");

1 0