WebSVN - OpenConcerto - Diff - Rev 174 and 180 - /trunk/OpenConcerto/src/org/openconcerto/openoffice/style/data/DataStyle.java

 import org.openconcerto.openoffice.Log;
 import org.openconcerto.openoffice.ODEpoch;
 import org.openconcerto.openoffice.ODPackage;
 import org.openconcerto.openoffice.ODValueType;
+import org.openconcerto.openoffice.OOUtils;
 import org.openconcerto.openoffice.Style;
 import org.openconcerto.openoffice.StyleDesc;
 import org.openconcerto.openoffice.StyleProperties;
 import org.openconcerto.openoffice.XMLVersion;
 import org.openconcerto.openoffice.spreadsheet.CellStyle;
     private static final int DEFAULT_GROUPING_SIZE = new DecimalFormat().getGroupingSize();
     // 15 as of LibreOffice 6, was 10 earlier
     /**
      * The default number of decimal digits if neither defined in the style nor in default-style.
      */
-    public static final int DEFAULT_DECIMAL_PLACES = Integer.parseInt(System.getProperty("openDocument.defaultDecimalPlaces", "15"));
+    public static final int DEFAULT_DECIMAL_PLACES;
     private static final Pattern QUOTE_PATRN = Pattern.compile("'", Pattern.LITERAL);
     private static final Pattern EXP_PATTERN = Pattern.compile("E(\\d+)$");
     public static int getDecimalPlaces(final CellStyle defaultStyle) {
         if (defaultStyle != null) {
-            return defaultStyle.getTableCellProperties(null).getDecimalPlaces();
+            final int res = defaultStyle.getTableCellProperties(null).getDecimalPlaces();
+            // Ignore invalid value
+            return res < 0 ? DEFAULT_DECIMAL_PLACES : res;
         } else {
             return DEFAULT_DECIMAL_PLACES;
+        }
+    }
+    protected static final int parsePositive(final String attr, final boolean lenient) {
+        final int res = Integer.parseInt(attr);
+        if (res < 0) {
+            reportError("Negative value for " + attr, lenient);
+            return 0;
+        }
+        return res;
+    }
     public static void addStringLiteral(final StringBuilder formatSB, final String s) {
         formatSB.append('\'');
         formatSB.append(QUOTE_PATRN.matcher(s).replaceAll("''"));
         formatSB.append('\'');
+    }
         l.add(DateStyle.class);
         l.add(TimeStyle.class);
         l.add(BooleanStyle.class);
         DATA_STYLES = Collections.unmodifiableSet(l);
         assert DATA_STYLES_DESCS.length == DATA_STYLES.size() : "Discrepancy between classes and descs";
