diff -r b0b83267e407 xml.multiview/apichanges.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xml.multiview/apichanges.xml	Wed Nov 19 13:32:01 2008 +0100
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+
+
+The contents of this file are subject to the terms of either the GNU
+General Public License Version 2 only ("GPL") or the Common
+Development and Distribution License("CDDL") (collectively, the
+"License"). You may not use this file except in compliance with the
+License. You can obtain a copy of the License at
+http://www.netbeans.org/cddl-gplv2.html
+or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+specific language governing permissions and limitations under the
+License.  When distributing the software, include this License Header
+Notice in each file and include the License file at
+nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+particular file as subject to the "Classpath" exception as provided
+by Sun in the GPL Version 2 section of the License file that
+accompanied this code. If applicable, add the following below the
+License Header, with the fields enclosed by brackets [] replaced by
+your own identifying information:
+"Portions Copyrighted [year] [name of copyright owner]"
+
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
+If you wish your version of this file to be governed by only the CDDL
+or only the GPL Version 2, indicate your decision by adding
+"[Contributor] elects to include this software in this distribution
+under the [CDDL or GPL Version 2] license." If you do not indicate a
+single choice of license, a recipient has the option to distribute
+your version of this file under either the CDDL, the GPL Version 2 or
+to extend the choice of license to its licensees as provided above.
+However, if you add GPL Version 2 code and therefore, elected the GPL
+Version 2 license, then the option applies only if the new code is
+made subject to such option by the copyright holder.
+-->
+
+<?xml-stylesheet href="../nbbuild/javadoctools/apichanges.xsl" type="text/xsl"?>
+<!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../nbbuild/javadoctools/apichanges.dtd">
+
+<!-- INFO FOR PEOPLE ADDING CHANGES:
+[most of contents snipped - see openide's apichanges for how-to instructions]
+<change>
+    <api name="compiler"/>
+    <summary>Some brief description here, can use <b>XHTML</b></summary>
+    <version major="1" minor="99"/>
+    <date day="13" month="6" year="2001"/>
+    <author login="jrhacker"/>
+    <compatibility addition="yes"/>
+    <description>
+        The main description of the change here.
+        Again can use full <b>XHTML</b> as needed.
+    </description>
+    <class package="org.openide.compiler" name="DoWhatIWantCompiler"/>
+    <issue number="14309"/>
+</change>
+-->
+
+<apichanges>
+
+<!-- First, a list of API names you may use: -->
+<apidefs>
+    <apidef name="xml.multiview.ui">XML Multiview UI API</apidef>
+</apidefs>
+
+<!-- ACTUAL CHANGES BEGIN HERE: -->
+
+<changes>
+    <change>
+        <api name="xml.multiview.ui"/>
+        <summary>Support for labels with mnemonics defined via &amp; escape characters.</summary>
+        <version major="1" minor="10"/>
+        <date day="19" month="11" year="2008"/>
+        <author login="pslechta"/>
+        <compatibility addition="yes" modification="no" semantic="compatible" source="compatible" binary="compatible"/>
+        <description>
+            <p>
+                New constructor added to SimpleDialogPanel class to support
+                labels with mnemonics defined via &amp; escape characters
+                (e.g. "T&amp;est label").
+            </p>
+        </description>
+        <issue number="152575"/>
+        <class package="org.netbeans.modules.xml.multiview.ui" name="SimpleDialogPanel"/>
+    </change>
+</changes>
+
+  <!-- Now the surrounding HTML text and document structure: -->
+
+  <htmlcontents>
+<!--
+
+                            NO NO NO NO NO!
+
+         ==============>    DO NOT EDIT ME!  <======================
+
+          AUTOMATICALLY GENERATED FROM APICHANGES.XML, DO NOT EDIT
+
+                SEE xml/api/doc/changes/apichanges.xml
+
+-->
+    <head>
+      <title>XML Multiview Editor changes by date</title>
+      <link rel="stylesheet" href="prose.css" type="text/css"/>
+    </head>
+    <body>
+
+<p class="overviewlink"><a href="overview-summary.html">Overview</a></p>
+
+<h1>Introduction</h1>
+
+<p>This document lists changes made to the XML Multiview Editor APIs. Please ask on the 
+<code>dev@java.netbeans.org</code> or <code>nbdev@netbeans.org</code>
+mailing list if you have any questions about the details of a
+change, or are wondering how to convert existing code to be compatible.</p>
+
+      <hr/><standard-changelists module-code-name="org.netbeans.modules.xml.multiview"/>
+
+      <hr/><p>@FOOTER@</p>
+
+    </body>
+  </htmlcontents>
+</apichanges>
diff -r b0b83267e407 xml.multiview/nbproject/project.properties
--- a/xml.multiview/nbproject/project.properties	Wed Nov 19 16:23:09 2008 +0530
+++ b/xml.multiview/nbproject/project.properties	Wed Nov 19 13:32:01 2008 +0100
@@ -38,7 +38,7 @@
 # made subject to such option by the copyright holder.
 
 javadoc.arch=${basedir}/arch.xml
-spec.version.base=1.9.0
+spec.version.base=1.10.0
 is.autoload=true
 
 test.unit.cp.extra=
diff -r b0b83267e407 xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SimpleDialogPanel.java
--- a/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SimpleDialogPanel.java	Wed Nov 19 16:23:09 2008 +0530
+++ b/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SimpleDialogPanel.java	Wed Nov 19 13:32:01 2008 +0100
@@ -70,7 +70,7 @@
     */      
     public SimpleDialogPanel(DialogDescriptor desc) {
         super();
-        initComponents(desc.getLabels(), desc.isTextField(), desc.getSize(), desc.getButtons(), desc.getMnemonics(), desc.getA11yDesc());
+        initComponents(desc.getLabels(), desc.isTextField(), desc.getSize(), desc.getButtons(), desc.getMnemonics(), desc.getA11yDesc(), desc.includesMnemonics);
         String[] initValues = desc.getInitValues();
         if (initValues!=null)
             for (int i=0;i<initValues.length;i++) {
@@ -78,12 +78,18 @@
             }
     }
 
-    private void initComponents(String[] labels, boolean[] isTextField, int size, boolean[] customizers, char[] mnem, String[] a11yDesc) {
+    private void initComponents(String[] labels, boolean[] isTextField, int size, boolean[] customizers, char[] mnem, String[] a11yDesc, boolean includesMnemonics) {
         setLayout(new GridBagLayout());
         jLabels = new JLabel [labels.length];
         jTextComponents = new JTextComponent [labels.length];
         for (int i=0;i<labels.length;i++) {
-            jLabels[i] = new JLabel(labels[i]);
+            if (!includesMnemonics) {
+                jLabels[i] = new JLabel(labels[i]);
+            }
+            else {
+                jLabels[i] = new JLabel();
+                org.openide.awt.Mnemonics.setLocalizedText(jLabels[i], labels[i]);
+            }
             gridBagConstraints = new java.awt.GridBagConstraints();
             gridBagConstraints.gridx = 0;
             gridBagConstraints.gridy = i;
@@ -181,6 +187,13 @@
         return jTextComponents;
     }
     
+    /** Returns the dialog labels. For testing purposes mainly.
+     * @return array of labels
+     */
+    public JLabel[] getLabels() {
+        return jLabels;
+    }
+
     /** This is the descriptor for the dialog components.
     * Parameters are :<ul>
     * <li>labels = text array for text fields
@@ -200,11 +213,16 @@
         char[] mnem;
         String[] a11yDesc;
         int size;
+        boolean includesMnemonics;
         
         /** the constructor for DialogDescriptor object
         * @param labels labels names
         */
         public DialogDescriptor(String[] labels) {
+            this(labels, false);
+        }
+        
+        public DialogDescriptor(String[] labels, boolean includesMnemonics) {
             this.labels=labels;
             size=25;
             adding=true;
@@ -212,6 +230,7 @@
             for (int i=0;i<labels.length;i++) {
                 textField[i]=true; // setting textFields to text fields
             }
+            this.includesMnemonics = includesMnemonics;
         }
         
         public String[] getLabels() {
diff -r b0b83267e407 xml.multiview/test/unit/src/org/netbeans/modules/xml/multiview/ui/SimpleDialogPanelTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xml.multiview/test/unit/src/org/netbeans/modules/xml/multiview/ui/SimpleDialogPanelTest.java	Wed Nov 19 13:32:01 2008 +0100
@@ -0,0 +1,98 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2008 Sun Microsystems, Inc.
+ */
+
+package org.netbeans.modules.xml.multiview.ui;
+
+import javax.swing.JLabel;
+import junit.framework.TestCase;
+
+/**
+ * This set of tests do test labels menominics.
+ * There are 3 basic ways how mnemonics for labels may be used:
+ * (1) labels with no mnemonics,
+ * (2) labels with mnemonics specified as char[],
+ * (3) labels with menomnics specified via '&' escape characters
+ *
+ * @author Petr Slechta
+ */
+public class SimpleDialogPanelTest extends TestCase {
+
+    private static final String[] LABELS1 = {
+        "Test label 1", "Test label 2", "Test label 3"
+    };
+    private static final char[] MNEMONICS1 = {
+        'T', 'E', '3'
+    };
+    private static final String[] LABELS2 = {
+        "&Test label 1", "T&est label 2", "Test label &3"
+    };
+
+    public SimpleDialogPanelTest(String testName) {
+        super(testName);
+    }
+
+    public void testLabels1() {
+        SimpleDialogPanel.DialogDescriptor dd = new SimpleDialogPanel.DialogDescriptor(LABELS1);
+        SimpleDialogPanel sdp = new SimpleDialogPanel(dd);
+        JLabel[] labels = sdp.getLabels();
+        for (int i=0,maxi=LABELS1.length; i<maxi; i++) {
+            assertEquals(labels[i].getDisplayedMnemonic(), 0);
+        }
+    }
+
+    public void testLabels2() {
+        SimpleDialogPanel.DialogDescriptor dd = new SimpleDialogPanel.DialogDescriptor(LABELS1);
+        dd.setMnemonics(MNEMONICS1);
+        SimpleDialogPanel sdp = new SimpleDialogPanel(dd);
+        JLabel[] labels = sdp.getLabels();
+        for (int i=0,maxi=LABELS1.length; i<maxi; i++) {
+            assertEquals(labels[i].getDisplayedMnemonic(), MNEMONICS1[i]);
+        }
+    }
+
+    public void testLabels3() {
+        SimpleDialogPanel.DialogDescriptor dd = new SimpleDialogPanel.DialogDescriptor(LABELS2, true);
+        SimpleDialogPanel sdp = new SimpleDialogPanel(dd);
+        JLabel[] labels = sdp.getLabels();
+        for (int i=0,maxi=LABELS1.length; i<maxi; i++) {
+            assertEquals(labels[i].getDisplayedMnemonic(), MNEMONICS1[i]);
+        }
+    }
+
+}