From 4ca0907f952ea4453df4acda77a9ac36dca7bca8 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Wed, 26 Jan 2005 02:30:46 +0000 Subject: 2005-01-24 Andrew John Hughes Merge from HEAD --> generics-branch for 25/01/2005. Changelog: 2005-01-25 Ito Kazumitsu * java/text/SimpleDateFormat.java: (parse): Use offset to set ZONE_OFFSET rather than the DST_OFFSET, so that GMT offset timezones change the right one. 2005-01-25 Michael Koch * javax/swing/DefaultCellRenderer.java: Removed. 2005-01-25 Michael Koch * javax/swing/AbstractButton.java (fireItemStateChanged): Made protected. (fireActionPerformed): Likewise. (fireStateChanged): Likewise. * javax/swing/DefaultButtonModel.java (fireItemStateChanged): Likewise. (fireActionPerformed): Likewise. (fireStateChanged): Likewise. * javax/swing/JApplet.java (JApplet): Removed. (frameInit): Likewise. (setRootPane): Made protected. (createRootPane): Likewise. * javax/swing/JComponent.java (getClientProperty): Likewise. (putClientProperty): Likewise. * javax/swing/JEditorPane.java (getContentType): Likewise. (setContentType): Likewise. * javax/swing/JFrame.java (setRootPane): Likewise. (createRootPane): Likewise. * javax/swing/JInternalFrame.java (getFocusCycleRootAncestor): Made final. Added @since tag. (isFocusCycleRoot): Likewise. (getWarningString): Made final. * javax/swing/JScrollBar.java (changeListener): Removed. (changeEvent): Likewise. (createChangeListener): Likewise. (fireStateChanged): Likewise. (addChangeListener): Likewise. (removeChangeListener): Likewise. (getChangeListeners): Likewise. * javax/swing/JScrollPane.java (createViewport): Made protected. * javax/swing/JViewport.java (addImpl): Likewise. (setBorder): New method. * javax/swing/JWindow.java (setRootPane): Made protected. (createRootPane): Likewise. * javax/swing/plaf/basic/BasicButtonUI.java (installListeners): Likewise. (uninstallListeners): Likewise. * javax/swing/plaf/basic/BasicProgressBarUI.java (incrementAnimationIndex): Likewise. * javax/swing/plaf/basic/BasicTabbedPaneUI.java (createLayoutManager): Likewise. * javax/swing/table/DefaultTableCellRenderer.java (firePropertyChange): Likewise. * javax/swing/table/JTableHeader.java (AccessibleJTableHeaderEntry.AccessibleJTableHeaderEntry): New constructor. * javax/swing/text/PlainDocument.java (reindex): Made private. * javax/swing/text/PlainView.java (drawLine): Made protected. (getTabSize): Likewise. * javax/swing/text/View.java (setSize): Removed. (preferenceChanged): New method. (getBreakWeight): Likewise. (breakView): Likewise. (getViewIndex): Likewise. --- javax/swing/DefaultButtonModel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'javax/swing/DefaultButtonModel.java') diff --git a/javax/swing/DefaultButtonModel.java b/javax/swing/DefaultButtonModel.java index 8963cfba3..ee96298b1 100644 --- a/javax/swing/DefaultButtonModel.java +++ b/javax/swing/DefaultButtonModel.java @@ -272,7 +272,7 @@ public class DefaultButtonModel implements ButtonModel, Serializable * * @param e The ItemEvent to fire */ - public void fireItemStateChanged(ItemEvent e) + protected void fireItemStateChanged(ItemEvent e) { ItemListener[] ll = getItemListeners(); @@ -288,7 +288,7 @@ public class DefaultButtonModel implements ButtonModel, Serializable * * @param e The ActionEvent to fire */ - public void fireActionPerformed(ActionEvent e) + protected void fireActionPerformed(ActionEvent e) { ActionListener[] ll = getActionListeners(); @@ -301,7 +301,7 @@ public class DefaultButtonModel implements ButtonModel, Serializable * has occurred. This happens in response to the any change to a property * of the model. */ - public void fireStateChanged() + protected void fireStateChanged() { ChangeListener[] ll = getChangeListeners(); -- cgit v1.2.1