[Lima-commits] r3832 - in trunk/lima-business/src: main/java/org/chorem/lima/business main/java/org/chorem/lima/business/ejb test/java/org/chorem/lima/business test/java/org/chorem/lima/business/accountingrules

12 Jun 2014

Author: dcosse
Date: 2014-06-12 11:02:50 +0200 (Thu, 12 Jun 2014)
New Revision: 3832

Url: http://forge.chorem.org/projects/lima/repository/revisions/3832

Log:
#934 refactoring retrait d'acc?\195?\168s static ?\195?\160 des methodes dont la classe est un singleton

Modified:
   trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java
   trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java
   trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java
   trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java
   trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java
   trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java
   trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java
   trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java
   trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java
   trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java
   trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java
   trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java
   trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java
   trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java
   trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java
   trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java
   trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java
   trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java
   trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java

Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java
===================================================================

--- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java	2014-06-12 08:35:38 UTC (rev 3831)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java	2014-06-12 09:02:50 UTC (rev 3832)
@@ -101,7 +101,7 @@
      *
      * @return l'instance de rule
      */
-    public static AccountingRules getAccountingRules() {
+    public AccountingRules getAccountingRules() {
 
         if (accountingRules == null) {
             Class<?> accountingRulesClass = config.getOptionAsClass(ServiceConfigOption.RULES_NATIONALTY.key);
@@ -125,48 +125,48 @@
         return accountingRules;
     }
 
-    public static void setAccountingRule(String accountingRule) {
+    public void setAccountingRule(String accountingRule) {
         accountingRules = null; // clear cache
         config.setOption(ServiceConfigOption.RULES_NATIONALTY.key, accountingRule);
     }
 
-    public static File getDataDir() {
+    public File getDataDir() {
         File datadir = config.getOptionAsFile(ServiceConfigOption.DATA_DIR.getKey());
         return datadir;
     }
 
-    public static File getReportsDir() {
+    public File getReportsDir() {
         File reportsDir = config.getOptionAsFile(ServiceConfigOption.REPORTS_DIR.getKey());
         return reportsDir;
     }
 
-    public static String getAddressServer() {
+    public String getAddressServer() {
         String serverAddress = config.getOption(ServiceConfigOption.SERVER_ADRESS.getKey());
         return serverAddress;
     }
 
-    public static int getHttpPort() {
+    public int getHttpPort() {
         String httpPort = config.getOption(ServiceConfigOption.HTTP_PORT.getKey());
         Integer port = Integer.valueOf(httpPort);
         return port;
     }
 
-    public static String getScale() {
+    public String getScale() {
         String scale = config.getOption(ServiceConfigOption.SCALE.getKey());
         return scale;
     }
 
-    public static void setScale(String locale) {
+    public void setScale(String locale) {
         config.setOption(ServiceConfigOption.SCALE.key, locale);
         config.saveForUser();
     }
 
-    public static String getVatPDFUrl() {
+    public String getVatPDFUrl() {
         String vatPDFUrl = config.getOption(ServiceConfigOption.VAT_PDF_URL.getKey());
         return vatPDFUrl;
     }
 
-    public static void setVatPDFUrl(String url) {
+    public void setVatPDFUrl(String url) {
         config.setOption(ServiceConfigOption.VAT_PDF_URL.key, url);
         config.saveForUser();
     }

Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java	2014-06-12 08:35:38 UTC (rev 3831)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java	2014-06-12 09:02:50 UTC (rev 3832)
@@ -81,7 +81,7 @@
     public Account createAccount(Account account) throws LimaException {
 
         // check rules before create the account
-        AccountingRules accountingRules = LimaConfig.getAccountingRules();
+        AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules();
         accountingRules.createAccountRules(account);
 
         Account result;
@@ -208,7 +208,7 @@
     @Override
     public void removeAccount(Account account) throws LimaException {
 
-        AccountingRules accountingRules = LimaConfig.getAccountingRules();
+        AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules();
 
         try {
 
@@ -237,7 +237,7 @@
     @Override
     public Account updateAccount(Account account) throws LimaException {
 
-        AccountingRules accountingRules = LimaConfig.getAccountingRules();
+        AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules();
 
         Account result;
         try {

Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java	2014-06-12 08:35:38 UTC (rev 3831)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java	2014-06-12 09:02:50 UTC (rev 3832)
@@ -101,7 +101,7 @@
     protected String path;
 
     public DocumentServiceImpl() {
-        path = LimaConfig.getReportsDir().getAbsolutePath();
+        path = LimaConfig.getInstance().getReportsDir().getAbsolutePath();
 
         if (log.isDebugEnabled()) {
             log.debug("Path : " + path);
@@ -722,7 +722,7 @@
         String filePath = path + File.separator
                 + DocumentsEnum.VAT.getFileName() + ".pdf";
 
-        String path = LimaConfig.getReportsDir().getAbsolutePath();
+        String path = LimaConfig.getInstance().getReportsDir().getAbsolutePath();
 
         String filePathDefault = path + File.separator
                 + DocumentsEnum.VAT.getFileName() + "_default.pdf";
@@ -730,7 +730,7 @@
         PDDocument doc;
         InputStream reportsStream;
 
-        String vatPDFUrl = LimaConfig.getVatPDFUrl();
+        String vatPDFUrl = LimaConfig.getInstance().getVatPDFUrl();
 
         if (vatPDFUrl.equals("default")) {
             reportsStream = DocumentServiceImpl.class

Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java	2014-06-12 08:35:38 UTC (rev 3831)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java	2014-06-12 09:02:50 UTC (rev 3832)
@@ -141,7 +141,7 @@
     public void removeEntryBook(EntryBook entryBook) throws LimaException {
 
         // check rule
-        AccountingRules accountingRules = LimaConfig.getAccountingRules();
+        AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules();
         accountingRules.removeEntryBookRules(entryBook);
 
         try {

Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java	2014-06-12 08:35:38 UTC (rev 3831)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java	2014-06-12 09:02:50 UTC (rev 3832)
@@ -122,7 +122,7 @@
 
     @Override
     public ClosedPeriodicEntryBook blockClosedPeriodicEntryBook(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException {
-        AccountingRules accountingRules = LimaConfig.getAccountingRules();
+        AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules();
 
         ClosedPeriodicEntryBook result;
         try {

Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java	2014-06-12 08:35:38 UTC (rev 3831)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java	2014-06-12 09:02:50 UTC (rev 3832)
@@ -101,7 +101,7 @@
     public FinancialTransaction createFinancialTransaction(FinancialTransaction financialtransaction)
             throws LimaException {
         FinancialTransaction result;
-        AccountingRules accountingRules = LimaConfig.getAccountingRules();
+        AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules();
 
         try {
             //check if the financial period is blocked
@@ -476,7 +476,7 @@
     @Override
     public void updateFinancialTransaction(FinancialTransaction financialTransaction) throws LimaException {
 
-        AccountingRules accountingRules = LimaConfig.getAccountingRules();
+        AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules();
 
         try {
 
@@ -504,7 +504,7 @@
     public void removeFinancialTransaction(FinancialTransaction financialTransaction) throws LimaException {
 
         // check if the financial period is blocked
-        AccountingRules accountingRules = LimaConfig.getAccountingRules();
+        AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules();
         accountingRules.checkFinancialPeriodBlockedWithFinancialTransaction(financialTransaction);
 
         try {
@@ -527,7 +527,7 @@
 
     @Override
     public Entry createEntry(Entry entry) throws LimaException {
-        AccountingRules accountingRules = LimaConfig.getAccountingRules();
+        AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules();
 
         Entry newEntry;
         try {
@@ -550,7 +550,7 @@
     @Override
     public void updateEntry(Entry entry) throws LimaException {
 
-        AccountingRules accountingRules = LimaConfig.getAccountingRules();
+        AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules();
 
         try {
             EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao();
@@ -576,7 +576,7 @@
     @Override
     public void removeEntry(Entry entry) throws LimaException {
 
-        AccountingRules accountingRules = LimaConfig.getAccountingRules();
+        AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules();
 
         try {
             FinancialTransaction financialTransaction = entry.getFinancialTransaction();

Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java	2014-06-12 08:35:38 UTC (rev 3831)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java	2014-06-12 09:02:50 UTC (rev 3832)
@@ -111,7 +111,7 @@
             ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = getDaoHelper().getClosedPeriodicEntryBookDao();
             EntryBookTopiaDao entryBookTopiaDao = getDaoHelper().getEntryBookDao();
 
-            AccountingRules accountingRules = LimaConfig.getAccountingRules();
+            AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules();
 
             // fix begin date at midnight and end date at 23:59:59.999
             Date beginDate = fiscalPeriod.getBeginDate();
@@ -237,7 +237,7 @@
     @Override
     public FiscalPeriod blockFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException {
 
-        AccountingRules accountingRules = LimaConfig.getAccountingRules();
+        AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules();
 
         FiscalPeriod result;
         try {
@@ -500,7 +500,7 @@
     public void deleteFiscalPeriod(FiscalPeriod fiscalPeriod)
             throws LimaException {
 
-        AccountingRules accountingRules = LimaConfig.getAccountingRules();
+        AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules();
 
         try {
             try {

Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java	2014-06-12 08:35:38 UTC (rev 3831)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java	2014-06-12 09:02:50 UTC (rev 3832)
@@ -91,8 +91,8 @@
     private static final SimpleDateFormat DATEFORMAT = new SimpleDateFormat("yyyy-MM-dd");
 
     public HttpServerServiceImpl() {
-        path = LimaConfig.getReportsDir().getAbsolutePath();
-        port = LimaConfig.getHttpPort();
+        path = LimaConfig.getInstance().getReportsDir().getAbsolutePath();
+        port = LimaConfig.getInstance().getHttpPort();
     }
 
     /** start the server */
@@ -131,7 +131,7 @@
     public class MainServlet extends HttpServlet {
         private static final long serialVersionUID = 1L;
 
-        private String serverAddressConfig = LimaConfig.getAddressServer();
+        private String serverAddressConfig = LimaConfig.getInstance().getAddressServer();
 
         @Override
         protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
@@ -270,7 +270,7 @@
                                         + ":" + req.getServerPort();
                     } else {
                         serverAdress += serverAddressConfig + ":"
-                                        + LimaConfig.getHttpPort();
+                                        + LimaConfig.getInstance().getHttpPort();
                     }
 
                     Calendar calendar = Calendar.getInstance();

Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java	2014-06-12 08:35:38 UTC (rev 3831)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java	2014-06-12 09:02:50 UTC (rev 3832)
@@ -730,7 +730,7 @@
 
         PDDocument doc = null;
         try {
-            String path = LimaConfig.getReportsDir().getAbsolutePath();
+            String path = LimaConfig.getInstance().getReportsDir().getAbsolutePath();
 
             String filePathDefault = path + File.separator
                                      + DocumentsEnum.VAT.getFileName() + "_default.pdf";
@@ -760,7 +760,7 @@
 
             //sets the new pdf url to be used as pdf document edited for reports
             if (setMode) {
-                LimaConfig.setVatPDFUrl(datas);
+                LimaConfig.getInstance().setVatPDFUrl(datas);
             }
         } catch (IOException ex) {
             log.error("Can't read vat pdf", ex);

Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java	2014-06-12 08:35:38 UTC (rev 3831)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java	2014-06-12 09:02:50 UTC (rev 3832)
@@ -39,8 +39,8 @@
     protected String vatPDFUrl;
 
     public OptionsServiceImpl() {
-        scale = LimaConfig.getScale();
-        vatPDFUrl = LimaConfig.getVatPDFUrl();
+        scale = LimaConfig.getInstance().getScale();
+        vatPDFUrl = LimaConfig.getInstance().getVatPDFUrl();
     }
 
     public int getScale() {
@@ -52,7 +52,7 @@
     }
 
     public void setScale(String scale) {
-        LimaConfig.setScale(scale);
+        LimaConfig.getInstance().setScale(scale);
     }
 
     public String getVatPDFUrl() {
@@ -60,7 +60,7 @@
     }
 
     public void setVatPDFUrl(String url) {
-        LimaConfig.setVatPDFUrl(url);
+        LimaConfig.getInstance().setVatPDFUrl(url);
     }
 
 }

Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java	2014-06-12 08:35:38 UTC (rev 3831)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java	2014-06-12 09:02:50 UTC (rev 3832)
@@ -72,7 +72,7 @@
 
             VatStatement mastervatStatementUpdate = null;
             if (masterVatStatement != null) {
-                mastervatStatementUpdate = vatStatementTopiaDao.findByLabel(masterVatStatement.getLabel());
+                mastervatStatementUpdate = vatStatementTopiaDao.forLabelEquals(masterVatStatement.getLabel()).findUniqueOrNull();
             }
 
             // check if parent account exist;

Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java
===================================================================
--- trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java	2014-06-12 08:35:38 UTC (rev 3831)
+++ trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java	2014-06-12 09:02:50 UTC (rev 3832)
@@ -44,7 +44,7 @@
      */
     @Test
     public void testDefaultRule() {
-        Assert.assertFalse(LimaConfig.getAccountingRules()
+        Assert.assertFalse(LimaConfig.getInstance().getAccountingRules()
                 instanceof FranceAccountingRules);
     }
 

Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java
===================================================================
--- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java	2014-06-12 08:35:38 UTC (rev 3831)
+++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java	2014-06-12 09:02:50 UTC (rev 3832)
@@ -51,7 +51,7 @@
 
     @Before
     public void installFrenchRule() throws Exception {
-        LimaConfig.setAccountingRule(FranceAccountingRules.class.getName());
+        LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName());
     }
 
     /**
@@ -60,7 +60,7 @@
      */
     @Test
     public void testRuleInstance() {
-        Assert.assertTrue(LimaConfig.getAccountingRules() instanceof FranceAccountingRules);
+        Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules);
     }
 
 }

Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java
===================================================================
--- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java	2014-06-12 08:35:38 UTC (rev 3831)
+++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java	2014-06-12 09:02:50 UTC (rev 3832)
@@ -47,7 +47,7 @@
 
     @Before
     public void installFrenchRule() throws Exception {
-        LimaConfig.setAccountingRule(FranceAccountingRules.class.getName());
+        LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName());
     }
 
     /**
@@ -56,6 +56,6 @@
      */
     @Test
     public void testRuleInstance() {
-        Assert.assertTrue(LimaConfig.getAccountingRules() instanceof FranceAccountingRules);
+        Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules);
     }
 }

Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java
===================================================================
--- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java	2014-06-12 08:35:38 UTC (rev 3831)
+++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java	2014-06-12 09:02:50 UTC (rev 3832)
@@ -47,7 +47,7 @@
 
     @Before
     public void installFrenchRule() throws Exception {
-        LimaConfig.setAccountingRule(FranceAccountingRules.class.getName());
+        LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName());
     }
 
     /**
@@ -56,6 +56,6 @@
      */
     @Test
     public void testRuleInstance() {
-        Assert.assertTrue(LimaConfig.getAccountingRules() instanceof FranceAccountingRules);
+        Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules);
     }
 }

Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java
===================================================================
--- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java	2014-06-12 08:35:38 UTC (rev 3831)
+++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java	2014-06-12 09:02:50 UTC (rev 3832)
@@ -47,7 +47,7 @@
 
     @Before
     public void installFrenchRule() throws Exception {
-        LimaConfig.setAccountingRule(FranceAccountingRules.class.getName());
+        LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName());
     }
 
     /**
@@ -56,6 +56,6 @@
      */
     @Test
     public void testRuleInstance() {
-        Assert.assertTrue(LimaConfig.getAccountingRules() instanceof FranceAccountingRules);
+        Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules);
     }
 }

Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java
===================================================================
--- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java	2014-06-12 08:35:38 UTC (rev 3831)
+++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java	2014-06-12 09:02:50 UTC (rev 3832)
@@ -47,7 +47,7 @@
 
     @Before
     public void installFrenchRule() throws Exception {
-        LimaConfig.setAccountingRule(FranceAccountingRules.class.getName());
+        LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName());
     }
 
     /**
@@ -56,6 +56,6 @@
      */
     @Test
     public void testRuleInstance() {
-        Assert.assertTrue(LimaConfig.getAccountingRules() instanceof FranceAccountingRules);
+        Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules);
     }
 }

Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java
===================================================================
--- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java	2014-06-12 08:35:38 UTC (rev 3831)
+++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java	2014-06-12 09:02:50 UTC (rev 3832)
@@ -59,7 +59,7 @@
      */
     @Test
     public void testRuleInstance() throws Exception {
-        AccountingRules accountingRules = LimaConfig.getAccountingRules();
+        AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules();
         Assert.assertTrue("accountingRules:" + accountingRules,accountingRules instanceof FranceAccountingRules);
     }
 }

Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java
===================================================================
--- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java	2014-06-12 08:35:38 UTC (rev 3831)
+++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java	2014-06-12 09:02:50 UTC (rev 3832)
@@ -50,7 +50,7 @@
 
     @BeforeClass
     public static void installFrenchRule() throws Exception {
-        LimaConfig.setAccountingRule(FranceAccountingRules.class.getName());
+        LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName());
     }
 
     /**
@@ -59,6 +59,6 @@
      */
     @Test
     public void testRuleInstance() {
-        Assert.assertTrue(LimaConfig.getAccountingRules() instanceof FranceAccountingRules);
+        Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules);
     }
 }

    

[Lima-commits] r3832 - in trunk/lima-business/src: main/java/org/chorem/lima/business main/java/org/chorem/lima/business/ejb test/java/org/chorem/lima/business test/java/org/chorem/lima/business/accountingrules

dcosse＠users.chorem.org