提交 9dcc82ce 编写于 作者: A alexp

6771547: SynthParser throws StringIndexOutOfBoundsException parsing custom ColorTypes

Reviewed-by: rupashka
上级 1c8702bd
...@@ -658,8 +658,7 @@ class SynthParser extends DefaultHandler { ...@@ -658,8 +658,7 @@ class SynthParser extends DefaultHandler {
} }
try { try {
_colorTypes.add((ColorType)checkCast(typeClass. _colorTypes.add((ColorType)checkCast(typeClass.
getField(typeName.substring(classIndex, getField(typeName.substring(classIndex)).
typeName.length() - classIndex)).
get(typeClass), ColorType.class)); get(typeClass), ColorType.class));
} catch (NoSuchFieldException nsfe) { } catch (NoSuchFieldException nsfe) {
throw new SAXException("Unable to find color type: " + throw new SAXException("Unable to find color type: " +
......
/*
* Copyright (c) 2010, 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 6771547
* @author Alexander Potochkin
* @summary SynthParser throws StringIndexOutOfBoundsException parsing custom ColorTypes
*/
import javax.swing.plaf.synth.SynthLookAndFeel;
import javax.swing.*;
import java.io.InputStream;
import java.awt.*;
public class SynthTest {
public static void main(String[] args) throws Exception {
SynthLookAndFeel laf = new SynthLookAndFeel();
InputStream in = SynthTest.class.getResourceAsStream(
"synthconfig.xml");
laf.load(in, SynthTest.class);
UIManager.setLookAndFeel(laf);
if (!Color.RED.equals(new JButton().getForeground())) {
throw new RuntimeException("The wrong foreground color!");
}
}
}
<synth>
<style id="button">
<font name="Verdana" size="16"/>
<state>
<color value="RED"
type="javax.swing.plaf.synth.ColorType.FOREGROUND"/>
</state>
</style>
<bind style="button" type="region" key="button"/>
</synth>
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册