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

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

r2788 - trunk/lima-service/src/main/java/org/chorem/lima/service/util
by echatellier＠users.chorem.org Feb. 26, 2010

Feb. 26, 2010

Author: echatellier Date: 2010-02-26 15:27:49 +0100 (Fri, 26 Feb 2010) New Revision: 2788 Modified: trunk/lima-service/src/main/java/org/chorem/lima/service/util/ServiceHelper.java Log: Remove duplicated header. Modified: trunk/lima-service/src/main/java/org/chorem/lima/service/util/ServiceHelper.java =================================================================== --- trunk/lima-service/src/main/java/org/chorem/lima/service/util/ServiceHelper.java 2010-02-26 13:42:33 UTC (rev 2787) +++ trunk/lima-service/src/main/java/org/chorem/lima/service/util/ServiceHelper.java 2010-02-26 14:27:49 UTC (rev 2788) @@ -16,20 +16,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -/** - * # #% Copyright (C) 2008-2009 Code Lutin, Tony Chemit, Rémi Chapelet - * 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.service.util; import org.apache.commons.logging.Log;

1 0

r2787 - trunk/lima-main/src/main/java/org/chorem/lima
by echatellier＠users.chorem.org Feb. 26, 2010

Feb. 26, 2010

Author: echatellier Date: 2010-02-26 14:42:33 +0100 (Fri, 26 Feb 2010) New Revision: 2787 Modified: trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java trunk/lima-main/src/main/java/org/chorem/lima/Main.java Log: Remove enum step (Step.AfterInit.ordinal() can't be used to define an @Step action) Modified: trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java 2010-02-26 13:38:48 UTC (rev 2786) +++ trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java 2010-02-26 13:42:33 UTC (rev 2787) @@ -262,12 +262,10 @@ return type; } } + + public static final int AFTER_INIT_STEP = 0; + public static final int BEFORE_EXIT_STEP = 1; - public static enum Step { - - AfterInit, BeforeExit - } - public static enum Action { HELP(_("lima.action.commandline.help"), LimaAction.class.getName() + "#help", "-h", "--help"), 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 13:38:48 UTC (rev 2786) +++ trunk/lima-main/src/main/java/org/chorem/lima/Main.java 2010-02-26 13:42:33 UTC (rev 2787) @@ -65,7 +65,7 @@ LimaConfig config = context.getContextValue(LimaConfig.class); - config.doAction(LimaConfig.Step.AfterInit.ordinal()); + config.doAction(LimaConfig.AFTER_INIT_STEP); if (config.isDisplayMainUI()) { // on affiche l'ui principale

1 0

r2786 - trunk/lima-main/src/main/java/org/chorem/lima/ui
by echatellier＠users.chorem.org Feb. 26, 2010

Feb. 26, 2010

Author: echatellier Date: 2010-02-26 14:38:48 +0100 (Fri, 26 Feb 2010) New Revision: 2786 Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java Log: Some esthetic fix Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java 2010-02-26 13:17:56 UTC (rev 2785) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java 2010-02-26 13:38:48 UTC (rev 2786) @@ -31,6 +31,7 @@ import java.util.GregorianCalendar; import java.util.LinkedList; import java.util.List; +import java.util.Locale; import javax.swing.JComboBox; import javax.swing.ListSelectionModel; @@ -167,15 +168,12 @@ addPeriodForm.getEndYearPeriodPanel().validate(); //Init MONTH Periode Combobox - cal.set(Calendar.MONTH, Calendar.JANUARY); - cal.add(Calendar.MONTH, 0); - comboBeginMonthPeriod.addItem(cal.getDisplayName(Calendar.MONTH, 2, java.util.Locale.getDefault())); - comboEndMonthPeriod.addItem(cal.getDisplayName(Calendar.MONTH, 2, java.util.Locale.getDefault())); - for(int j = 0; j < 11; j++){ - cal.add(Calendar.MONTH, 1); - comboBeginMonthPeriod.addItem(cal.getDisplayName(Calendar.MONTH, 2, java.util.Locale.getDefault())); - comboEndMonthPeriod.addItem(cal.getDisplayName(Calendar.MONTH, 2, java.util.Locale.getDefault())); - } + cal.set(Calendar.MONTH, Calendar.JANUARY); + for (int j = 0; j <= 11; j++) { + comboBeginMonthPeriod.addItem(cal.getDisplayName(Calendar.MONTH, 2, Locale.getDefault())); + comboEndMonthPeriod.addItem(cal.getDisplayName(Calendar.MONTH, 2, Locale.getDefault())); + cal.add(Calendar.MONTH, 1); + } //Add BeginMonth ComboBox to addPeriodForm addPeriodForm.getBeginMonthPeriodPanel().add(comboBeginMonthPeriod); @@ -288,22 +286,21 @@ } PeriodDTO periodCurrent = LimaContext.getContext().getDataManager().getCurrentPeriod(); List<StatusDTO> status = LimaContext.getContext().getDataManager().getStatus(); - // TODO gere locale courante - Calendar cal_beg = new GregorianCalendar(); - if (periodCurrent != null) - { - cal_beg.setTime(periodCurrent.getBegin()); - cal_beg.add(Calendar.YEAR , comboBeginYearPeriod.getSelectedIndex()); - } + + Calendar cal_beg = Calendar.getInstance(); + if (periodCurrent != null) { + cal_beg.setTime(periodCurrent.getBegin()); + cal_beg.add(Calendar.YEAR , comboBeginYearPeriod.getSelectedIndex()); + } else { - cal_beg.add(Calendar.YEAR , comboBeginYearPeriod.getSelectedIndex()); + cal_beg.add(Calendar.YEAR , comboBeginYearPeriod.getSelectedIndex()); } cal_beg.set(Calendar.DAY_OF_MONTH, 1); cal_beg.set(Calendar.MONTH, comboBeginMonthPeriod.getSelectedIndex()); Date begin = cal_beg.getTime(); - Calendar cal_end = new GregorianCalendar(); + Calendar cal_end = Calendar.getInstance(); cal_end.add(Calendar.YEAR, comboEndYearPeriod.getSelectedIndex()); cal_end.set(Calendar.MONTH , comboEndMonthPeriod.getSelectedIndex()); int maximum = cal_end.getActualMaximum(Calendar.DAY_OF_MONTH); @@ -377,7 +374,6 @@ form.dispose(); } - /** * Cette méthode permet de retourner une liste des périodes sélectionnées. * @@ -403,6 +399,4 @@ addPeriodForm.setVisible(true); } - } -

1 0

r2785 - trunk/lima-main/src/main/java/org/chorem/lima/ui
by echatellier＠users.chorem.org Feb. 26, 2010

Feb. 26, 2010

Author: echatellier Date: 2010-02-26 14:17:56 +0100 (Fri, 26 Feb 2010) New Revision: 2785 Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java Log: Fix #120, add previous year in period date combo box Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java 2010-02-26 12:50:35 UTC (rev 2784) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java 2010-02-26 13:17:56 UTC (rev 2785) @@ -19,12 +19,27 @@ package org.chorem.lima.ui; +import static org.nuiton.i18n.I18n._; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.util.Calendar; +import java.util.Collections; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.LinkedList; +import java.util.List; + +import javax.swing.JComboBox; +import javax.swing.ListSelectionModel; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaContext; import org.chorem.lima.combobox.model.PeriodComboBoxModel; import org.chorem.lima.combobox.renderer.PeriodComboBoxRenderer; -import static org.nuiton.i18n.I18n._; import org.chorem.lima.dto.PeriodDTO; import org.chorem.lima.dto.StatusDTO; import org.chorem.lima.dto.TransactionDTO; @@ -32,15 +47,12 @@ import org.chorem.lima.dto.util.TriPeriodDesc; import org.chorem.lima.table.model.ClosureTableModel; import org.jdesktop.swingx.JXTable; +import org.jdesktop.swingx.decorator.Filter; +import org.jdesktop.swingx.decorator.FilterPipeline; +import org.jdesktop.swingx.decorator.HighlighterFactory; +import org.jdesktop.swingx.decorator.PatternFilter; -import javax.swing.*; -import java.awt.event.*; -import java.util.*; -import org.jdesktop.swingx.decorator.*; -import org.nuiton.util.PeriodDates; - - /** * Permet l'affichage du tableau avec les périodes mensuelles. * @@ -48,10 +60,12 @@ */ public class ClosureViewImpl extends ClosureView { - /** - * log - */ + /** serialVersionUID. */ + private static final long serialVersionUID = -8759564865633991757L; + + /** log. */ private static final Log log = LogFactory.getLog(ClosureViewImpl.class); + private final JXTable table; private JComboBox comboBoxPeriod = new JComboBox(); private final ClosureTimeSpanForm form; @@ -73,7 +87,7 @@ // Initialisation du choix pour les périodes initComboBoxPeriod(); - /** Set Period model */ + /* Set Period model */ // Création du model pour le tableau table = new JXTable(LimaContext.getContext().getDataManager().getClosureModel()); table.setRowHeight(24); @@ -83,7 +97,7 @@ table.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION); table.setColumnControlVisible(true); - /** + /* * Ajout d'un listener lorsque l'utilisateur change de période. */ comboBoxPeriod.addItemListener(new ItemListener() { @@ -97,7 +111,7 @@ } }); // Récupère la période master (celle de l'exercice) - /** + /* PeriodDTO periodMaster = (PeriodDTO) comboBoxPeriod.getSelectedItem(); // Définition du tri avec une expression régulière Filter[] filterArray = { new PatternFilter("(.*"+(periodMaster.getBegin().getYear()+1900)+".*)|(.*Final.*)", 0, 0) }; @@ -108,7 +122,7 @@ // Ajout du tableau dans l'UI getClosureScrollPane().setViewportView(table); - /** + /* * Initialisation du formulaire pour bloquer ou débloquer une période. */ form = LimaContext.getContext().getMainUI().getClosureTimeSpanForm(); @@ -124,17 +138,25 @@ */ addPeriodForm = LimaContext.getContext().getMainUI().getAddPeriod(); - Calendar cal = new GregorianCalendar(); + Calendar cal = Calendar.getInstance(); //Init YEAR Periode Combobox - cal.add(Calendar.YEAR, 0); - comboBeginYearPeriod.addItem(cal.get(Calendar.YEAR)); - comboEndYearPeriod.addItem(cal.get(Calendar.YEAR)); - for(int i = 0; i < 5; i++){ + // take care about previous year #120 + cal.add(Calendar.YEAR, -1); + for (int i = 0; i <= 6; i++) { + int newYear = cal.get(Calendar.YEAR); + comboBeginYearPeriod.addItem(newYear); + comboEndYearPeriod.addItem(newYear); + + // set current year selected + if (i == 0) { + comboBeginYearPeriod.setSelectedItem(newYear); + comboEndYearPeriod.setSelectedItem(newYear); + } + cal.add(Calendar.YEAR, 1); - comboBeginYearPeriod.addItem(cal.get(Calendar.YEAR)); - comboEndYearPeriod.addItem(cal.get(Calendar.YEAR)); } + //Add BeginYear ComboBox to addPeriodForm addPeriodForm.getBeginYearPeriodPanel().add(comboBeginYearPeriod);

1 0

r2784 - trunk/lima-main/src/main/java/org/chorem/lima
by echatellier＠users.chorem.org Feb. 26, 2010

Feb. 26, 2010

Author: echatellier Date: 2010-02-26 13:50:35 +0100 (Fri, 26 Feb 2010) New Revision: 2784 Modified: trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java Log: Update copyright date Modified: trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java 2010-02-26 12:49:46 UTC (rev 2783) +++ trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java 2010-02-26 12:50:35 UTC (rev 2784) @@ -55,7 +55,7 @@ protected static File observeUserDirectory; public String getCopyrightText() { - return "Version " + getVersion() + " Codelutin @ 2008-2009"; + return "Version " + getVersion() + " Codelutin @ 2008-2010"; } /**

1 0

r2783 - trunk/lima-main/src/main/filters
by echatellier＠users.chorem.org Feb. 26, 2010

Feb. 26, 2010

Author: echatellier Date: 2010-02-26 13:49:46 +0100 (Fri, 26 Feb 2010) New Revision: 2783 Modified: trunk/lima-main/src/main/filters/lima.properties Log: Fix site url Modified: trunk/lima-main/src/main/filters/lima.properties =================================================================== --- trunk/lima-main/src/main/filters/lima.properties 2010-02-21 10:31:12 UTC (rev 2782) +++ trunk/lima-main/src/main/filters/lima.properties 2010-02-26 12:49:46 UTC (rev 2783) @@ -1,6 +1,10 @@ application.name=${project.name} application.version=${project.version} -application.site.url=${project.url} + +# le lien suivant pointe sur le module qui n'a pas de site associ� +#application.site.url=${project.url} +application.site.url=http://maven-site.chorem.org/lima/ + #licence.name=${project.licenses[0].license.name} #licence.url=${project.licenses.0.url} application.organisation.name=${project.organization.name}

1 0

r2782 - trunk
by tchemit＠users.chorem.org Feb. 21, 2010

Feb. 21, 2010

Author: tchemit Date: 2010-02-21 11:31:12 +0100 (Sun, 21 Feb 2010) New Revision: 2782 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.5 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-26 21:08:41 UTC (rev 2781) +++ trunk/pom.xml 2010-02-21 10:31:12 UTC (rev 2782) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.4</version> + <version>2.0.5</version> </parent> <groupId>org.chorem</groupId>

1 0