Update of /cvsroot/jfreechart/jcommon/source/org/jfree/ui In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17221/source/org/jfree/ui Modified Files: FontChooserPanel.java StandardDialog.java InsetsTextField.java FontDisplayField.java InsetsChooserPanel.java Log Message: Use new ResourceBundleWrapper class to allow applets the option of by-passing the codeBase lookup when loading resources. Index: InsetsTextField.java =================================================================== RCS file: /cvsroot/jfreechart/jcommon/source/org/jfree/ui/InsetsTextField.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** InsetsTextField.java 2 Nov 2007 17:50:36 -0000 1.3 --- InsetsTextField.java 18 Dec 2008 09:57:32 -0000 1.4 *************** *** 3,32 **** * ======================================================================== * ! * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. ! * * Project Info: http://www.jfree.org/jcommon/index.html * ! * This library is free software; you can redistribute it and/or modify it ! * under the terms of the GNU Lesser General Public License as published by ! * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * ! * This library 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 Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, ! * USA. * ! * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] ! * * -------------------- * InsetsTextField.java * -------------------- ! * (C) Copyright 2000-2004, by Andrzej Porebski. * * Original Author: Andrzej Porebski; --- 3,32 ---- * ======================================================================== * ! * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. ! * * Project Info: http://www.jfree.org/jcommon/index.html * ! * This library is free software; you can redistribute it and/or modify it ! * under the terms of the GNU Lesser General Public License as published by ! * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * ! * This library 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 Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, ! * USA. * ! * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] ! * * -------------------- * InsetsTextField.java * -------------------- ! * (C) Copyright 2000-2008, by Andrzej Porebski. * * Original Author: Andrzej Porebski; *************** *** 38,42 **** * ------------------------- * 07-Nov-2001 : Added to com.jrefinery.ui package (DG); ! * 08-Sep-2003 : Added internationalization via use of properties resourceBundle (RFE 690236) (AL); * */ --- 38,45 ---- * ------------------------- * 07-Nov-2001 : Added to com.jrefinery.ui package (DG); ! * 08-Sep-2003 : Added internationalization via use of properties ! * resourceBundle (RFE 690236) (AL); ! * 18-Dec-2008 : Use ResourceBundleWrapper - see JFreeChart patch 1607918 by ! * Jess Thrysoee (DG); * */ *************** *** 46,51 **** --- 49,57 ---- import java.awt.Insets; import java.util.ResourceBundle; + import javax.swing.JTextField; + import org.jfree.util.ResourceBundleWrapper; + /** * A JTextField for displaying insets. *************** *** 56,65 **** /** The resourceBundle for the localization. */ ! protected static ResourceBundle localizationResources = ! ResourceBundle.getBundle("org.jfree.ui.LocalizationBundle"); /** ! * Default constructor. Initializes this text field with formatted string describing ! * provided insets. * * @param insets the insets. --- 62,72 ---- /** The resourceBundle for the localization. */ ! protected static ResourceBundle localizationResources ! = ResourceBundleWrapper.getBundle( ! "org.jfree.ui.LocalizationBundle"); /** ! * Default constructor. Initializes this text field with formatted string ! * describing provided insets. * * @param insets the insets. Index: InsetsChooserPanel.java =================================================================== RCS file: /cvsroot/jfreechart/jcommon/source/org/jfree/ui/InsetsChooserPanel.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** InsetsChooserPanel.java 2 Nov 2007 17:50:36 -0000 1.7 --- InsetsChooserPanel.java 18 Dec 2008 09:57:32 -0000 1.8 *************** *** 3,32 **** * ======================================================================== * ! * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. ! * * Project Info: http://www.jfree.org/jcommon/index.html * ! * This library is free software; you can redistribute it and/or modify it ! * under the terms of the GNU Lesser General Public License as published by ! * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * ! * This library 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 Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, ! * USA. * ! * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] ! * * ----------------------- * InsetsChooserPanel.java * ----------------------- ! * (C) Copyright 2000-2005, by Andrzej Porebski and Contributors. * * Original Author: Andrzej Porebski; --- 3,32 ---- * ======================================================================== * ! * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. ! * * Project Info: http://www.jfree.org/jcommon/index.html * ! * This library is free software; you can redistribute it and/or modify it ! * under the terms of the GNU Lesser General Public License as published by ! * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * ! * This library 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 Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, ! * USA. * ! * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] ! * * ----------------------- * InsetsChooserPanel.java * ----------------------- ! * (C) Copyright 2000-2008, by Andrzej Porebski and Contributors. * * Original Author: Andrzej Porebski; *************** *** 41,48 **** * 14-Oct-2002 : Fixed errors reported by Checkstyle (DG); * 03-Feb-2003 : Added Math.abs() to ensure no negative insets can be set (DG); ! * 08-Sep-2003 : Added internationalization via use of properties * resourceBundle (RFE 690236) (AL); ! * 07-Oct-2005 : Renamed getInsets() --> getInsetsValue() to avoid conflict * with JComponent's getInsets() (DG); * */ --- 41,50 ---- * 14-Oct-2002 : Fixed errors reported by Checkstyle (DG); * 03-Feb-2003 : Added Math.abs() to ensure no negative insets can be set (DG); ! * 08-Sep-2003 : Added internationalization via use of properties * resourceBundle (RFE 690236) (AL); ! * 07-Oct-2005 : Renamed getInsets() --> getInsetsValue() to avoid conflict * with JComponent's getInsets() (DG); + * 18-Dec-2008 : Use ResourceBundleWrapper - see JFreeChart patch 1607918 by + * Jess Thrysoee (DG); * */ *************** *** 55,58 **** --- 57,61 ---- import java.awt.Insets; import java.util.ResourceBundle; + import javax.swing.JLabel; import javax.swing.JPanel; *************** *** 60,63 **** --- 63,68 ---- import javax.swing.border.TitledBorder; + import org.jfree.util.ResourceBundleWrapper; + /** * A component for editing an instance of the Insets class. *************** *** 80,85 **** /** The resourceBundle for the localization. */ ! protected static ResourceBundle localizationResources = ! ResourceBundle.getBundle("org.jfree.ui.LocalizationBundle"); /** --- 85,91 ---- /** The resourceBundle for the localization. */ ! protected static ResourceBundle localizationResources ! = ResourceBundleWrapper.getBundle( ! "org.jfree.ui.LocalizationBundle"); /** *************** *** 100,110 **** current = (current == null) ? new Insets(0, 0, 0, 0) : current; ! this.topValueEditor = new JTextField(new IntegerDocument(), "" + current.top, 0); ! this.leftValueEditor = new JTextField(new IntegerDocument(), "" + current.left, 0); ! this.bottomValueEditor = new JTextField(new IntegerDocument(), "" + current.bottom, 0); ! this.rightValueEditor = new JTextField(new IntegerDocument(), "" + current.right, 0); --- 106,116 ---- current = (current == null) ? new Insets(0, 0, 0, 0) : current; ! this.topValueEditor = new JTextField(new IntegerDocument(), "" + current.top, 0); ! this.leftValueEditor = new JTextField(new IntegerDocument(), "" + current.left, 0); ! this.bottomValueEditor = new JTextField(new IntegerDocument(), "" + current.bottom, 0); ! this.rightValueEditor = new JTextField(new IntegerDocument(), "" + current.right, 0); *************** *** 115,119 **** // First row panel.add(new JLabel(localizationResources.getString("Top")), ! new GridBagConstraints(1, 0, 3, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); --- 121,125 ---- // First row panel.add(new JLabel(localizationResources.getString("Top")), ! new GridBagConstraints(1, 0, 3, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); *************** *** 123,127 **** GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 12, 0, 12), 8, 0)); ! panel.add(this.topValueEditor, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); --- 129,133 ---- GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 12, 0, 12), 8, 0)); ! panel.add(this.topValueEditor, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); *************** *** 129,139 **** GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 12, 0, 11), 8, 0)); ! // Third row panel.add(new JLabel(localizationResources.getString("Left")), ! new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 4, 0, 4), 0, 0)); ! panel.add(this.leftValueEditor, new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0)); --- 135,145 ---- GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 12, 0, 11), 8, 0)); ! // Third row panel.add(new JLabel(localizationResources.getString("Left")), ! new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 4, 0, 4), 0, 0)); ! panel.add(this.leftValueEditor, new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0)); *************** *** 141,160 **** GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 12, 0, 12), 8, 0)); ! panel.add(this.rightValueEditor, new GridBagConstraints(3, 2, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); panel.add(new JLabel(localizationResources.getString("Right")), ! new GridBagConstraints(4, 2, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 4, 0, 4), 0, 0)); ! // Fourth row ! panel.add(this.bottomValueEditor, new GridBagConstraints(2, 3, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); ! // Fifth row panel.add(new JLabel(localizationResources.getString("Bottom")), ! new GridBagConstraints(1, 4, 3, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); --- 147,166 ---- GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 12, 0, 12), 8, 0)); ! panel.add(this.rightValueEditor, new GridBagConstraints(3, 2, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); panel.add(new JLabel(localizationResources.getString("Right")), ! new GridBagConstraints(4, 2, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 4, 0, 4), 0, 0)); ! // Fourth row ! panel.add(this.bottomValueEditor, new GridBagConstraints(2, 3, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); ! // Fifth row panel.add(new JLabel(localizationResources.getString("Bottom")), ! new GridBagConstraints(1, 4, 3, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); Index: FontDisplayField.java =================================================================== RCS file: /cvsroot/jfreechart/jcommon/source/org/jfree/ui/FontDisplayField.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FontDisplayField.java 2 Nov 2007 17:50:36 -0000 1.5 --- FontDisplayField.java 18 Dec 2008 09:57:32 -0000 1.6 *************** *** 3,32 **** * ======================================================================== * ! * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. ! * * Project Info: http://www.jfree.org/jcommon/index.html * ! * This library is free software; you can redistribute it and/or modify it ! * under the terms of the GNU Lesser General Public License as published by ! * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * ! * This library 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 Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, ! * USA. * ! * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] ! * * --------------------- * FontDisplayField.java * --------------------- ! * (C) Copyright 2000-2004, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); --- 3,32 ---- * ======================================================================== * ! * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. ! * * Project Info: http://www.jfree.org/jcommon/index.html * ! * This library is free software; you can redistribute it and/or modify it ! * under the terms of the GNU Lesser General Public License as published by ! * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * ! * This library 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 Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, ! * USA. * ! * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] ! * * --------------------- * FontDisplayField.java * --------------------- ! * (C) Copyright 2000-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); *************** *** 39,43 **** * 26-Oct-2001 : Changed package to com.jrefinery.ui.*; * 14-Oct-2002 : Fixed errors reported by Checkstyle (DG); ! * 08-Sep-2003 : Added internationalization via use of properties resourceBundle (RFE 690236) (AL); * */ --- 39,46 ---- * 26-Oct-2001 : Changed package to com.jrefinery.ui.*; * 14-Oct-2002 : Fixed errors reported by Checkstyle (DG); ! * 08-Sep-2003 : Added internationalization via use of properties ! * resourceBundle (RFE 690236) (AL); ! * 18-Dec-2008 : Use ResourceBundleWrapper - see JFreeChart patch 1607918 by ! * Jess Thrysoee (DG); * */ *************** *** 47,55 **** import java.awt.Font; import java.util.ResourceBundle; import javax.swing.JTextField; /** ! * A field for displaying a font selection. The display field itself is read-only, to the developer ! * must provide another mechanism to allow the user to change the font. * * @author David Gilbert --- 50,62 ---- import java.awt.Font; import java.util.ResourceBundle; + import javax.swing.JTextField; + import org.jfree.util.ResourceBundleWrapper; + /** ! * A field for displaying a font selection. The display field itself is ! * read-only, to the developer must provide another mechanism to allow the ! * user to change the font. * * @author David Gilbert *************** *** 61,69 **** /** The resourceBundle for the localization. */ ! protected static final ResourceBundle localizationResources = ! ResourceBundle.getBundle("org.jfree.ui.LocalizationBundle"); /** ! * Standard constructor - builds a FontDescriptionField initialised with the specified font. * * @param font the font. --- 68,77 ---- /** The resourceBundle for the localization. */ ! protected static final ResourceBundle localizationResources = ! ResourceBundleWrapper.getBundle("org.jfree.ui.LocalizationBundle"); /** ! * Standard constructor - builds a FontDescriptionField initialised with ! * the specified font. * * @param font the font. Index: StandardDialog.java =================================================================== RCS file: /cvsroot/jfreechart/jcommon/source/org/jfree/ui/StandardDialog.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** StandardDialog.java 2 Nov 2007 17:50:36 -0000 1.6 --- StandardDialog.java 18 Dec 2008 09:57:32 -0000 1.7 *************** *** 3,32 **** * ======================================================================== * ! * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. ! * * Project Info: http://www.jfree.org/jcommon/index.html * ! * This library is free software; you can redistribute it and/or modify it ! * under the terms of the GNU Lesser General Public License as published by ! * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * ! * This library 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 Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, ! * USA. * ! * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] ! * * ------------------- * StandardDialog.java * ------------------- ! * (C) Copyright 2000-2004, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); --- 3,32 ---- * ======================================================================== * ! * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. ! * * Project Info: http://www.jfree.org/jcommon/index.html * ! * This library is free software; you can redistribute it and/or modify it ! * under the terms of the GNU Lesser General Public License as published by ! * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * ! * This library 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 Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, ! * USA. * ! * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] ! * * ------------------- * StandardDialog.java * ------------------- ! * (C) Copyright 2000-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); *************** *** 38,42 **** * -------------------------- * 26-Oct-2001 : Changed package to com.jrefinery.ui.*; ! * 08-Sep-2003 : Added internationalization via use of properties resourceBundle (RFE 690236) (AL); * */ --- 38,45 ---- * -------------------------- * 26-Oct-2001 : Changed package to com.jrefinery.ui.*; ! * 08-Sep-2003 : Added internationalization via use of properties ! * resourceBundle (RFE 690236) (AL); ! * 18-Dec-2008 : Use ResourceBundleWrapper - see JFreeChart patch 1607918 by ! * Jess Thrysoee (DG); * */ *************** *** 49,52 **** --- 52,56 ---- import java.awt.event.ActionListener; import java.util.ResourceBundle; + import javax.swing.BorderFactory; import javax.swing.JButton; *************** *** 54,57 **** --- 58,63 ---- import javax.swing.JPanel; + import org.jfree.util.ResourceBundleWrapper; + /** * The base class for standard dialogs. *************** *** 65,70 **** /** The resourceBundle for the localization. */ ! protected static final ResourceBundle localizationResources = ! ResourceBundle.getBundle("org.jfree.ui.LocalizationBundle"); /** --- 71,77 ---- /** The resourceBundle for the localization. */ ! protected static final ResourceBundle localizationResources ! = ResourceBundleWrapper.getBundle( ! "org.jfree.ui.LocalizationBundle"); /** *************** *** 75,79 **** * @param modal modal? */ ! public StandardDialog(final Frame owner, final String title, final boolean modal) { super(owner, title, modal); this.cancelled = false; --- 82,87 ---- * @param modal modal? */ ! public StandardDialog(final Frame owner, final String title, ! final boolean modal) { super(owner, title, modal); this.cancelled = false; *************** *** 87,91 **** * @param modal modal? */ ! public StandardDialog(final Dialog owner, final String title, final boolean modal) { super(owner, title, modal); this.cancelled = false; --- 95,100 ---- * @param modal modal? */ ! public StandardDialog(final Dialog owner, final String title, ! final boolean modal) { super(owner, title, modal); this.cancelled = false; *************** *** 93,97 **** /** ! * Returns a flag that indicates whether or not the dialog has been cancelled. * * @return boolean. --- 102,107 ---- /** ! * Returns a flag that indicates whether or not the dialog has been ! * cancelled. * * @return boolean. *************** *** 122,127 **** /** ! * Builds and returns the user interface for the dialog. This method is shared among the ! * constructors. * * @return the button panel. --- 132,137 ---- /** ! * Builds and returns the user interface for the dialog. This method is ! * shared among the constructors. * * @return the button panel. *************** *** 129,135 **** protected JPanel createButtonPanel() { ! final L1R2ButtonPanel buttons = new L1R2ButtonPanel(localizationResources.getString("Help"), ! localizationResources.getString("OK"), ! localizationResources.getString("Cancel")); final JButton helpButton = buttons.getLeftButton(); --- 139,146 ---- protected JPanel createButtonPanel() { ! final L1R2ButtonPanel buttons = new L1R2ButtonPanel( ! localizationResources.getString("Help"), ! localizationResources.getString("OK"), ! localizationResources.getString("Cancel")); final JButton helpButton = buttons.getLeftButton(); Index: FontChooserPanel.java =================================================================== RCS file: /cvsroot/jfreechart/jcommon/source/org/jfree/ui/FontChooserPanel.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FontChooserPanel.java 2 Nov 2007 17:50:36 -0000 1.5 --- FontChooserPanel.java 18 Dec 2008 09:57:32 -0000 1.6 *************** *** 3,32 **** * ======================================================================== * ! * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. ! * * Project Info: http://www.jfree.org/jcommon/index.html * ! * This library is free software; you can redistribute it and/or modify it ! * under the terms of the GNU Lesser General Public License as published by ! * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * ! * This library 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 Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, ! * USA. * ! * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] ! * * --------------------- * FontChooserPanel.java * --------------------- ! * (C) Copyright 2000-2004, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); --- 3,32 ---- * ======================================================================== * ! * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. ! * * Project Info: http://www.jfree.org/jcommon/index.html * ! * This library is free software; you can redistribute it and/or modify it ! * under the terms of the GNU Lesser General Public License as published by ! * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * ! * This library 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 Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, ! * USA. * ! * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] ! * * --------------------- * FontChooserPanel.java * --------------------- ! * (C) Copyright 2000-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); *************** *** 41,44 **** --- 41,47 ---- * 08-Sep-2003 : Added internationalization via use of properties resourceBundle (RFE 690236) (AL); * 21-Feb-2004 : The FontParameter of the constructor was never used (TM); + * 18-Dec-2008 : Use ResourceBundleWrapper - see JFreeChart patch 1607918 by + * Jess Thrysoee (DG); + * */ *************** *** 50,53 **** --- 53,57 ---- import java.awt.GridLayout; import java.util.ResourceBundle; + import javax.swing.BorderFactory; import javax.swing.JCheckBox; *************** *** 57,63 **** import javax.swing.ListModel; /** ! * A panel for choosing a font from the available system fonts - still a bit of a hack at the ! * moment, but good enough for demonstration applications. * * @author David Gilbert --- 61,69 ---- import javax.swing.ListModel; + import org.jfree.util.ResourceBundleWrapper; + /** ! * A panel for choosing a font from the available system fonts - still a bit of ! * a hack at the moment, but good enough for demonstration applications. * * @author David Gilbert *************** *** 66,71 **** /** The font sizes that can be selected. */ ! public static final String[] SIZES = {"9", "10", "11", "12", "14", "16", "18", ! "20", "22", "24", "28", "36", "48", "72"}; /** The list of fonts. */ --- 72,77 ---- /** The font sizes that can be selected. */ ! public static final String[] SIZES = {"9", "10", "11", "12", "14", "16", ! "18", "20", "22", "24", "28", "36", "48", "72"}; /** The list of fonts. */ *************** *** 82,90 **** /** The resourceBundle for the localization. */ ! protected static ResourceBundle localizationResources = ! ResourceBundle.getBundle("org.jfree.ui.LocalizationBundle"); /** ! * Standard constructor - builds a FontChooserPanel initialised with the specified font. * * @param font the initial font to display. --- 88,97 ---- /** The resourceBundle for the localization. */ ! protected static ResourceBundle localizationResources = ! ResourceBundleWrapper.getBundle("org.jfree.ui.LocalizationBundle"); /** ! * Standard constructor - builds a FontChooserPanel initialised with the ! * specified font. * * @param font the initial font to display. *************** *** 92,96 **** public FontChooserPanel(final Font font) { ! final GraphicsEnvironment g = GraphicsEnvironment.getLocalGraphicsEnvironment(); final String[] fonts = g.getAvailableFontFamilyNames(); --- 99,104 ---- public FontChooserPanel(final Font font) { ! final GraphicsEnvironment g ! = GraphicsEnvironment.getLocalGraphicsEnvironment(); final String[] fonts = g.getAvailableFontFamilyNames(); *************** *** 100,104 **** final JPanel fontPanel = new JPanel(new BorderLayout()); fontPanel.setBorder(BorderFactory.createTitledBorder( ! BorderFactory.createEtchedBorder(), localizationResources.getString("Font"))); this.fontlist = new JList(fonts); --- 108,112 ---- final JPanel fontPanel = new JPanel(new BorderLayout()); fontPanel.setBorder(BorderFactory.createTitledBorder( ! BorderFactory.createEtchedBorder(), localizationResources.getString("Font"))); this.fontlist = new JList(fonts); *************** *** 110,114 **** final JPanel sizePanel = new JPanel(new BorderLayout()); sizePanel.setBorder(BorderFactory.createTitledBorder( ! BorderFactory.createEtchedBorder(), localizationResources.getString("Size"))); this.sizelist = new JList(SIZES); --- 118,122 ---- final JPanel sizePanel = new JPanel(new BorderLayout()); sizePanel.setBorder(BorderFactory.createTitledBorder( ! BorderFactory.createEtchedBorder(), localizationResources.getString("Size"))); this.sizelist = new JList(SIZES); *************** *** 122,127 **** attributes.add(this.bold); attributes.add(this.italic); ! attributes.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), ! localizationResources.getString("Attributes"))); right.add(sizePanel, BorderLayout.CENTER); --- 130,136 ---- attributes.add(this.bold); attributes.add(this.italic); ! attributes.setBorder(BorderFactory.createTitledBorder( ! BorderFactory.createEtchedBorder(), ! localizationResources.getString("Attributes"))); right.add(sizePanel, BorderLayout.CENTER); *************** *** 139,143 **** */ public Font getSelectedFont() { ! return new Font(getSelectedName(), getSelectedStyle(), getSelectedSize()); } --- 148,153 ---- */ public Font getSelectedFont() { ! return new Font(getSelectedName(), getSelectedStyle(), ! getSelectedSize()); } |