This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit 92ad8c52571e810cae1de7393c2fbfa7ef25e3c2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 23 19:09:22 2014 +0100 Ne pas formatter les petits nombres decimaux en notation scientifique --- .../jaxx/widgets/editor/number/NumberEditor2.jaxx | 1 - .../editor/number/NumberEditor2Handler.java | 51 ++++++++++++++++------ 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2.jaxx index 852acc1..a8f3bc6 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2.jaxx +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2.jaxx @@ -91,7 +91,6 @@ public void setToolTipText(String toolTipText) { onPopupMenuWillBecomeVisible='showPopUpButton.setSelected(true)' onPopupMenuWillBecomeInvisible='showPopUpButton.setSelected(false)' onPopupMenuCanceled='showPopUpButton.setSelected(false)'> - <!--<style source='NumberEditorPopup.css'/>--> <JPanel id='popupPanel' layout='{new GridLayout(4,4)}'> <JButton id='number7Button' styleClass='digit' onActionPerformed="handler.addChar('7')"/> diff --git a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Handler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Handler.java index 55e4e8e..ae04ff7 100644 --- a/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Handler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/number/NumberEditor2Handler.java @@ -22,6 +22,7 @@ import java.beans.PropertyChangeListener; import java.lang.reflect.Method; import java.math.BigDecimal; import java.math.BigInteger; +import java.text.DecimalFormat; import java.util.HashMap; import java.util.Map; import java.util.regex.Matcher; @@ -452,17 +453,7 @@ public class NumberEditor2Handler implements UIHandler<NumberEditor2> { return; } - String textValue; - - if (numberValue == null) { - - textValue = numberParserFormatter.format(numberValue); - - } else { - - textValue = String.valueOf(numberValue); - - } + String textValue = numberParserFormatter.format(numberValue); if (log.isInfoEnabled()) { log.info("Set textValue " + textValue + " from numberValue " + numberValue); @@ -572,9 +563,26 @@ public class NumberEditor2Handler implements UIHandler<NumberEditor2> { numberFactories.put(Integer.class, integerSupport); NumberParserFormatter<Float> floatSupport = new NumberParserFormatter<Float>() { + + final DecimalFormat df = new DecimalFormat("#.######################"); + @Override public String format(Float numberValue) { - return numberValue == null ? "" : String.valueOf(numberValue); + String format; + if (numberValue == null) { + format = ""; + } else { + format = String.valueOf(numberValue); + if (format.contains("E")) { + + format = df.format(numberValue); + if (format.contains(",")) { + format = format.replace(",", "."); + } + + } + } + return format; } @Override @@ -586,9 +594,26 @@ public class NumberEditor2Handler implements UIHandler<NumberEditor2> { numberFactories.put(Float.class, floatSupport); NumberParserFormatter<Double> doubleSupport = new NumberParserFormatter<Double>() { + + final DecimalFormat df = new DecimalFormat("#.######################"); + @Override public String format(Double numberValue) { - return numberValue == null ? "" : String.valueOf(numberValue); + String format; + if (numberValue == null) { + format = ""; + } else { + format = String.valueOf(numberValue); + if (format.contains("E")) { + + format = df.format(numberValue); + if (format.contains(",")) { + format = format.replace(",", "."); + } + + } + } + return format; } @Override -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.