r3821 - in trunk: lima-business/src/main/java/org/chorem/lima/business lima-swing/src/main/java/org/chorem/lima/ui/accountsreports lima-swing/src/main/java/org/chorem/lima/ui/balance lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport lima-swing/src/main/java/org/chorem/lima/ui/ledger lima-swing/src/main/java/org/chorem/lima/ui/vatreports - Lima-commits

28 May 2014

Author: dcosse
Date: 2014-05-28 13:53:32 +0200 (Wed, 28 May 2014)
New Revision: 3821

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

Log:
Utilisation De org.nuiton.util.DesktopUtil ?\195?\160 la place de java.awt.Desktop;

Modified:
   trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceReportsViewHandler.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportViewHandler.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-05-28 09:52:22 UTC (rev 3820)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java	2014-05-28 11:53:32 UTC (rev 3821)
@@ -32,14 +32,12 @@
 import org.chorem.lima.business.migration.DatabaseMigrationClass;
 import org.chorem.lima.entity.LimaCallaoEntityEnum;
 import org.nuiton.topia.persistence.TopiaConfigurationConstants;
-import org.nuiton.topia.migration.TopiaMigrationEngine;
 import org.nuiton.topia.migration.TopiaMigrationService;
 import org.nuiton.config.ApplicationConfig;
 import org.nuiton.config.ConfigOptionDef;
 import org.nuiton.config.ArgumentsParserException;
 
 import java.io.File;
-import java.util.Properties;
 
 import static org.nuiton.i18n.I18n.t;
 import static org.nuiton.i18n.I18n.n;

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java	2014-05-28 09:52:22 UTC (rev 3820)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java	2014-05-28 11:53:32 UTC (rev 3821)
@@ -25,7 +25,6 @@
 
 package org.chorem.lima.ui.accountsreports;
 
-import java.awt.Desktop;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URLEncoder;
@@ -46,6 +45,7 @@
 import org.chorem.lima.entity.FinancialPeriod;
 import org.chorem.lima.entity.FiscalPeriod;
 import org.chorem.lima.service.LimaServiceFactory;
