WebSVN - OpenConcerto - Diff - Rev 174 and 180 - /trunk/OpenConcerto/src/org/openconcerto/openoffice/spreadsheet/MutableCell.java

  * When distributing the software, include this License Header Notice in each file.
  */
  package org.openconcerto.openoffice.spreadsheet;
+import static org.openconcerto.utils.TimeUtils.SECONDS_PER_HOUR;
+import static org.openconcerto.utils.TimeUtils.SECONDS_PER_MINUTE;
+import org.openconcerto.openoffice.LengthUnit;
 import org.openconcerto.openoffice.Log;
 import org.openconcerto.openoffice.ODDocument;
 import org.openconcerto.openoffice.ODFrame;
+import org.openconcerto.openoffice.ODPackage;
 import org.openconcerto.openoffice.ODValueType;
 import org.openconcerto.openoffice.StyleDesc;
 import org.openconcerto.openoffice.XMLVersion;
 import org.openconcerto.openoffice.spreadsheet.BytesProducer.ByteArrayProducer;
 import org.openconcerto.openoffice.spreadsheet.BytesProducer.ImageProducer;
 import org.openconcerto.utils.FileUtils;
 import org.openconcerto.utils.TimeUtils;
 import org.openconcerto.utils.TimeUtils.DurationNullsChanger;
 import org.openconcerto.utils.Tuple2;
 import org.openconcerto.utils.Tuple3;
