changeset 55143:2d8172254394

8219156: RTFEditorKit writes background color but doesn't read Reviewed-by: serb
author psadhukhan
date Thu, 21 Feb 2019 10:33:24 +0530
parents f12e86f1b0d6
children 2900b9f89465
files src/java.desktop/share/classes/javax/swing/text/rtf/RTFReader.java test/jdk/javax/swing/text/rtf/RTFReadBGColorTest.java
diffstat 2 files changed, 104 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.desktop/share/classes/javax/swing/text/rtf/RTFReader.java	Tue Feb 19 11:52:19 2019 +0530
+++ b/src/java.desktop/share/classes/javax/swing/text/rtf/RTFReader.java	Thu Feb 21 10:33:24 2019 +0530
@@ -1185,6 +1185,10 @@
             parserState.put(keyword, Integer.valueOf(parameter));
             return true;
         }
+        if (keyword.equals("cb")) {
+            parserState.put(keyword, Integer.valueOf(parameter));
+            return true;
+        }
 
         {
             RTFAttribute attr = straightforwardAttributes.get(keyword);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/javax/swing/text/rtf/RTFReadBGColorTest.java	Thu Feb 21 10:33:24 2019 +0530
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2019, 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
+ * @key headful
+ * @bug 8219156
+ * @summary Verify RTFEditorKit does not read background color
+ */
+
+import java.awt.Color;
+import java.awt.image.BufferedImage;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Enumeration;
+
+import javax.swing.JTextPane;
+import javax.swing.SwingUtilities;
+import javax.swing.JFrame;
+import javax.swing.text.MutableAttributeSet;
+import javax.swing.text.StyleConstants;
+import javax.swing.text.SimpleAttributeSet;
+import javax.swing.text.StyledDocument;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.rtf.RTFEditorKit;
+
+public class RTFReadBGColorTest {
+    static JTextPane text;
+    static String BGTEXT = "yellow_background\n";
+
+    public static void main(String[] a) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            JFrame f = new JFrame();
+            f.setBounds(200, 600, 400, 300);
+            f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+            text = new JTextPane();
+            text.setEditorKit(new RTFEditorKit());
+
+            MutableAttributeSet attrBackground = new SimpleAttributeSet();
+            StyleConstants.setBackground(attrBackground, Color.YELLOW);
+
+            try {
+                text.getDocument().insertString(0, BGTEXT, attrBackground);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+            write();
+            read();
+
+            f.getContentPane().add(text);
+            f.setVisible(true);
+            text.setCaretPosition(BGTEXT.length()+6);
+            StyledDocument style = text.getStyledDocument();
+            AttributeSet oldSet = style.getCharacterElement(BGTEXT.length()+6).getAttributes();
+            f.dispose();
+            if (!style.getBackground(oldSet).equals(Color.YELLOW)) {
+                throw new RuntimeException("RTFEditorKit does not read background color");
+            }
+        });
+    }
+
+    static void write() {
+        try (OutputStream o = Files.newOutputStream(Paths.get("test.rtf"))) {
+            text.getEditorKit().write(o, text.getDocument(), 0, 0);
+        } catch (Exception e2) {
+            throw new RuntimeException(e2);
+        }
+    }
+
+    static void read() {
+        try (InputStream in = Files.newInputStream(Paths.get("test.rtf"))) {
+            text.getEditorKit().read(in, text.getDocument(), 0);
+        } catch (Exception e2) {
+            throw new RuntimeException(e2);
+        }
+    }
+}
+