+import org.nuiton.util.DesktopUtil;
 
 
 /**
@@ -113,7 +113,7 @@
                 if (log.isDebugEnabled()) {
                     log.debug("URI : " + uri);
                 }
-                Desktop.getDesktop().browse(uri);
+                DesktopUtil.browse(uri);
 
             } catch (IOException e) {
                 log.error("Can't open browser", e);

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceReportsViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceReportsViewHandler.java	2014-05-28 09:52:22 UTC (rev 3820)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceReportsViewHandler.java	2014-05-28 11:53:32 UTC (rev 3821)
@@ -25,8 +25,6 @@
 
 package org.chorem.lima.ui.balance;
 
-import java.awt.Desktop;
-import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.text.SimpleDateFormat;
@@ -44,6 +42,7 @@
 import org.chorem.lima.entity.FinancialPeriod;
 import org.chorem.lima.entity.FiscalPeriod;
 import org.chorem.lima.service.LimaServiceFactory;
+import org.nuiton.util.DesktopUtil;
 
 /**
  * Handler associated with accounts reports view.
@@ -98,9 +97,7 @@
                              + dateFormat.format(beginDate)
                              + "&endDate=" + dateFormat.format(endDate) + "&format=.html&model="
                              + DocumentsEnum.BALANCE.getFileName();
-                Desktop.getDesktop().browse(new URI(url));
-            } catch (IOException e) {
-                log.error("Can't open browser", e);
+                DesktopUtil.browse(new URI(url));
             } catch (URISyntaxException e) {
                 log.error("Can't create news URI", e);
             }

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java	2014-05-28 09:52:22 UTC (rev 3820)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java	2014-05-28 11:53:32 UTC (rev 3821)
@@ -25,8 +25,6 @@
 
 package org.chorem.lima.ui.entrybooksreports;
 
-import java.awt.Desktop;
-import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.text.SimpleDateFormat;
@@ -46,6 +44,7 @@
 import org.chorem.lima.entity.FinancialPeriod;
 import org.chorem.lima.entity.FiscalPeriod;
 import org.chorem.lima.service.LimaServiceFactory;
+import org.nuiton.util.DesktopUtil;
 
 /**
  * Handler associated with accounts reports view.
@@ -105,17 +104,15 @@
                              + "&endDate=" + dateFormat.format(endDate)
                              + "&format=.html&model="
                              + DocumentsEnum.ENTRYBOOKS.getFileName();
-                Desktop.getDesktop().browse(new URI(url));
+                DesktopUtil.browse(new URI(url));
 
                 String url2 = "http://" + address + ":" + port + "/?beginDate="
                               + dateFormat.format(beginDate)
                               + "&endDate=" + dateFormat.format(endDate)
                               + "&format=.html&model="
                               + DocumentsEnum.GENERAL_ENTRYBOOK.getFileName();
-                Desktop.getDesktop().browse(new URI(url2));
+                DesktopUtil.browse(new URI(url2));
 
-            } catch (IOException e) {
-                log.error("Can't open browser", e);
             } catch (URISyntaxException e) {
                 log.error("Can't create news URI", e);
             }

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java	2014-05-28 09:52:22 UTC (rev 3820)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java	2014-05-28 11:53:32 UTC (rev 3821)
@@ -26,8 +26,6 @@
 package org.chorem.lima.ui.financialstatementreport;
 
 
-import java.awt.Desktop;
-import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.text.SimpleDateFormat;
@@ -44,6 +42,7 @@
 import org.chorem.lima.entity.FinancialPeriod;
 import org.chorem.lima.entity.FiscalPeriod;
 import org.chorem.lima.service.LimaServiceFactory;
+import org.nuiton.util.DesktopUtil;
 
 /**
  * Handler associated with accounts reports view.
@@ -101,9 +100,7 @@
                     + "&format=.html&model="
                     + DocumentsEnum.FINANCIALSTATEMENT.getFileName();
             try {
-                Desktop.getDesktop().browse(new URI(url));
-            } catch (IOException e) {
-                log.error("Can't open browser", e);
+                DesktopUtil.browse(new URI(url));
             } catch (URISyntaxException e) {
                 log.error("Can't create news URI", e);
             }

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java	2014-05-28 09:52:22 UTC (rev 3820)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java	2014-05-28 11:53:32 UTC (rev 3821)
@@ -25,40 +25,24 @@
 
 package org.chorem.lima.ui.ledger;
 
-import static org.nuiton.i18n.I18n.t;
-
-import java.awt.Desktop;
-import java.io.IOException;
-import java.math.BigDecimal;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
-import javax.swing.JOptionPane;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.chorem.lima.LimaConfig;
-import org.chorem.lima.beans.BalanceTrial;
-import org.chorem.lima.beans.ReportsDatas;
-import org.chorem.lima.business.ServiceListener;
 import org.chorem.lima.business.api.FinancialPeriodService;
-import org.chorem.lima.business.api.FinancialTransactionService;
 import org.chorem.lima.business.api.FiscalPeriodService;
 import org.chorem.lima.business.api.HttpServerService;
-import org.chorem.lima.business.api.ImportService;
 import org.chorem.lima.business.api.ReportService;
 import org.chorem.lima.business.utils.DocumentsEnum;
-import org.chorem.lima.business.utils.EntryComparator;
-import org.chorem.lima.business.utils.FormatsEnum;
-import org.chorem.lima.entity.Entry;
 import org.chorem.lima.entity.FinancialPeriod;
 import org.chorem.lima.entity.FiscalPeriod;
 import org.chorem.lima.service.LimaServiceFactory;
+import org.nuiton.util.DesktopUtil;
 
 /**
  * Handler associated with accounts reports view.
@@ -114,9 +98,7 @@
                              + "&endDate=" + dateFormat.format(endDate)
                              + "&format=.html&model="
                              + DocumentsEnum.LEDGER.getFileName();
-                Desktop.getDesktop().browse(new URI(url));
-            } catch (IOException e) {
-                log.error("Can't open browser", e);
+                DesktopUtil.browse(new URI(url));
             } catch (URISyntaxException e) {
                 log.error("Can't create news URI", e);
             }

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportViewHandler.java	2014-05-28 09:52:22 UTC (rev 3820)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportViewHandler.java	2014-05-28 11:53:32 UTC (rev 3821)
@@ -24,8 +24,6 @@
  */
 package org.chorem.lima.ui.vatreports;
 
-import java.awt.Desktop;
-import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.text.SimpleDateFormat;
@@ -42,6 +40,7 @@
 import org.chorem.lima.entity.FinancialPeriod;
 import org.chorem.lima.entity.FiscalPeriod;
 import org.chorem.lima.service.LimaServiceFactory;
+import org.nuiton.util.DesktopUtil;
 
 public class VatReportViewHandler {
     /** log. */
@@ -90,9 +89,7 @@
                              + "&endDate=" + dateFormat.format(view.getIntervalPanel().getEndDate())
                              + "&format=.pdf&model=" + DocumentsEnum.VAT.getFileName()
                              + "&autocomplete=" + view.getAutoComplete();
-                Desktop.getDesktop().browse(new URI(url));
-            } catch (IOException e) {
-                log.error("Can't open browser", e);
+                DesktopUtil.browse(new URI(url));
             } catch (URISyntaxException e) {
                 log.error("Can't create news URI", e);
             }

    

dcosse＠users.chorem.org

tags

participants (1)