From 1dbae5e7cfe20f40e2881e1b77c78447ea85328b Mon Sep 17 00:00:00 2001 From: Pavel Porvatov Date: Mon, 29 Aug 2011 16:25:04 +0400 Subject: [PATCH] 7030332: Default borders in tables looks incorrect JEditorPane Reviewed-by: peterz --- .../classes/javax/swing/text/html/CSS.java | 52 ++++++---- .../javax/swing/text/html/TableView.java | 6 +- .../html/TableView/7030332/bug7030332.html | 12 +++ .../html/TableView/7030332/bug7030332.java | 98 ++++++++++++++++++ .../text/html/TableView/7030332/sample0.png | Bin 0 -> 696 bytes .../text/html/TableView/7030332/sample1.png | Bin 0 -> 696 bytes .../text/html/TableView/7030332/sample2.png | Bin 0 -> 696 bytes .../text/html/TableView/7030332/sample3.png | Bin 0 -> 660 bytes .../text/html/TableView/7030332/sample4.png | Bin 0 -> 660 bytes 9 files changed, 145 insertions(+), 23 deletions(-) create mode 100644 jdk/test/javax/swing/text/html/TableView/7030332/bug7030332.html create mode 100644 jdk/test/javax/swing/text/html/TableView/7030332/bug7030332.java create mode 100644 jdk/test/javax/swing/text/html/TableView/7030332/sample0.png create mode 100644 jdk/test/javax/swing/text/html/TableView/7030332/sample1.png create mode 100644 jdk/test/javax/swing/text/html/TableView/7030332/sample2.png create mode 100644 jdk/test/javax/swing/text/html/TableView/7030332/sample3.png create mode 100644 jdk/test/javax/swing/text/html/TableView/7030332/sample4.png diff --git a/jdk/src/share/classes/javax/swing/text/html/CSS.java b/jdk/src/share/classes/javax/swing/text/html/CSS.java index 60efa6cc013..f0f8cb2de11 100644 --- a/jdk/src/share/classes/javax/swing/text/html/CSS.java +++ b/jdk/src/share/classes/javax/swing/text/html/CSS.java @@ -806,15 +806,11 @@ public class CSS implements Serializable { // translate border width into the cells, if it has non-zero value. AttributeSet tableAttr = elem.getParentElement(). getParentElement().getAttributes(); - int borderWidth; - try { - borderWidth = Integer.parseInt( - (String) tableAttr.getAttribute(HTML.Attribute.BORDER)); - } catch (NumberFormatException e) { - borderWidth = 0; - } + + int borderWidth = getTableBorder(tableAttr); if (borderWidth > 0) { - translateAttribute(HTML.Attribute.BORDER, tableAttr, cssAttrSet); + // If table contains the BORDER attribute cells should have border width equals 1 + translateAttribute(HTML.Attribute.BORDER, "1", cssAttrSet); } String pad = (String)tableAttr.getAttribute(HTML.Attribute.CELLPADDING); if (pad != null) { @@ -850,6 +846,21 @@ public class CSS implements Serializable { return cssAttrSet; } + private static int getTableBorder(AttributeSet tableAttr) { + String borderValue = (String) tableAttr.getAttribute(HTML.Attribute.BORDER); + + if (borderValue == HTML.NULL_ATTRIBUTE_VALUE || "".equals(borderValue)) { + // Some browsers accept and
with the same semantics as BORDER=1 + return 1; + } + + try { + return Integer.parseInt(borderValue); + } catch (NumberFormatException e) { + return 0; + } + } + private static final Hashtable attributeMap = new Hashtable(); private static final Hashtable valueMap = new Hashtable(); @@ -1400,17 +1411,20 @@ public class CSS implements Serializable { } } } else { - - /* - * The html size attribute has a mapping in the CSS world only - * if it is par of a font or base font tag. - */ - if (key == HTML.Attribute.SIZE && !isHTMLFontTag(tag)) { - continue; - } + /* + * The html size attribute has a mapping in the CSS world only + * if it is par of a font or base font tag. + */ + } else if (tag == HTML.Tag.TABLE && key == HTML.Attribute.BORDER) { + int borderWidth = getTableBorder(htmlAttrSet); - translateAttribute(key, htmlAttrSet, cssAttrSet); + if (borderWidth > 0) { + translateAttribute(HTML.Attribute.BORDER, Integer.toString(borderWidth), cssAttrSet); + } + } else { + translateAttribute(key, (String) htmlAttrSet.getAttribute(key), cssAttrSet); + } } } else if (name instanceof CSS.Attribute) { cssAttrSet.addAttribute(name, htmlAttrSet.getAttribute(name)); @@ -1419,7 +1433,7 @@ public class CSS implements Serializable { } private void translateAttribute(HTML.Attribute key, - AttributeSet htmlAttrSet, + String htmlAttrValue, MutableAttributeSet cssAttrSet) { /* * In the case of all remaining HTML.Attribute's they @@ -1427,8 +1441,6 @@ public class CSS implements Serializable { */ CSS.Attribute[] cssAttrList = getCssAttribute(key); - String htmlAttrValue = (String)htmlAttrSet.getAttribute(key); - if (cssAttrList == null || htmlAttrValue == null) { return; } diff --git a/jdk/src/share/classes/javax/swing/text/html/TableView.java b/jdk/src/share/classes/javax/swing/text/html/TableView.java index a941fbdfa78..65f4fc01ae2 100644 --- a/jdk/src/share/classes/javax/swing/text/html/TableView.java +++ b/jdk/src/share/classes/javax/swing/text/html/TableView.java @@ -242,7 +242,8 @@ import javax.swing.text.*; if (lv != null) { cellSpacing = (int) lv.getValue(); } else { - cellSpacing = 0; + // Default cell spacing equals 2 + cellSpacing = 2; } lv = (CSS.LengthValue) attr.getAttribute(CSS.Attribute.BORDER_TOP_WIDTH); @@ -251,8 +252,7 @@ import javax.swing.text.*; } else { borderWidth = 0; } - - } + } } /** diff --git a/jdk/test/javax/swing/text/html/TableView/7030332/bug7030332.html b/jdk/test/javax/swing/text/html/TableView/7030332/bug7030332.html new file mode 100644 index 00000000000..9a62f793008 --- /dev/null +++ b/jdk/test/javax/swing/text/html/TableView/7030332/bug7030332.html @@ -0,0 +1,12 @@ + + + + +Compare Golden Images with rendered JEditorPane. +They should looks simalar in each line. Pay attention to: + +1. Border width around tables +2. Border width around cells + + + diff --git a/jdk/test/javax/swing/text/html/TableView/7030332/bug7030332.java b/jdk/test/javax/swing/text/html/TableView/7030332/bug7030332.java new file mode 100644 index 00000000000..7038edb2465 --- /dev/null +++ b/jdk/test/javax/swing/text/html/TableView/7030332/bug7030332.java @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2011, 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 7030332 + @summary Default borders in tables looks incorrect JEditorPane + @author Pavel Porvatov + * @run applet/manual=yesno bug7030332.html +*/ + +import javax.swing.*; +import java.awt.*; +import java.net.URL; + +public class bug7030332 extends JApplet { + public static final String[] HTML_SAMPLES = new String[]{ + "
Column1Column2
", + "
Column1Column2
", + "
Column1Column2
", + "
Column1Column2
", + }; + + public static void main(String[] args) throws Exception { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + JFrame frame = new JFrame(); + + frame.setContentPane(createContentPane()); + frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + frame.setSize(600, 400); + frame.setLocationRelativeTo(null); + + frame.setVisible(true); + + } + }); + } + + public void init() { + try { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + setContentPane(createContentPane()); + } + }); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + private static Container createContentPane() { + JPanel result = new JPanel(new GridLayout(HTML_SAMPLES.length + 1, 3, 10, 10)); + + result.add(new JLabel("Html code")); + result.add(new JLabel("Golden image")); + result.add(new JLabel("JEditorPane")); + + for (int i = 0; i < HTML_SAMPLES.length; i++) { + String htmlSample = HTML_SAMPLES[i]; + + JTextArea textArea = new JTextArea(htmlSample); + + textArea.setLineWrap(true); + + result.add(textArea); + + String imageName = "sample" + i + ".png"; + URL resource = bug7030332.class.getResource(imageName); + + result.add(resource == null ? new JLabel(imageName + " not found") : + new JLabel(new ImageIcon(resource), SwingConstants.LEFT)); + + result.add(new JEditorPane("text/html", htmlSample)); + } + + return result; + } +} diff --git a/jdk/test/javax/swing/text/html/TableView/7030332/sample0.png b/jdk/test/javax/swing/text/html/TableView/7030332/sample0.png new file mode 100644 index 0000000000000000000000000000000000000000..e18c9bb2362511e0416bb57c09f9d6f821ed54b3 GIT binary patch literal 696 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