changeset 14052:4ac42135594d

8139215: RTFEditorKit does not save alignment Reviewed-by: alexsch
author ssadetsky
date Thu, 24 Mar 2016 20:19:26 +0300
parents 0f33319601c5
children f9abfe7b70d9
files src/java.desktop/share/classes/javax/swing/text/rtf/RTFGenerator.java test/javax/swing/text/rtf/RTFWriteParagraphAlignTest.java
diffstat 2 files changed, 152 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.desktop/share/classes/javax/swing/text/rtf/RTFGenerator.java	Thu Mar 24 20:10:52 2016 +0300
+++ b/src/java.desktop/share/classes/javax/swing/text/rtf/RTFGenerator.java	Thu Mar 24 20:19:26 2016 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -491,7 +491,10 @@
                          word.swingName(), MagicToken)) != null) {
         if (parm == MagicToken)
             parm = null;
-        word.writeValue(parm, this, true);
+        if (!word.writeValue(parm, this, true) &&
+                word instanceof RTFAttributes.AssertiveAttribute ) {
+            currentAttributes.removeAttribute(word.swingName());
+        }
     }
 }
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/javax/swing/text/rtf/RTFWriteParagraphAlignTest.java	Thu Mar 24 20:19:26 2016 +0300
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+   @bug 8139215
+   @summary RTFEditorKit does not save alignment
+   @author Semyon Sadetsky
+  */
+
+import javax.swing.*;
+import javax.swing.text.*;
+import javax.swing.text.rtf.RTFEditorKit;
+import java.awt.*;
+import java.io.*;
+
+public class RTFWriteParagraphAlignTest {
+
+    public static final String RTF_DATA[] = {
+                    "{\\rtf1\\ansi\\ansicpg1252\\" +
+                    "cocoartf949\\cocoasubrtf350" +
+                    "{\\fonttbl\\f0\\fswiss\\fcharset0 Helvetica;}" +
+                    "{\\colortbl;\\red255\\green255\\blue255;}" +
+                    "\\margl1440\\margr1440\\vieww9000\\viewh8400\\viewkind0" +
+                    "\\pard\\ql\\pardirnatural" +
+                    "\\f0\\fs24 \\cf0 left}",
+                    "{\\rtf1\\ansi\\ansicpg1252\\" +
+                    "cocoartf949\\cocoasubrtf350" +
+                    "{\\fonttbl\\f0\\fswiss\\fcharset0 Helvetica;}" +
+                    "{\\colortbl;\\red255\\green255\\blue255;}" +
+                    "\\margl1440\\margr1440\\vieww9000\\viewh8400\\viewkind0" +
+                    "\\pard\\qc\\pardirnatural" +
+                    "\\f0\\fs24 \\cf0 center}",
+                    "{\\rtf1\\ansi\\ansicpg1252\\" +
+                    "cocoartf949\\cocoasubrtf350" +
+                    "{\\fonttbl\\f0\\fswiss\\fcharset0 Helvetica;}" +
+                    "{\\colortbl;\\red255\\green255\\blue255;}" +
+                    "\\margl1440\\margr1440\\vieww9000\\viewh8400\\viewkind0" +
+                    "\\pard\\qr\\pardirnatural" +
+                    "\\f0\\fs24 \\cf0 right}",
+                    "{\\rtf1\\ansi\\ansicpg1252\\" +
+                    "cocoartf949\\cocoasubrtf350" +
+                    "{\\fonttbl\\f0\\fswiss\\fcharset0 Helvetica;}" +
+                    "{\\colortbl;\\red255\\green255\\blue255;}" +
+                    "\\margl1440\\margr1440\\vieww9000\\viewh8400\\viewkind0" +
+                    "\\pard\\qj\\pardirnatural" +
+                    "\\f0\\fs24 \\cf0 justifiedtextjustifiedtext " +
+                    "justifiedtextjustifiedtext justifiedtextjustifiedtext " +
+                    "justifiedtextjustifiedtext justifiedtextjustifiedtext }",
+    };
+    private static JFrame frame;
+    private static JTextPane jTextPane;
+    private static int position1;
+    private static int position2;
+    private static RTFEditorKit rtfEditorKit;
+    private static Robot robot;
+
+    public static void main(String[] args) throws Exception{
+        rtfEditorKit = new RTFEditorKit();
+        robot = new Robot();
+
+        SwingUtilities.invokeAndWait(() -> {
+            frame = new JFrame();
+            frame.setUndecorated(true);
+            frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+            frame.setSize(600, 200);
+            jTextPane = new JTextPane();
+            frame.getContentPane().add(jTextPane);
+            frame.setVisible(true);
+        });
+
+        test(StyleConstants.ALIGN_LEFT);
+        test(StyleConstants.ALIGN_CENTER);
+        test(StyleConstants.ALIGN_RIGHT);
+        test(StyleConstants.ALIGN_JUSTIFIED);
+
+        SwingUtilities.invokeAndWait(()->frame.dispose());
+
+        System.out.println("ok");
+    }
+
+    static void test(int align) throws Exception {
+        SwingUtilities.invokeAndWait(()->{
+            jTextPane.setDocument(rtfEditorKit.createDefaultDocument());
+            try {
+                rtfEditorKit.read(new ByteArrayInputStream(RTF_DATA[align].
+                        getBytes()), jTextPane.getDocument(), 0);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+        robot.waitForIdle();
+        SwingUtilities.invokeAndWait(()->{
+            try {
+                int endOffset = jTextPane.getDocument().getRootElements()[0].
+                        getElement(0).getEndOffset();
+                position1 = jTextPane.modelToView(endOffset - 1).x;
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+        File tempFile = File.createTempFile("aaaa", ".rtf");
+        tempFile.deleteOnExit();
+        rtfEditorKit.write(new FileOutputStream(tempFile),
+               jTextPane.getDocument(), 0, jTextPane.getDocument().getLength());
+        Document d = rtfEditorKit.createDefaultDocument();
+        rtfEditorKit.read(new FileInputStream(tempFile), d, 0);
+        SwingUtilities.invokeAndWait(() -> jTextPane.setDocument(d));
+
+        robot.waitForIdle();
+        SwingUtilities.invokeAndWait(()->{
+            try {
+                int endOffset = jTextPane.getDocument().getRootElements()[0].
+                        getElement(0).getEndOffset();
+                position2 = jTextPane.modelToView(endOffset-1).x;
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+        if (position1 != position2) {
+            throw new RuntimeException("Alignment is not preserved after the " +
+                    "document write/read");
+        }
+    }
+}