[Fudaa-svn-commit] SF.net SVN: fudaa:[7802] trunk/soft/fudaa-crue

[<de...@us...>]

Revision: 7802
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7802&view=rev
Author:   deniger
Date:     2012-10-24 22:27:31 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogsTopComponent.java
    trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/services/SysdocService.java
    trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/Bundle.properties

Added Paths:
-----------
    trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/services/
    trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/services/Bundle.properties

Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogsTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogsTopComponent.java	2012-10-24 22:17:46 UTC (rev 7801)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogsTopComponent.java	2012-10-24 22:27:31 UTC (rev 7802)
@@ -142,11 +142,11 @@
   }
 
   TableColumn getLinkTableColumn() {
-    return getTableColumn(DocProperty.ID);
+    return getTableColumn(DocProperty.getDefaultDisplayName());
   }
 
   TableColumn getMediaTableColumn() {
-    return getTableColumn(MultimediaDocProperty.ID);
+    return getTableColumn(MultimediaDocProperty.getDefaultDisplayName());
   }
 
   public void initForTrace(TObjectIntHashMap<String> verbosityByLevel) {
@@ -240,7 +240,7 @@
       if (record != null) {
         if (media) {
           if (record.getHelpSupportUrl() != null) {
-            sysdocContrat.displayMedia(record.getHelpUrl());
+            sysdocContrat.displayMedia(record.getHelpSupportUrl());
           }
 
         } else if (record.getHelpUrl() != null) {

Modified: trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/services/SysdocService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/services/SysdocService.java	2012-10-24 22:17:46 UTC (rev 7801)
+++ trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/services/SysdocService.java	2012-10-24 22:27:31 UTC (rev 7802)
@@ -7,6 +7,8 @@
 import java.awt.Desktop;
 import java.io.File;
 import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.fudaa.ctulu.CtuluLibFile;
 import org.fudaa.dodico.crue.metier.emh.EMH;
 import org.fudaa.fudaa.crue.common.helper.DialogHelper;
@@ -29,13 +31,13 @@
   @ServiceProvider(service = SysdocService.class),
   @ServiceProvider(service = SysdocContrat.class)})
 public class SysdocService implements SysdocContrat {
-  
+
   private ConfigurationManagerService configurationManagerService = Lookup.getDefault().lookup(ConfigurationManagerService.class);
-  
+
   @Override
   public void displayHelp(EMH emh) {
   }
-  
+
   @Override
   public void display(String path) {
     SysdocTopComponent findTopComponent = (SysdocTopComponent) WindowManager.getDefault().findTopComponent(SysdocTopComponent.TOPCOMPONENT_ID);
@@ -45,7 +47,7 @@
     }
     findTopComponent.requestActive();
   }
-  
+
   @Override
   public void displayMedia(String helpUrl) {
     File sysdocLocaleDir = getSysdocLocalizedDir();
@@ -56,10 +58,10 @@
     try {
       Desktop.getDesktop().open(target);
     } catch (IOException ex) {
-      Exceptions.printStackTrace(ex);
+      Logger.getLogger(SysdocService.class.getName()).log(Level.WARNING, "message {0}", ex);
     }
   }
-  
+
   public File getSysdocLocalizedDir() {
     File sysdocBaseDir = new File(configurationManagerService.getCoeurManager().getSiteDir(), "sysdoc");
     String local = configurationManagerService.getCurrentLocale();

Modified: trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/Bundle.properties	2012-10-24 22:17:46 UTC (rev 7801)
+++ trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/Bundle.properties	2012-10-24 22:27:31 UTC (rev 7802)
@@ -18,4 +18,3 @@
 Sysdoc.SearchTooltip=Rechercher
 searchTextField.Tooltip=<html><body>Utiliser * pour inclure les mots contenants l'\u00e9l\u00e9ment de recheche.<br>Appuyer sur entr\u00e9e pour lancer la recherche</body></html>
 SearchResultat.Accuracy=Pertinence: {0} %
-Sysdoc.DisplayMediaNotFound=Le m\u00e9dia n''est pas trouv\u00e9. Chemin: {0}

Copied: trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/services/Bundle.properties (from rev 7801, trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/Bundle.properties)
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/services/Bundle.properties	                        (rev 0)
+++ trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/services/Bundle.properties	2012-10-24 22:27:31 UTC (rev 7802)
@@ -0,0 +1 @@
+Sysdoc.DisplayMediaNotFound=Le m\u00e9dia n''est pas trouv\u00e9. Chemin: {0}

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