Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7701] trunk/framework
|
From: <de...@us...> - 2012-10-04 12:55:19
|
Revision: 7701
http://fudaa.svn.sourceforge.net/fudaa/?rev=7701&view=rev
Author: deniger
Date: 2012-10-04 12:55:12 +0000 (Thu, 04 Oct 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java
Added Paths:
-----------
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbeCellRenderer.java
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java 2012-10-04 06:22:43 UTC (rev 7700)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java 2012-10-04 12:55:12 UTC (rev 7701)
@@ -12,7 +12,6 @@
* Formateur par defaut pour les logs
*/
public final static CtuluDefaultLogFormatter DEFAULT = new CtuluDefaultLogFormatter();
-
private boolean printLevel = true;
public CtuluDefaultLogFormatter(boolean printLevel) {
@@ -103,6 +102,28 @@
return res.toString();
}
+ public static String asHtml(final CtuluLog log) {
+ return asHtml(log.getRecords(), log.getDefaultResourceBundle());
+
+ }
+
+ public static String asHtml(final Collection<CtuluLogRecord> logs, ResourceBundle resourceBundle) {
+ if (logs == null) {
+ return CtuluLibString.EMPTY_STRING;
+ }
+ final StringBuilder res = new StringBuilder(10 + logs.size() * 40);
+ res.append("<html><body>");
+ boolean first = true;
+ for (final CtuluLogRecord logRecord : logs) {
+ if (!first) {
+ res.append("<br>");
+ }
+ first = false;
+ res.append(DEFAULT.formatMessage(logRecord, resourceBundle));
+ }
+ return res.toString();
+ }
+
@Override
public synchronized String format(final LogRecord record) {
final StringBuilder sb = new StringBuilder(256);
Added: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbeCellRenderer.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbeCellRenderer.java (rev 0)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbeCellRenderer.java 2012-10-04 12:55:12 UTC (rev 7701)
@@ -0,0 +1,30 @@
+/*
+ GPL 2
+ */
+package org.fudaa.ebli.courbe;
+
+import org.fudaa.ctulu.gui.CtuluCellTextRenderer;
+
+/**
+ * Renderer qui affiche la courbe sous forme de sa courbe miniature et son libell\xE9 \xE0 cot\xE9
+ *
+ * @author Adrien Hadoux
+ */
+@SuppressWarnings(value = "serial")
+public class EGCourbeCellRenderer extends CtuluCellTextRenderer {
+ // ne pas refaire le travail !!!!!!!
+ private final EGIconForCourbe icon_ = new EGIconForCourbe();
+
+ public EGCourbeCellRenderer() {
+ }
+
+ @Override
+ protected void setValue(final Object _value) {
+ final EGCourbe cb = (EGCourbe) _value;
+ icon_.updateFromCourbe(cb);
+ setIcon(icon_);
+ setText(cb.getTitle());
+ setOpaque(true);
+ }
+
+}
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java 2012-10-04 06:22:43 UTC (rev 7700)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java 2012-10-04 12:55:12 UTC (rev 7701)
@@ -71,29 +71,6 @@
public void axeAspectChanged(final EGAxe c) {
}
}
-
- /**
- * Renderer qui affiche la courbe sous forme de sa courbe miniature et son libell\xE9 \xE0 cot\xE9
- *
- * @author Adrien Hadoux
- */
- @SuppressWarnings("serial")
- private static class LegendeRenderer extends CtuluCellTextRenderer { // ne pas refaire le travail !!!!!!!
-
- private final EGIconForCourbe icon_ = new EGIconForCourbe();
-
- public LegendeRenderer() {
- }
-
- @Override
- protected void setValue(final Object _value) {
- final EGCourbe cb = (EGCourbe) _value;
- icon_.updateFromCourbe(cb);
- setIcon(icon_);
- setText(cb.getTitle());
- setOpaque(true);
- }
- }
class CustomDefaultListModel extends DefaultListModel {
@@ -258,7 +235,7 @@
}
}
list_.setModel(model_);
- list_.setCellRenderer(new LegendeRenderer());
+ list_.setCellRenderer(new EGCourbeCellRenderer());
list_.getSelectionModel().addListSelectionListener(this);
list_.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
