diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2005-01-26 02:30:46 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2005-01-26 02:30:46 +0000 |
| commit | 4ca0907f952ea4453df4acda77a9ac36dca7bca8 (patch) | |
| tree | 30238a1472492da34f4d0051307be617fe1f6844 /javax/swing/text/PlainView.java | |
| parent | d66e316d73827279d8f47d4a3d14437abc24bb3f (diff) | |
| download | classpath-4ca0907f952ea4453df4acda77a9ac36dca7bca8.tar.gz | |
2005-01-24 Andrew John Hughes <gnu_andrew@member.fsf.org>
Merge from HEAD --> generics-branch for 25/01/2005.
Changelog:
2005-01-25 Ito Kazumitsu <kaz@maczuka.gcd.org>
* 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 <konqueror@gmx.de>
* javax/swing/DefaultCellRenderer.java: Removed.
2005-01-25 Michael Koch <konqueror@gmx.de>
* 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.
Diffstat (limited to 'javax/swing/text/PlainView.java')
| -rw-r--r-- | javax/swing/text/PlainView.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/javax/swing/text/PlainView.java b/javax/swing/text/PlainView.java index 38652ca88..c852c1d69 100644 --- a/javax/swing/text/PlainView.java +++ b/javax/swing/text/PlainView.java @@ -117,7 +117,7 @@ public class PlainView extends View return rect; } - public void drawLine(int lineIndex, Graphics g, int x, int y) + protected void drawLine(int lineIndex, Graphics g, int x, int y) { try { @@ -176,7 +176,7 @@ public class PlainView extends View } } - public int getTabSize() + protected int getTabSize() { return 8; } |