+        final String decPlacesProp = System.getProperty("openDocument.defaultDecimalPlaces");
+        final int decPlacesParsed = decPlacesProp == null ? -1 : Integer.parseInt(decPlacesProp);
+        // Ignore invalid value
+        DEFAULT_DECIMAL_PLACES = decPlacesParsed < 0 ? 15 : decPlacesParsed;
+        assert DEFAULT_DECIMAL_PLACES >= 0;
+    }
     public static abstract class DataStyleDesc<S extends DataStyle> extends StyleDesc<S> {
         protected DataStyleDesc(Class<S> clazz, XMLVersion version, String elemName, String baseName) {
         else
             throw new UnsupportedOperationException(msg);
+    }
     public final Locale getLocale() {
-        return this.getLocale(this.getElement());
+        return this.getLocale(false);
+    }
-    protected final Locale getLocale(final Element elem) {
+    public final Locale getLocale(final boolean local) {
-        final Locale res = DateStyle.getElementLocale(elem);
-        return res != null ? res : this.getPackage().getLocale();
+        return this.getLocale(this.getElement(), local);
+    }
-    protected final String formatNumberOrScientificNumber(final Element elem, final Number n, CellStyle defaultStyle) {
+    protected final Locale getLocale(final Element elem, final boolean local) {
+        final Locale res = OOUtils.getElementLocale(elem);
-        return this.formatNumberOrScientificNumber(elem, n, 1, defaultStyle);
+        return local || res != null ? res : this.getPackage().getLocale();
+    }
+    public final void setLocale(final Locale l) {
+        OOUtils.setElementLocale(this.getElement(), this.getElement().getNamespace(), l);
+    }
+    @SuppressWarnings("unchecked")
+    public final List<Element> getMapChildren() {
+        return this.getElement().getChildren("map", getSTYLE());
+    }
+    protected final String formatNumberOrScientificNumber(final Element elem, final Number n, CellStyle defaultStyle, final boolean lenient) {
+        return this.formatNumberOrScientificNumber(elem, n, 1, defaultStyle, lenient);
+    }
-    protected final String formatNumberOrScientificNumber(final Element elem, final Number n, final int multiplier, CellStyle defaultStyle) {
+    protected final String formatNumberOrScientificNumber(final Element elem, final Number n, final int multiplier, CellStyle defaultStyle, final boolean lenient) {
         final Namespace numberNS = this.getElement().getNamespace();
         final StringBuilder numberSB = new StringBuilder();
         final List<?> embeddedTexts = elem.getChildren("embedded-text", numberNS);
         final SortedMap<Integer, String> embeddedTextByPosition = new TreeMap<Integer, String>(Collections.reverseOrder());
             for (int i = 0; i < minIntDig; i++)
                 numberSB.append('0');
+        }
         // e.g. if it's "--", 12,3 is displayed "12,3" and 12 is displayed "12,--"
+        // From v1.3 §19.356.2 decimal-replacement can be empty
-        final String decReplacement = elem.getAttributeValue("decimal-replacement", numberNS);
+        final String decReplacement = elem.getAttributeValue("decimal-replacement", numberNS, "");
         final boolean decSeparatorAlwaysShown;
-        if (decReplacement != null && !NumberUtils.hasFractionalPart(n)) {
+        if (!decReplacement.isEmpty() && !NumberUtils.hasFractionalPart(n)) {
             decSeparatorAlwaysShown = true;
             numberSB.append('.');
             // escape quote in replacement
             addStringLiteral(numberSB, decReplacement);
         } else {
             decSeparatorAlwaysShown = false;
             // see 19.343.2
-            final Attribute decPlacesAttr = elem.getAttribute("decimal-places", numberNS);
+            final String decPlacesAttr = elem.getAttributeValue("decimal-places", numberNS, "");
+            final String minDecPlacesAttr = elem.getAttributeValue("min-decimal-places", numberNS, "");
-            final int decPlaces;
+            final int forcedPlaces, nonZeroPlaces;
-            final char decChar;
+            if (!decPlacesAttr.isEmpty()) {
+                final int decPlaces = parsePositive(decPlacesAttr, lenient);
-            if (decPlacesAttr != null) {
+                if (minDecPlacesAttr.isEmpty()) {
+                    forcedPlaces = decPlaces;
+                    nonZeroPlaces = 0;
-                decChar = '0';
+                } else {
-                decPlaces = Integer.parseInt(decPlacesAttr.getValue());
+                    forcedPlaces = parsePositive(minDecPlacesAttr, lenient);
+                    if (forcedPlaces > decPlaces) {
+                        DataStyle.reportError("min-decimal-places greater than decimal-places : " + minDecPlacesAttr + " > " + decPlacesAttr, lenient);
+                        nonZeroPlaces = 0;
+                    } else {
+                        nonZeroPlaces = decPlaces - forcedPlaces;
+                    }
+                }
             } else {
                 // default style specifies the maximum
-                decChar = '#';
+                forcedPlaces = 0;
-                decPlaces = getDecimalPlaces(defaultStyle);
+                nonZeroPlaces = getDecimalPlaces(defaultStyle);
+            }
-            if (decPlaces > 0) {
+            if (forcedPlaces + nonZeroPlaces > 0) {
                 numberSB.append('.');
-                for (int i = 0; i < decPlaces; i++)
+                for (int i = 0; i < forcedPlaces; i++)
+                    numberSB.append('0');
+                for (int i = 0; i < nonZeroPlaces; i++)
-                    numberSB.append(decChar);
+                    numberSB.append('#');
+            }
+        }
         final Attribute minExpAttr = elem.getAttribute("min-exponent-digits", numberNS);
+        final boolean forcedExpSign;
         if (minExpAttr != null) {
+            forcedExpSign = Boolean.parseBoolean(elem.getAttributeValue("forced-exponent-sign", numberNS, "true"));
             numberSB.append('E');
             for (int i = 0; i < Integer.parseInt(minExpAttr.getValue()); i++)
                 numberSB.append('0');
+        } else {
+            forcedExpSign = false;
+        }
         final DecimalFormatSymbols symbols = new DecimalFormatSymbols(this.getLocale());
         final DecimalFormat decFormat = new DecimalFormat(numberSB.toString(), symbols);
         decFormat.setGroupingUsed(grouping);
         // needed since the default size is overwritten by the pattern
         decFormat.setGroupingSize(DEFAULT_GROUPING_SIZE);
         decFormat.setDecimalSeparatorAlwaysShown(decSeparatorAlwaysShown);
         String res = decFormat.format(NumberUtils.divide(n, factor));
-        // java only puts the minus sign, OO also puts the plus sign
+        // There's no way to force the plus sign in DecimalFormat
-        if (minExpAttr != null) {
+        if (forcedExpSign) {
             final Matcher m = EXP_PATTERN.matcher(res);
             if (m.find())
                 res = res.substring(0, m.start()) + "E+" + m.group(1);
+        }
         if (embeddedTextByPosition.size() > 0) {

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/openoffice/style/data/DataStyle.java - Rev 174 → 180