[Fudaa-svn-commit] SF.net SVN: fudaa:[9057] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv/PivImplementation.java

[<bma...@us...>]

Revision: 9057
          http://sourceforge.net/p/fudaa/svn/9057
Author:   bmarchan
Date:     2015-03-09 14:17:01 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
Fix : Pb de chemin de la doc

Modified Paths:
--------------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java	2015-03-09 13:33:08 UTC (rev 9056)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java	2015-03-09 14:17:01 UTC (rev 9057)
@@ -83,7 +83,7 @@
   protected static BuInformationsSoftware isPIV_ = new BuInformationsSoftware();
   static {
     isPIV_.name = "LSPIV";
-    isPIV_.version = "1.4.1";
+    isPIV_.version = "1.4.2";
     isPIV_.date = "2015-02-24";
     isPIV_.rights = PivResource.getS("Tous droits r\xE9serv\xE9s")+". CETMEF (c)1999-2015";
     isPIV_.license = "GPL2";
@@ -91,7 +91,7 @@
     isPIV_.authors=new String[]{"B.Marchand (mar...@de...)"};
     isPIV_.contact="mag...@ed...\nje...@ir...\nal...@ed...";
     isPIV_.http="http://forge.irstea.fr/projects/fudaa-lspiv";
-    isPIV_.man="doc/guide_Fudaa-lspiv_v0.pdf";
+    isPIV_.man="guide_Fudaa-lspiv.pdf";
     isPIV_.citation=PivResource.getS("Ichiro Fujita (Prof.), Universit\xE9 de Kob\xE9");
 
     isPIV_.logo = PivResource.PIV.getIcon("iconepiv.gif");
@@ -321,7 +321,8 @@
    * Affiche la documentation depuis un fichier externe (pdf, html, ...)
    */
   private void showHelp() {
-    File manFile=new File(getInformationsSoftware().man);
+    String docPath=System.getProperty(PivPreferences.PIV_DOC_PATH,System.getProperty("user.dir")+"/doc");
+    File manFile=new File(docPath,getInformationsSoftware().man);
     FuLog.trace("Affichage de la doc depuis "+manFile.getAbsolutePath());
     
     try {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.