diff --git a/src/share/classes/javax/swing/plaf/synth/SynthParser.java b/src/share/classes/javax/swing/plaf/synth/SynthParser.java index cfde2fcd61a4f8ea66d2a06cbb04ab3b2d4c0787..37a1893e7c4370615f65b91e28faf42de6409888 100644 --- a/src/share/classes/javax/swing/plaf/synth/SynthParser.java +++ b/src/share/classes/javax/swing/plaf/synth/SynthParser.java @@ -658,8 +658,7 @@ class SynthParser extends DefaultHandler { } try { _colorTypes.add((ColorType)checkCast(typeClass. - getField(typeName.substring(classIndex, - typeName.length() - classIndex)). + getField(typeName.substring(classIndex)). get(typeClass), ColorType.class)); } catch (NoSuchFieldException nsfe) { throw new SAXException("Unable to find color type: " + diff --git a/test/javax/swing/plaf/synth/6771547/SynthTest.java b/test/javax/swing/plaf/synth/6771547/SynthTest.java new file mode 100644 index 0000000000000000000000000000000000000000..93921c981c7f59a484396f52112d25b48cfcfd8b --- /dev/null +++ b/test/javax/swing/plaf/synth/6771547/SynthTest.java @@ -0,0 +1,50 @@ +/* + * 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!"); + } + } +} diff --git a/test/javax/swing/plaf/synth/6771547/synthconfig.xml b/test/javax/swing/plaf/synth/6771547/synthconfig.xml new file mode 100644 index 0000000000000000000000000000000000000000..48aa2e73db450b285c40ae8427a9d707746294da --- /dev/null +++ b/test/javax/swing/plaf/synth/6771547/synthconfig.xml @@ -0,0 +1,10 @@ + + + +