stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8005391: Floating behavior of HTMLEditorKit parser

Browse Source 
Reviewed-by: malenkov, leonidr
This commit is contained in:
Alexander Shusherov 2013-10-14 18:19:19 +04:00 committed by Alexander Scherbatiy
parent 826ebc04a2
commit 5bcfa111b3
2 changed files with 68 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jdk/src/share/classes/javax/swing/text/SimpleAttributeSet.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2013, 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
@ -29,8 +29,9 @@ import java.util.Enumeration;
import java.util.Collections;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.AbstractMap;
import java.util.LinkedHashMap;
/**
* A straightforward implementation of MutableAttributeSet using a
@ -56,7 +57,7 @@ public class SimpleAttributeSet implements MutableAttributeSet, Serializable, Cl
*/
public static final AttributeSet EMPTY = new EmptyAttributeSet();
private transient Hashtable<Object, Object> table = new Hashtable<Object, Object>(3);
private transient LinkedHashMap<Object, Object> table = new LinkedHashMap<>(3);
/**
* Creates a new attribute set.
@ -73,10 +74,6 @@ public class SimpleAttributeSet implements MutableAttributeSet, Serializable, Cl
addAttributes(source);
}
private SimpleAttributeSet(Hashtable<Object, Object> table) {
this.table = table;
}
/**
* Checks whether the set of attributes is empty.
*
@ -132,7 +129,7 @@ public class SimpleAttributeSet implements MutableAttributeSet, Serializable, Cl
* @return the names as an <code>Enumeration</code>
*/
public Enumeration<?> getAttributeNames() {
return table.keys();
return Collections.enumeration(table.keySet());
}
/**
@ -278,7 +275,7 @@ public class SimpleAttributeSet implements MutableAttributeSet, Serializable, Cl
SimpleAttributeSet attr;
try {
attr = (SimpleAttributeSet) super.clone();
attr.table = (Hashtable) table.clone();
attr.table = (LinkedHashMap) table.clone();
} catch (CloneNotSupportedException cnse) {
attr = null;
}
@ -341,7 +338,7 @@ public class SimpleAttributeSet implements MutableAttributeSet, Serializable, Cl
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException {
s.defaultReadObject();
table = new Hashtable<Object, Object>(3);
table = new LinkedHashMap<>(3);
StyleContext.readAttributeSet(s, this);
}

61
jdk/test/javax/swing/text/html/8005391/bug8005391.java Normal file
View File

@ -0,0 +1,61 @@
/*
* Copyright (c) 2013, 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.
*/
import java.io.CharArrayReader;
import java.io.CharArrayWriter;
import javax.swing.text.html.HTMLDocument;
import javax.swing.text.html.HTMLEditorKit;
/**
* @test
* @bug 8005391
* @author Alexander Shusherov
* @summary Floating behavior of HTMLEditorKit parser
* @run main bug8005391
*/
public class bug8005391 {
private static final String htmlDoc = "<html><body><tt><a href='one'>1</a>2</tt></body></html>";
public static void main(String[] args) throws Exception {
int N = 10;
for (int i = 0; i < N; i++) {
HTMLEditorKit kit = new HTMLEditorKit();
Class c = Class.forName("javax.swing.text.html.parser.ParserDelegator");
HTMLEditorKit.Parser parser = (HTMLEditorKit.Parser) c.newInstance();
HTMLDocument doc = (HTMLDocument) kit.createDefaultDocument();
HTMLEditorKit.ParserCallback htmlReader = doc.getReader(0);
parser.parse(new CharArrayReader(htmlDoc.toCharArray()), htmlReader, true);
htmlReader.flush();
CharArrayWriter writer = new CharArrayWriter(1000);
kit.write(writer, doc, 0, doc.getLength());
writer.flush();
String result = writer.toString();
if (!result.contains("<tt><a")) {
throw new RuntimeException("The <a> and <tt> tags are swapped");
}
}
}
}