svn commit: r19854 - trunk/src/argouml-app/src/org/argouml/ui/ArgoJFontChooser.java

Author: mvw
Date: 2011-12-21 12:07:29-0800
New Revision: 19854

Modified:
   trunk/src/argouml-app/src/org/argouml/ui/ArgoJFontChooser.java

Log:
Patch according issue 6380, as delivered by Jim Taylor.

Modified: trunk/src/argouml-app/src/org/argouml/ui/ArgoJFontChooser.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/ArgoJFontChooser.java?view=diff&pathrev=19854&r1=19853&r2=19854
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/ArgoJFontChooser.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/ui/ArgoJFontChooser.java	2011-12-21 12:07:29-0800
@@ -1,6 +1,6 @@
 /* $Id$
  *****************************************************************************
- * Copyright (c) 2009 Contributors - see below
+ * Copyright (c) 2009-2011 Contributors - see below
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
  *
  * Contributors:
  *    tfmorris
+ *    Michiel van der Wulp
  *****************************************************************************
  *
  * Some portions of this file was previously release using the BSD License:
@@ -206,10 +207,16 @@
             jContentPane = new JPanel();
             jContentPane.setLayout(new GridBagLayout());
 
+            // Initialize font faces list
             JScrollPane jscpFamilies = new JScrollPane();
             jscpFamilies.setViewportView(getJlstFamilies());
+            getJlstFamilies().setSelectedValue(resultName, true);
+
+            // Initialize font sizes list
             JScrollPane jscpSizes = new JScrollPane();
             jscpSizes.setViewportView(getJlstSizes());
+            getJlstSizes().setSelectedValue(resultSize, true);
+
             jContentPane.add(jscpFamilies, gridBagConstraints);
             jContentPane.add(jscpSizes, gridBagConstraints1);
 //            jContentPane.add(getJchbBold(), gridBagConstraints2);
@@ -240,7 +247,6 @@
                 ((DefaultListModel) jlstFamilies.getModel())
                         .addElement(fontName);
             }
-            jlstFamilies.setSelectedValue(resultName, true);
 
             jlstFamilies.getSelectionModel().addListSelectionListener(
                     new ListSelectionListener() {
@@ -270,7 +276,6 @@
                 Integer.valueOf(24), Integer.valueOf(26), Integer.valueOf(28),
                 Integer.valueOf(36), Integer.valueOf(48), Integer.valueOf(72)
             });
-            jlstSizes.setSelectedValue(resultSize, true);
 
             jlstSizes.getSelectionModel().addListSelectionListener(
                     new ListSelectionListener() {
@@ -340,7 +345,7 @@
     }
 
     /**
-     * Returns true if dilaog result is OK.
+     * Returns true if dialog result is OK.
      *
      * @return dialog result
      */

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2897206

To unsubscribe from this discussion, e-mail: [[email protected]].