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

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

Revision: 8427
          http://sourceforge.net/p/fudaa/svn/8427
Author:   deniger
Date:     2013-06-28 06:07:56 +0000 (Fri, 28 Jun 2013)
Log Message:
-----------
correction bug divers

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/cr/CrueLogTranslator.java
    trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/cr/LienMultimedia.java
    trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/MessageProperty.java

Added Paths:
-----------
    trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/HtmlReadEditorSupport.java

Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/cr/CrueLogTranslator.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/cr/CrueLogTranslator.java	2013-06-27 13:45:30 UTC (rev 8426)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/cr/CrueLogTranslator.java	2013-06-28 06:07:56 UTC (rev 8427)
@@ -79,7 +79,7 @@
         LienMultimedia multimedia = liensMultimediaById.get(id);
         if (multimedia != null) {
           String href = multimedia.getHRef();
-          String signet = doc.getSignet();
+          String signet = multimedia.getSignet();
           if (StringUtils.isNotBlank(signet)) {
             href = href + LienDocumentation.SIGNET_SEPARATOR + signet;
           }

Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/cr/LienMultimedia.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/cr/LienMultimedia.java	2013-06-27 13:45:30 UTC (rev 8426)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/cr/LienMultimedia.java	2013-06-28 06:07:56 UTC (rev 8427)
@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package org.fudaa.dodico.crue.config.cr;
 
 /**

Added: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/HtmlReadEditorSupport.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/HtmlReadEditorSupport.java	                        (rev 0)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/HtmlReadEditorSupport.java	2013-06-28 06:07:56 UTC (rev 8427)
@@ -0,0 +1,47 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.crue.common.editor;
+
+import com.memoire.bu.BuBorders;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.beans.PropertyEditor;
+import java.beans.PropertyEditorSupport;
+import javax.swing.JEditorPane;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.text.html.HTMLEditorKit;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class HtmlReadEditorSupport extends PropertyEditorSupport {
+
+  private final String html;
+
+  public HtmlReadEditorSupport(String html) {
+    this.html = html;
+  }
+
+  @Override
+  public Component getCustomEditor() {
+    final JEditorPane pane = new JEditorPane();
+    pane.setOpaque(false);
+    pane.setEditable(false);
+    pane.setEditorKit(new HTMLEditorKit());
+    pane.setText(html);
+    pane.setEditable(false);
+    JPanel pn = new JPanel(new BorderLayout());
+    pn.add(new JScrollPane(pane));
+    pn.setBorder(BuBorders.EMPTY3333);
+    return pn;
+  }
+
+  @Override
+  public boolean supportsCustomEditor() {
+    return true;
+  }
+}

Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/MessageProperty.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/MessageProperty.java	2013-06-27 13:45:30 UTC (rev 8426)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/MessageProperty.java	2013-06-28 06:07:56 UTC (rev 8427)
@@ -4,8 +4,11 @@
  */
 package org.fudaa.fudaa.crue.common.log.property;
 
+import java.beans.PropertyEditor;
 import java.lang.reflect.InvocationTargetException;
+import org.apache.commons.lang.StringUtils;
 import org.fudaa.ctulu.CtuluLogRecord;
+import org.fudaa.fudaa.crue.common.editor.HtmlReadEditorSupport;
 import org.openide.nodes.PropertySupport;
 import org.openide.util.NbBundle;
 
@@ -17,19 +20,27 @@
 
   public static final String ID = "Message";
   private final CtuluLogRecord record;
+  String html;
 
   public MessageProperty(CtuluLogRecord record) {
     super(ID, String.class, getDefaultDisplayName(),
-          getDescription());
+            getDescription());
     this.record = record;
-//    PropertyCrueUtils.configureNoCustomEditor(this);
+    String msg = record.getLocalizedMessage();
+    html = msg;
+    if (msg.contains("\\n")) {
+      html = "<html><body>" + StringUtils.replace(msg, "\\n", "<br>") + "</body></html>";
+      setValue("htmlDisplayValue", html);
+
+    }
+
   }
 
   public static String getDescription() {
     return NbBundle.getMessage(MessageProperty.class, "MessagePropertyDescription");
   }
-  
-   public static PropertyColumnFilterable createColumn() {
+
+  public static PropertyColumnFilterable createColumn() {
     PropertyColumnFilterable res = new PropertyColumnFilterable();
     res.setColumnId(ID);
     res.setDescription(getDescription());
@@ -42,12 +53,22 @@
   }
 
   @Override
+  public String getHtmlDisplayName() {
+    return html;
+  }
+
+  @Override
   public String toString() {
     return record.getLocalizedMessage();
   }
 
   @Override
   public String getValue() throws IllegalAccessException, InvocationTargetException {
-    return toString();
+    return html;
   }
+
+  @Override
+  public PropertyEditor getPropertyEditor() {
+    return new HtmlReadEditorSupport(html);
+  }
 }

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