+import org.openconcerto.utils.cache.LRUMap;
+import org.openconcerto.utils.cc.CachedTransformer;
 import java.awt.Color;
 import java.awt.Image;
 import java.awt.Point;
 import java.io.File;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
  * @author Sylvain
  * @param <D> type of document
  */
 public class MutableCell<D extends ODDocument> extends Cell<D> {
+    static private final CachedTransformer<Locale, DateFormat, RuntimeException> TextPDateFormat = new CachedTransformer<>(new LRUMap<>(20), (l) -> DateFormat.getDateInstance(DateFormat.DEFAULT, l),
+            false);
+    static private final CachedTransformer<Locale, DateFormat, RuntimeException> TextPTimeFormat = new CachedTransformer<>(new LRUMap<>(20), (l) -> DateFormat.getTimeInstance(DateFormat.DEFAULT, l),
+            false);
+    static private final CachedTransformer<Locale, NumberFormat, RuntimeException> TextPMinuteSecondFormat = new CachedTransformer<>(new LRUMap<>(20),
-    static private final DateFormat TextPDateFormat = DateFormat.getDateInstance();
+            (l) -> new DecimalFormat("00.###", DecimalFormatSymbols.getInstance(l)), false);
-    static private final DateFormat TextPTimeFormat = DateFormat.getTimeInstance();
+    static private final char TEXTP_SEP = ':';
+    // HH:mm:ss.SSS
+    static String textPDuration(final long hours, final int minutes, final BigDecimal secsAndNanos, final Locale locale) {
+        final StringBuilder res = new StringBuilder(16);
+        res.append(hours);
+        res.append(TEXTP_SEP);
-    static private final NumberFormat TextPMinuteSecondFormat = new DecimalFormat("00.###");
+        res.append(TextPMinuteSecondFormat.get(locale).format(minutes));
+        res.append(TEXTP_SEP);
+        res.append(TextPMinuteSecondFormat.get(locale).format(secsAndNanos));
+        return res.toString();
+    }
+    static String textPDuration(final java.time.Duration d, final Locale locale) {
+        // -1H is treated as 23:00 in LO
+        if (d.isNegative())
+            throw new UnsupportedOperationException("Negative duration");
+        final long seconds = d.getSeconds();
+        // from Duration.toString()
+        final long hours = seconds / SECONDS_PER_HOUR;
+        final int minutes = (int) ((seconds % SECONDS_PER_HOUR) / SECONDS_PER_MINUTE);
+        final int secs = (int) (seconds % SECONDS_PER_MINUTE);
+        final BigDecimal secsAndNanos = BigDecimal.valueOf(secs).add(BigDecimal.valueOf(d.getNano()).movePointLeft(9));
+        return textPDuration(hours, minutes, secsAndNanos, locale);
+    }
     static private boolean LO_MODE = true;
     // no date part, all time part to zero
     static private final DurationNullsChanger TIME_NULLS = new TimeUtils.DurationNullsBuilder(TimeUtils.EmptyFieldPolicy.SET_TO_ZERO).setToNull(TimeUtils.getDateFields()).build();
             this.getElement().removeAttribute(currentType.getValueAttribute(), valueNS);
+        }
         // Like LO, do not generate string-value
         if (type != null && type != ODValueType.STRING) {
             // LO cells don't support the full syntax of a duration (user meta fields do)
-            // instead it support only values without nYnMnD
+            // instead it support only values without nYnMnD (as does java.time.Duration)
-            if (type == ODValueType.TIME && getTimeValueMode()) {
+            if (type == ODValueType.TIME && getTimeValueMode() && !(val instanceof java.time.Duration)) {
                 final Duration d = val instanceof Duration ? (Duration) val : TimeUtils.timePartToDuration((Calendar) val);
                 val = TIME_NULLS.apply(getODDocument().getEpoch().normalizeToHours(d));
+            }
             this.getElement().setAttribute(type.getValueAttribute(), type.format(val), valueNS);
+        }
         obj = formatted.get2();
         if (formatted.get0() != null) {
             text = formatted.get0();
         } else {
-            // either there were no format or formatting failed
+            // either there were no format, formatting failed or wasn't attempted because the data
+            // style cannot format vt
             if (vt == ODValueType.FLOAT) {
-                text = getODDocument().getPackage().formatNumber((Number) obj, getDefaultStyle());
+                text = ODPackage.formatNumber((Number) obj, getDataLocale(), getDefaultStyle());
             } else if (vt == ODValueType.PERCENTAGE) {
-                text = getODDocument().getPackage().formatPercent((Number) obj, getDefaultStyle());
+                text = ODPackage.formatPercent((Number) obj, getDataLocale(), getDefaultStyle());
             } else if (vt == ODValueType.CURRENCY) {
-                text = getODDocument().getPackage().formatCurrency((Number) obj, getDefaultStyle());
+                text = ODPackage.formatCurrency((Number) obj, getDataLocale(), getDefaultStyle());
             } else if (vt == ODValueType.DATE) {
                 final Date d;
                 if (obj instanceof Calendar) {
                     d = ((Calendar) obj).getTime();
                 } else {
                     d = (Date) obj;
+                }
-                text = TextPDateFormat.format(d);
+                text = TextPDateFormat.get(getDataLocale()).format(d);
             } else if (vt == ODValueType.TIME) {
                 if (obj instanceof Duration) {
                     final Duration normalized = getODDocument().getEpoch().normalizeToHours((Duration) obj);
-                    text = "" + normalized.getHours() + ':' + TextPMinuteSecondFormat.format(normalized.getMinutes()) + ':' + TextPMinuteSecondFormat.format(TimeUtils.getSeconds(normalized));
+                    text = textPDuration(normalized.getHours(), normalized.getMinutes(), TimeUtils.getSeconds(normalized), getDataLocale());
+                } else if (obj instanceof java.time.Duration) {
+                    text = textPDuration((java.time.Duration) obj, getDataLocale());
                 } else {
-                    text = TextPTimeFormat.format(((Calendar) obj).getTime());
+                    text = TextPTimeFormat.get(getDataLocale()).format(((Calendar) obj).getTime());
+                }
             } else if (vt == ODValueType.BOOLEAN) {
-                Locale l = null;
-                final CellStyle s = getStyle();
-                if (s != null) {
-                    final DataStyle ds = s.getDataStyle();
-                    if (ds != null)
-                        l = ds.getLocale();
-                }
-                if (l == null)
-                    l = getODDocument().getPackage().getLocale();
-                text = BooleanStyle.toString((Boolean) obj, l, lenient);
+                text = BooleanStyle.toString((Boolean) obj, getDataLocale(), lenient);
             } else if (vt == ODValueType.STRING) {
                 text = obj.toString();
             } else {
                 throw new IllegalStateException(vt + " unknown");
+            }
+        }
         this.setValue(vt, obj, text);
+    }
+    /**
+     * The locale of the data style. NOTE this doesn't evaluate the map elements with the current
+     * cell value.
+     *
+     * @return the locale of the data style, or if none, the ODPackage locale.
+     */
+    public final Locale getDataLocale() {
+        return this.getDataLocale(false);
+    }
+    public final Locale getDataLocale(final boolean local) {
+        Locale res = null;
+        final CellStyle s = getStyle();
+        if (s != null) {
+            final DataStyle ds = s.getDataStyle();
+            if (ds != null)
+                res = ds.getLocale(local);
+        }
+        if (local || res != null)
+            return res;
+        return getODDocument().getPackage().getLocale();
+    }
+    /**
+     * Set the locale for the data style. This is different from the locale of the
+     * {@link CellStyle#getTextProperties() text properties}. Like LibreOffice, this set the
+     * attributes of the main {@link DataStyle}, and all {@link #getDataStyle() mapped} ones.
+     *
+     * @param locale the new locale, <code>null</code> to remove attributes.
+     * @throws IllegalStateException if there's no {@link DataStyle}.
+     */
+    public final void setDataLocale(final Locale locale) throws IllegalStateException {
+        final CellStyle s = getStyle();
+        if (s != null) {
+            final DataStyle ds = s.getDataStyle();
+            if (ds != null) {
+                ds.setLocale(locale);
+                // LO does this, and this avoids the need for mapped styles to have a reference to
+                // their parent.
+                for (final Element mapElem : ds.getMapChildren()) {
+                    s.getDataStyle(mapElem.getAttribute("apply-style-name", mapElem.getNamespace())).setLocale(locale);
+                }
+                return;
+            }
+        }
+        throw new IllegalStateException("No data style for " + this);
+    }
     // return null String if no data style exists, or if one exists but we couldn't use it
     private Tuple3<String, ODValueType, Object> format(Object obj, ODValueType valueType, boolean onlyCast, boolean lenient) {
         String res = null;
         try {
             final Tuple3<DataStyle, ODValueType, Object> ds = getDataStyleAndValue(obj, valueType, onlyCast);
     public final StyleTableCellProperties getTableCellProperties() {
         return this.getRow().getSheet().getTableCellPropertiesAt(this.getX(), this.getY());
+    }
+    public final ODFrame<D> addFrame(final Number x, final Number y, final Number w, final Number h, final LengthUnit unit) {
+        final Element elem = ODFrame.createEmpty(getNS(), x, y, w, h, unit);
+        this.getElement().addContent(elem);
+        return new ODFrame<>(getODDocument(), elem);
+    }
     public void setImage(final File pic) throws IOException {
         this.setImage(pic, false);
+    }
     public void setImage(final File pic, boolean keepRatio) throws IOException {
+    }
     private void setImage(final String name, final BytesProducer data) {
         final Namespace draw = this.getNS().getNS("draw");
         final Element frame = this.getElement().getChild("frame", draw);
-        final Element imageElem = frame == null ? null : frame.getChild("image", draw);
-        if (imageElem != null) {
+        if (frame != null) {
-            final Attribute refAttr = imageElem.getAttribute("href", this.getNS().getNS("xlink"));
-            this.getODDocument().getPackage().putFile(refAttr.getValue(), null);
+            new ODFrame<>(getODDocument(), frame).setImage(name, data, false);
-            if (data == null)
-                frame.detach();
-            else {
-                refAttr.setValue("Pictures/" + name + (data.getFormat() != null ? "." + data.getFormat() : ""));
-                this.getODDocument().getPackage().putFile(refAttr.getValue(), data.getBytes(new ODFrame<D>(getODDocument(), frame)));
-            }
         } else if (data != null)
-            throw new IllegalStateException("this cell doesn't contain an image: " + this);
+            throw new IllegalStateException("this cell doesn't contain a frame: " + this);
+    }
     public final void setBackgroundColor(final Color color) {
         this.getPrivateStyle().getTableCellProperties(this).setBackgroundColor(color);
+    }

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/openoffice/spreadsheet/MutableCell.java - Rev 174 → 180