PatchSet 5229
Date: 2004/09/28 22:45:24
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: swing fixes from 25th, 26th
2004-09-28 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/javalib/javax/swing/text/PasswordView.java:
New file, added from GNU Classpath.
* libraries/javalib/Makefile.am,
libraries/javalib/Makefile.in,
libraries/javalib/all.files:
Regenerated.
* libraries/javalib/gnu/regexp/RE.java,
libraries/javalib/gnu/regexp/RETokenLookAhead.java,
libraries/javalib/javax/swing/JApplet.java,
libraries/javalib/javax/swing/JCheckBox.java,
libraries/javalib/javax/swing/JFrame.java,
libraries/javalib/javax/swing/JMenu.java,
libraries/javalib/javax/swing/JPasswordField.java,
libraries/javalib/javax/swing/JScrollPane.java,
libraries/javalib/javax/swing/JTable.java,
libraries/javalib/javax/swing/JTree.java,
libraries/javalib/javax/swing/JViewport.java,
libraries/javalib/javax/swing/SpinnerNumberModel.java,
libraries/javalib/javax/swing/UIDefaults.java,
libraries/javalib/javax/swing/UIManager.java,
libraries/javalib/javax/swing/plaf/basic/BasicArrowButton.java,
libraries/javalib/javax/swing/plaf/basic/BasicPasswordFieldUI.java,
libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java,
libraries/javalib/javax/swing/plaf/basic/BasicSplitPaneDivider.java,
libraries/javalib/javax/swing/table/DefaultTableColumnModel.java,
libraries/javalib/javax/swing/table/JTableHeader.java,
libraries/javalib/javax/swing/table/TableColumn.java,
libraries/javalib/javax/swing/text/DocumentFilter.java,
libraries/javalib/javax/swing/text/NavigationFilter.java,
libraries/javalib/javax/swing/text/PlainView.java,
libraries/javalib/javax/swing/text/SimpleAttributeSet.java:
Resynced with GNU Classpath.
2004-09-26 Michael Koch <[EMAIL PROTECTED]>
* javax/swing/SpinnerNumberModel.java
(SpinnerNumberModel): Implements java.io.Serializable.
(serialVersionUID): New field.
(SpinnerNumberModel): Added missing @throws tags to javadocs.
(getMinimum): New method.
(setMinimum): Likewise.
(getMaximum): Likewise.
(setMaximum): Likewise.
(getStepSize): Likewise.
(setStepSize): Likewise.
2004-09-26 Kim Ho <[EMAIL PROTECTED]>
* javax/swing/plaf/basic/BasicArrowButton.java:
Jalopy. Reimplement.
* javax/swing/plaf/basic/BasicScrollBarUI.java:
Jalopy.
(arrowIcon, upIcon, downIcon, leftIcon,
rightIcon): Removed.
(createIncreaseButton): Use BasicArrowButton.
(createDecreaseButton): Ditto.
* javax/swing/plaf/basic/BasicSplitPaneDivider.java:
(createRightOneTouchButton): Remove button border.
(createLeftOneTouchButton): Ditto.
2004-09-26 Michael Koch <[EMAIL PROTECTED]>
* javax/swing/JTree.java
(ANCHOR_SELECTION_PATH_PROPERTY): New static field.
(CELL_EDITOR_PROPERTY): Likewise.
(CELL_RENDERER_PROPERTY): Likewise.
(EDITABLE_PROPERTY): Likewise.
(EXPANDS_SELECTED_PATHS_PROPERTY): Likewise.
(INVOKES_STOP_CELL_EDITING_PROPERTY): Likewise.
(LARGE_MODEL_PROPERTY): Likewise.
(LEAD_SELECTION_PATH_PROPERTY): Likewise.
(ROOT_VISIBLE_PROPERTY): Likewise.
(ROW_HEIGHT_PROPERTY): Likewise.
(SCROLLS_ON_EXPAND_PROPERTY): Likewise.
(SELECTION_MODEL_PROPERTY): Likewise.
(SHOWS_ROOT_HANDLES_PROPERTY): Likewise.
(TOGGLE_CLICK_COUNT_PROPERTY): Likewise.
(TREE_MODEL_PROPERTY): Likewise.
(VISIBLE_ROW_COUNT_PROPERTY): Likewise.
(cellEditor): New field.
(invokesStopCellEditing): Likewise.
(largeModel): Likewise.
(rowHeight): Likewise.
(scrollsOnExpand): Likewise.
(selectionModel): Likewise.
(toggleClickCount): Likewise.
(visibleRowCount): Likewise.
(setShowsRootHandles): Fixed typo in method name.
(getCellEditor): New method.
(setCellEditor): Likewise.
(getSelectionModel): Likewise.
(setSelectionModel): Likewise.
(getVisibleRowCount): Likewise.
(setVisibleRowCount): Likewise.
(isLargeModel): Likewise.
(setLargeModel): Likewise.
(getRowHeight): Likewise.
(setRowHeight): Likewise.
(getInvokesStopCellEditing): Likewise.
(setInvokesStopCellEditing): Likewise.
(getToggleClickCount): Likewise.
(setToggleClickCount): Likewise.
(getScrollsOnExpand): Likewise.
(setScrollsOnExpand): Likewise.
* javax/swing/table/DefaultTableColumnModel.java
(addColumnModelListener): Fixed javadoc.
(removeColumnModelListener): Implemented. Fixed javadoc.
(getColumnModelListeners): New method.
* javax/swing/table/JTableHeader.java
(columnModel): Made protected.
(draggedColumn): Likewise.
(draggedDistance): Likewise.
(reorderingAllowed): Likewise.
(resizingAllowed): Likewise.
(resizingColumn): Likewise.
(table): Likewise.
(updateTableInRealTime): Likewise.
(createDefaultColumnModel): Renamed from
createDefaultTableColumnModel.
(setDefaultRenderer): New method.
* javax/swing/table/TableColumn.java
(getPropertyChangeListeners): New method.
2004-09-26 Michael Koch <[EMAIL PROTECTED]>
* javax/swing/JPasswordField.java:
Reformated. Implemented construtors.
* javax/swing/plaf/basic/BasicPasswordFieldUI.java
(create): New method.
* javax/swing/text/PlainView.java
(selectedColor): Made package-private to allow access from sub-classes
in same package too.
(unselectedColor): Likewise.
(font): Likewise.
(drawSelectedText): Make protected.
(drawUnselectedText): Likewise.
* javax/swing/text/PasswordView.java: New file.
2004-09-26 Michael Koch <[EMAIL PROTECTED]>
* javax/swing/text/DocumentFilter.java
(FilterBypass): New inner class.
(insertString): New method.
(remove): Likewise.
(replace): Likewise.
* javax/swing/text/NavigationFilter.java
(FilterBypass): New inner class.
(NavigationFilter): New method.
(moveDot): Likewise.
(setDot): Likewise.
2004-09-26 Michael Koch <[EMAIL PROTECTED]>
* javax/swing/text/SimpleAttributeSet.java
(EMPTY): Made public final.
2004-09-26 Michael Koch <[EMAIL PROTECTED]>
* javax/swing/UIManager.java
(get): New method.
(getBoolean): Likewise.
(getBorder): Likewise.
(getColor): Likewise.
(getDimension): Likewise.
(getFont): Likewise.
(getIcon): Likewise.
(getInsets): Likewise.
(getInt): Likewise.
(getString): Likewise.
2004-09-26 Michael Koch <[EMAIL PROTECTED]>
* javax/swing/UIDefaults.java
(removePropertyChangeListener): Made public.
2004-09-25 Michael Koch <[EMAIL PROTECTED]>
* javax/swing/JApplet.java:
Whitespace fixes.
2004-09-25 Michael Koch <[EMAIL PROTECTED]>
* javax/swing/JApplet.java
(rootPaneCheckingEnabled): Renamed from checking.
2004-09-25 Michael Koch <[EMAIL PROTECTED]>
* javax/swing/JTable.java
(getUI): Javadoc added.
(setUI): New method.
2004-09-25 Shashank Bapat <[EMAIL PROTECTED]>
Mark Wielaard <[EMAIL PROTECTED]>
* gnu/regexp/RE.java (initialize): Add RETokenLookAhead support.
* gnu/regexp/RETokenLookAhead.java: New file.
2004-09-25 Michael Koch <[EMAIL PROTECTED]>
* javax/swing/JViewport.java
(getUI): New method.
(setUI): Likewise.
2004-09-25 Michael Koch <[EMAIL PROTECTED]>
* javax/swing/JScrollPane.java
(getUI): New method.
(setUI): Likewise.
2004-09-25 Michael Koch <[EMAIL PROTECTED]>
* javax/swing/JMenu.java
(getMenuListeners): New method.
(fireMenuSelected): Simplified.
2004-09-25 Michael Koch <[EMAIL PROTECTED]>
* javax/swing/JFrame.java
Re-formatted a bit and reordered some methods.
(rootPaneCheckingEnabled): Renamed from checking.
(getPreferredSize): Simplified.
2004-09-25 Michael Koch <[EMAIL PROTECTED]>
* javax/swing/JComponent.java
(isMaximumSizeSet): New method.
(isMinimumSizeSet): Likewise.
(isPreferredSizeSet): Likewise.
2004-09-25 Michael Koch <[EMAIL PROTECTED]>
* javax/swing/JComponent.java
(JComponent): Added javadoc comment.
(setBorder): Fire property change event.
(setEnabled): Likewise.
(setMaximumSize): Likewise.
(setMinimumSize): Likewise.
(setPreferredSize): Likewise.
(setOpaque): Likewise.
2004-09-25 Michael Koch <[EMAIL PROTECTED]>
* javax/swing/JCheckBox.java
(BORDER_PAINTED_FLAT_CHANGED_PROPERTY): New static field.
2004-09-25 Michael Koch <[EMAIL PROTECTED]>
* javax/swing/JApplet.java, javax/swing/JFrame.java:
Re-indented.
Members:
ChangeLog:1.2783->1.2784
libraries/javalib/Makefile.am:1.239->1.240
libraries/javalib/Makefile.in:1.319->1.320
libraries/javalib/all.files:1.27->1.28
libraries/javalib/gnu/regexp/RE.java:1.1->1.2
libraries/javalib/gnu/regexp/RETokenLookAhead.java:1.1->1.2
libraries/javalib/javax/swing/JApplet.java:1.1->1.2
libraries/javalib/javax/swing/JCheckBox.java:1.3->1.4
libraries/javalib/javax/swing/JFrame.java:1.1->1.2
libraries/javalib/javax/swing/JMenu.java:1.4->1.5
libraries/javalib/javax/swing/JPasswordField.java:1.1->1.2
libraries/javalib/javax/swing/JScrollPane.java:1.4->1.5
libraries/javalib/javax/swing/JTable.java:1.4->1.5
libraries/javalib/javax/swing/JTree.java:1.2->1.3
libraries/javalib/javax/swing/JViewport.java:1.3->1.4
libraries/javalib/javax/swing/SpinnerNumberModel.java:1.2->1.3
libraries/javalib/javax/swing/UIDefaults.java:1.3->1.4
libraries/javalib/javax/swing/UIManager.java:1.3->1.4
libraries/javalib/javax/swing/plaf/basic/BasicArrowButton.java:1.4->1.5
libraries/javalib/javax/swing/plaf/basic/BasicPasswordFieldUI.java:1.1->1.2
libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.3->1.4
libraries/javalib/javax/swing/plaf/basic/BasicSplitPaneDivider.java:1.3->1.4
libraries/javalib/javax/swing/table/DefaultTableColumnModel.java:1.4->1.5
libraries/javalib/javax/swing/table/JTableHeader.java:1.3->1.4
libraries/javalib/javax/swing/table/TableColumn.java:1.3->1.4
libraries/javalib/javax/swing/text/DocumentFilter.java:1.1->1.2
libraries/javalib/javax/swing/text/NavigationFilter.java:1.1->1.2
libraries/javalib/javax/swing/text/PasswordView.java:INITIAL->1.1
libraries/javalib/javax/swing/text/PlainView.java:1.2->1.3
libraries/javalib/javax/swing/text/SimpleAttributeSet.java:1.1->1.2
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2783 kaffe/ChangeLog:1.2784
--- kaffe/ChangeLog:1.2783 Tue Sep 28 20:29:06 2004
+++ kaffe/ChangeLog Tue Sep 28 22:45:24 2004
@@ -5,6 +5,260 @@
2004-09-28 Dalibor Topic <[EMAIL PROTECTED]>
+ * libraries/javalib/javax/swing/text/PasswordView.java:
+ New file, added from GNU Classpath.
+
+ * libraries/javalib/Makefile.am,
+ libraries/javalib/Makefile.in,
+ libraries/javalib/all.files:
+ Regenerated.
+
+ * libraries/javalib/gnu/regexp/RE.java,
+ libraries/javalib/gnu/regexp/RETokenLookAhead.java,
+ libraries/javalib/javax/swing/JApplet.java,
+ libraries/javalib/javax/swing/JCheckBox.java,
+ libraries/javalib/javax/swing/JFrame.java,
+ libraries/javalib/javax/swing/JMenu.java,
+ libraries/javalib/javax/swing/JPasswordField.java,
+ libraries/javalib/javax/swing/JScrollPane.java,
+ libraries/javalib/javax/swing/JTable.java,
+ libraries/javalib/javax/swing/JTree.java,
+ libraries/javalib/javax/swing/JViewport.java,
+ libraries/javalib/javax/swing/SpinnerNumberModel.java,
+ libraries/javalib/javax/swing/UIDefaults.java,
+ libraries/javalib/javax/swing/UIManager.java,
+ libraries/javalib/javax/swing/plaf/basic/BasicArrowButton.java,
+ libraries/javalib/javax/swing/plaf/basic/BasicPasswordFieldUI.java,
+ libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java,
+ libraries/javalib/javax/swing/plaf/basic/BasicSplitPaneDivider.java,
+ libraries/javalib/javax/swing/table/DefaultTableColumnModel.java,
+ libraries/javalib/javax/swing/table/JTableHeader.java,
+ libraries/javalib/javax/swing/table/TableColumn.java,
+ libraries/javalib/javax/swing/text/DocumentFilter.java,
+ libraries/javalib/javax/swing/text/NavigationFilter.java,
+ libraries/javalib/javax/swing/text/PlainView.java,
+ libraries/javalib/javax/swing/text/SimpleAttributeSet.java:
+ Resynced with GNU Classpath.
+
+ 2004-09-26 Michael Koch <[EMAIL PROTECTED]>
+
+ * javax/swing/SpinnerNumberModel.java
+ (SpinnerNumberModel): Implements java.io.Serializable.
+ (serialVersionUID): New field.
+ (SpinnerNumberModel): Added missing @throws tags to javadocs.
+ (getMinimum): New method.
+ (setMinimum): Likewise.
+ (getMaximum): Likewise.
+ (setMaximum): Likewise.
+ (getStepSize): Likewise.
+ (setStepSize): Likewise.
+
+ 2004-09-26 Kim Ho <[EMAIL PROTECTED]>
+
+ * javax/swing/plaf/basic/BasicArrowButton.java:
+ Jalopy. Reimplement.
+ * javax/swing/plaf/basic/BasicScrollBarUI.java:
+ Jalopy.
+ (arrowIcon, upIcon, downIcon, leftIcon,
+ rightIcon): Removed.
+ (createIncreaseButton): Use BasicArrowButton.
+ (createDecreaseButton): Ditto.
+ * javax/swing/plaf/basic/BasicSplitPaneDivider.java:
+ (createRightOneTouchButton): Remove button border.
+ (createLeftOneTouchButton): Ditto.
+
+ 2004-09-26 Michael Koch <[EMAIL PROTECTED]>
+
+ * javax/swing/JTree.java
+ (ANCHOR_SELECTION_PATH_PROPERTY): New static field.
+ (CELL_EDITOR_PROPERTY): Likewise.
+ (CELL_RENDERER_PROPERTY): Likewise.
+ (EDITABLE_PROPERTY): Likewise.
+ (EXPANDS_SELECTED_PATHS_PROPERTY): Likewise.
+ (INVOKES_STOP_CELL_EDITING_PROPERTY): Likewise.
+ (LARGE_MODEL_PROPERTY): Likewise.
+ (LEAD_SELECTION_PATH_PROPERTY): Likewise.
+ (ROOT_VISIBLE_PROPERTY): Likewise.
+ (ROW_HEIGHT_PROPERTY): Likewise.
+ (SCROLLS_ON_EXPAND_PROPERTY): Likewise.
+ (SELECTION_MODEL_PROPERTY): Likewise.
+ (SHOWS_ROOT_HANDLES_PROPERTY): Likewise.
+ (TOGGLE_CLICK_COUNT_PROPERTY): Likewise.
+ (TREE_MODEL_PROPERTY): Likewise.
+ (VISIBLE_ROW_COUNT_PROPERTY): Likewise.
+ (cellEditor): New field.
+ (invokesStopCellEditing): Likewise.
+ (largeModel): Likewise.
+ (rowHeight): Likewise.
+ (scrollsOnExpand): Likewise.
+ (selectionModel): Likewise.
+ (toggleClickCount): Likewise.
+ (visibleRowCount): Likewise.
+ (setShowsRootHandles): Fixed typo in method name.
+ (getCellEditor): New method.
+ (setCellEditor): Likewise.
+ (getSelectionModel): Likewise.
+ (setSelectionModel): Likewise.
+ (getVisibleRowCount): Likewise.
+ (setVisibleRowCount): Likewise.
+ (isLargeModel): Likewise.
+ (setLargeModel): Likewise.
+ (getRowHeight): Likewise.
+ (setRowHeight): Likewise.
+ (getInvokesStopCellEditing): Likewise.
+ (setInvokesStopCellEditing): Likewise.
+ (getToggleClickCount): Likewise.
+ (setToggleClickCount): Likewise.
+ (getScrollsOnExpand): Likewise.
+ (setScrollsOnExpand): Likewise.
+ * javax/swing/table/DefaultTableColumnModel.java
+ (addColumnModelListener): Fixed javadoc.
+ (removeColumnModelListener): Implemented. Fixed javadoc.
+ (getColumnModelListeners): New method.
+ * javax/swing/table/JTableHeader.java
+ (columnModel): Made protected.
+ (draggedColumn): Likewise.
+ (draggedDistance): Likewise.
+ (reorderingAllowed): Likewise.
+ (resizingAllowed): Likewise.
+ (resizingColumn): Likewise.
+ (table): Likewise.
+ (updateTableInRealTime): Likewise.
+ (createDefaultColumnModel): Renamed from
+ createDefaultTableColumnModel.
+ (setDefaultRenderer): New method.
+ * javax/swing/table/TableColumn.java
+ (getPropertyChangeListeners): New method.
+
+ 2004-09-26 Michael Koch <[EMAIL PROTECTED]>
+
+ * javax/swing/JPasswordField.java:
+ Reformated. Implemented construtors.
+ * javax/swing/plaf/basic/BasicPasswordFieldUI.java
+ (create): New method.
+ * javax/swing/text/PlainView.java
+ (selectedColor): Made package-private to allow access from sub-classes
+ in same package too.
+ (unselectedColor): Likewise.
+ (font): Likewise.
+ (drawSelectedText): Make protected.
+ (drawUnselectedText): Likewise.
+ * javax/swing/text/PasswordView.java: New file.
+
+ 2004-09-26 Michael Koch <[EMAIL PROTECTED]>
+
+ * javax/swing/text/DocumentFilter.java
+ (FilterBypass): New inner class.
+ (insertString): New method.
+ (remove): Likewise.
+ (replace): Likewise.
+ * javax/swing/text/NavigationFilter.java
+ (FilterBypass): New inner class.
+ (NavigationFilter): New method.
+ (moveDot): Likewise.
+ (setDot): Likewise.
+
+ 2004-09-26 Michael Koch <[EMAIL PROTECTED]>
+
+ * javax/swing/text/SimpleAttributeSet.java
+ (EMPTY): Made public final.
+
+ 2004-09-26 Michael Koch <[EMAIL PROTECTED]>
+
+ * javax/swing/UIManager.java
+ (get): New method.
+ (getBoolean): Likewise.
+ (getBorder): Likewise.
+ (getColor): Likewise.
+ (getDimension): Likewise.
+ (getFont): Likewise.
+ (getIcon): Likewise.
+ (getInsets): Likewise.
+ (getInt): Likewise.
+ (getString): Likewise.
+
+ 2004-09-26 Michael Koch <[EMAIL PROTECTED]>
+
+ * javax/swing/UIDefaults.java
+ (removePropertyChangeListener): Made public.
+
+ 2004-09-25 Michael Koch <[EMAIL PROTECTED]>
+
+ * javax/swing/JApplet.java:
+ Whitespace fixes.
+
+ 2004-09-25 Michael Koch <[EMAIL PROTECTED]>
+
+ * javax/swing/JApplet.java
+ (rootPaneCheckingEnabled): Renamed from checking.
+
+ 2004-09-25 Michael Koch <[EMAIL PROTECTED]>
+
+ * javax/swing/JTable.java
+ (getUI): Javadoc added.
+ (setUI): New method.
+
+ 2004-09-25 Shashank Bapat <[EMAIL PROTECTED]>
+ Mark Wielaard <[EMAIL PROTECTED]>
+
+ * gnu/regexp/RE.java (initialize): Add RETokenLookAhead support.
+ * gnu/regexp/RETokenLookAhead.java: New file.
+
+ 2004-09-25 Michael Koch <[EMAIL PROTECTED]>
+
+ * javax/swing/JViewport.java
+ (getUI): New method.
+ (setUI): Likewise.
+
+ 2004-09-25 Michael Koch <[EMAIL PROTECTED]>
+
+ * javax/swing/JScrollPane.java
+ (getUI): New method.
+ (setUI): Likewise.
+
+ 2004-09-25 Michael Koch <[EMAIL PROTECTED]>
+
+ * javax/swing/JMenu.java
+ (getMenuListeners): New method.
+ (fireMenuSelected): Simplified.
+
+ 2004-09-25 Michael Koch <[EMAIL PROTECTED]>
+
+ * javax/swing/JFrame.java
+ Re-formatted a bit and reordered some methods.
+ (rootPaneCheckingEnabled): Renamed from checking.
+ (getPreferredSize): Simplified.
+
+ 2004-09-25 Michael Koch <[EMAIL PROTECTED]>
+
+ * javax/swing/JComponent.java
+ (isMaximumSizeSet): New method.
+ (isMinimumSizeSet): Likewise.
+ (isPreferredSizeSet): Likewise.
+
+ 2004-09-25 Michael Koch <[EMAIL PROTECTED]>
+
+ * javax/swing/JComponent.java
+ (JComponent): Added javadoc comment.
+ (setBorder): Fire property change event.
+ (setEnabled): Likewise.
+ (setMaximumSize): Likewise.
+ (setMinimumSize): Likewise.
+ (setPreferredSize): Likewise.
+ (setOpaque): Likewise.
+
+ 2004-09-25 Michael Koch <[EMAIL PROTECTED]>
+
+ * javax/swing/JCheckBox.java
+ (BORDER_PAINTED_FLAT_CHANGED_PROPERTY): New static field.
+
+ 2004-09-25 Michael Koch <[EMAIL PROTECTED]>
+
+ * javax/swing/JApplet.java, javax/swing/JFrame.java:
+ Re-indented.
+
+2004-09-28 Dalibor Topic <[EMAIL PROTECTED]>
+
* libraries/javalib/java/security/BasicPermission.java:
Resynced with GNU Classpath.
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.239
kaffe/libraries/javalib/Makefile.am:1.240
--- kaffe/libraries/javalib/Makefile.am:1.239 Mon Sep 27 17:40:59 2004
+++ kaffe/libraries/javalib/Makefile.am Tue Sep 28 22:45:28 2004
@@ -3335,6 +3335,7 @@
javax/swing/text/LayeredHighlighter.java \
javax/swing/text/MutableAttributeSet.java \
javax/swing/text/NavigationFilter.java \
+ javax/swing/text/PasswordView.java \
javax/swing/text/PlainDocument.java \
javax/swing/text/PlainView.java \
javax/swing/text/Position.java \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.319
kaffe/libraries/javalib/Makefile.in:1.320
--- kaffe/libraries/javalib/Makefile.in:1.319 Mon Sep 27 17:41:02 2004
+++ kaffe/libraries/javalib/Makefile.in Tue Sep 28 22:45:28 2004
@@ -3871,6 +3871,7 @@
javax/swing/text/LayeredHighlighter.java \
javax/swing/text/MutableAttributeSet.java \
javax/swing/text/NavigationFilter.java \
+ javax/swing/text/PasswordView.java \
javax/swing/text/PlainDocument.java \
javax/swing/text/PlainView.java \
javax/swing/text/Position.java \
Index: kaffe/libraries/javalib/all.files
diff -u kaffe/libraries/javalib/all.files:1.27 kaffe/libraries/javalib/all.files:1.28
--- kaffe/libraries/javalib/all.files:1.27 Mon Sep 27 17:41:03 2004
+++ kaffe/libraries/javalib/all.files Tue Sep 28 22:45:29 2004
@@ -2823,6 +2823,7 @@
javax/swing/text/LayeredHighlighter.java
javax/swing/text/MutableAttributeSet.java
javax/swing/text/NavigationFilter.java
+javax/swing/text/PasswordView.java
javax/swing/text/PlainDocument.java
javax/swing/text/PlainView.java
javax/swing/text/Position.java
Index: kaffe/libraries/javalib/gnu/regexp/RE.java
diff -u kaffe/libraries/javalib/gnu/regexp/RE.java:1.1
kaffe/libraries/javalib/gnu/regexp/RE.java:1.2
--- kaffe/libraries/javalib/gnu/regexp/RE.java:1.1 Thu Nov 28 10:23:18 2002
+++ kaffe/libraries/javalib/gnu/regexp/RE.java Tue Sep 28 22:45:29 2004
@@ -1,25 +1,42 @@
-/*
- * gnu/regexp/RE.java
- * Copyright (C) 1998-2001 Wes Biggs
- *
- * 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 program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
+/* gnu/regexp/RE.java
+ Copyright (C) 1998-2001, 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath 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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
package gnu.regexp;
import java.io.InputStream;
-import java.io.Reader;
import java.io.Serializable;
import java.util.Locale;
import java.util.PropertyResourceBundle;
@@ -70,8 +87,8 @@
* <P>
*
* These methods all have similar argument lists. The input can be a
- * String, a character array, a StringBuffer, a Reader or an
- * InputStream of some sort. Note that when using a Reader or
+ * String, a character array, a StringBuffer, or an
+ * InputStream of some sort. Note that when using an
* InputStream, the stream read position cannot be guaranteed after
* attempting a match (this is not a bug, but a consequence of the way
* regular expressions work). Using an REMatchEnumeration can
@@ -82,9 +99,9 @@
* The optional index argument specifies the offset from the beginning
* of the text at which the search should start (see the descriptions
* of some of the execution flags for how this can affect positional
- * pattern operators). For a Reader or InputStream, this means an
+ * pattern operators). For an InputStream, this means an
* offset from the current read position, so subsequent calls with the
- * same index argument on a Reader or an InputStream will not
+ * same index argument on an InputStream will not
* necessarily access the same position on the stream, whereas
* repeated searches at a given index in a fixed string will return
* consistent results.
@@ -1346,8 +1363,6 @@
return new CharIndexedStringBuffer((StringBuffer) input,index);
else if (input instanceof InputStream)
return new CharIndexedInputStream((InputStream) input,index);
- else if (input instanceof Reader)
- return new CharIndexedReader((Reader) input, index);
else if (input instanceof CharIndexed)
return (CharIndexed) input; // do we lose index info?
else
Index: kaffe/libraries/javalib/gnu/regexp/RETokenLookAhead.java
diff -u kaffe/libraries/javalib/gnu/regexp/RETokenLookAhead.java:1.1
kaffe/libraries/javalib/gnu/regexp/RETokenLookAhead.java:1.2
--- kaffe/libraries/javalib/gnu/regexp/RETokenLookAhead.java:1.1 Thu Nov 28
10:23:18 2002
+++ kaffe/libraries/javalib/gnu/regexp/RETokenLookAhead.java Tue Sep 28 22:45:29
2004
@@ -1,21 +1,40 @@
-/*
- * gnu/regexp/RETokenOneOf.java
- * Copyright (C) 1998-2001 Wes Biggs
- *
- * 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 program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
+/* gnu/regexp/RETokenLookAhead.java
+ Copyright (C) 1998-2001, 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath 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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
package gnu.regexp;
/**
Index: kaffe/libraries/javalib/javax/swing/JApplet.java
diff -u kaffe/libraries/javalib/javax/swing/JApplet.java:1.1
kaffe/libraries/javalib/javax/swing/JApplet.java:1.2
--- kaffe/libraries/javalib/javax/swing/JApplet.java:1.1 Thu Jul 22 19:37:18
2004
+++ kaffe/libraries/javalib/javax/swing/JApplet.java Tue Sep 28 22:45:29 2004
@@ -1,4 +1,4 @@
-/* JApplet.java --
+/* JApplet.java --
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -35,7 +35,6 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
-
package javax.swing;
import java.applet.Applet;
@@ -49,167 +48,198 @@
import java.awt.event.WindowEvent;
import javax.accessibility.AccessibleContext;
-public class JApplet extends Applet implements RootPaneContainer
+
+public class JApplet extends Applet
+ implements RootPaneContainer
{
private static final long serialVersionUID = 7269359214497372587L;
-
- public final static int HIDE_ON_CLOSE = 0;
- public final static int EXIT_ON_CLOSE = 1;
- public final static int DISPOSE_ON_CLOSE = 2;
- public final static int DO_NOTHING_ON_CLOSE = 3;
-
- private int close_action = EXIT_ON_CLOSE;
- private boolean checking;
- protected JRootPane rootPane;
-
- public JApplet()
- {
- frameInit();
- }
- public JApplet(String title)
- {
- frameInit();
- }
-
- protected void frameInit()
- {
- super.setLayout(new BorderLayout(1, 1));
- getRootPane(); // will do set/create
- }
+ public static final int HIDE_ON_CLOSE = 0;
+ public static final int EXIT_ON_CLOSE = 1;
+ public static final int DISPOSE_ON_CLOSE = 2;
+ public static final int DO_NOTHING_ON_CLOSE = 3;
+
+ private int close_action = EXIT_ON_CLOSE;
+
+ protected JRootPane rootPane;
+ protected boolean rootPaneCheckingEnabled;
+
+ public JApplet()
+ {
+ frameInit();
+ }
+
+ public JApplet(String title)
+ {
+ frameInit();
+ }
+
+ protected void frameInit()
+ {
+ super.setLayout(new BorderLayout(1, 1));
+ getRootPane(); // will do set/create
+ }
public Dimension getPreferredSize()
{
Dimension d = super.getPreferredSize();
- System.out.println("JFrame.getPrefSize(): " + d + " , comp="+ getComponentCount
() + ", layout=" + getLayout());
+ System.out.println("JFrame.getPrefSize(): " + d + " , comp="
+ + getComponentCount() + ", layout=" + getLayout());
return d;
}
- public void setLayout(LayoutManager manager)
- { super.setLayout(manager); }
+ public void setLayout(LayoutManager manager)
+ {
+ super.setLayout(manager);
+ }
- public void setLayeredPane(JLayeredPane layeredPane)
- { getRootPane().setLayeredPane(layeredPane); }
-
- public JLayeredPane getLayeredPane()
- { return getRootPane().getLayeredPane(); }
-
- public JRootPane getRootPane()
- {
- if (rootPane == null)
- setRootPane(createRootPane());
- return rootPane;
- }
-
- public void setRootPane(JRootPane root)
- {
- if (rootPane != null)
- remove(rootPane);
-
- rootPane = root;
- add(rootPane, BorderLayout.CENTER);
- }
+ public void setLayeredPane(JLayeredPane layeredPane)
+ {
+ getRootPane().setLayeredPane(layeredPane);
+ }
- public JRootPane createRootPane()
- { return new JRootPane(); }
+ public JLayeredPane getLayeredPane()
+ {
+ return getRootPane().getLayeredPane();
+ }
- public Container getContentPane()
- { return getRootPane().getContentPane(); }
+ public JRootPane getRootPane()
+ {
+ if (rootPane == null)
+ setRootPane(createRootPane());
+ return rootPane;
+ }
- public void setContentPane(Container contentPane)
- { getRootPane().setContentPane(contentPane); }
-
- public Component getGlassPane()
- { return getRootPane().getGlassPane(); }
-
- public void setGlassPane(Component glassPane)
- { getRootPane().setGlassPane(glassPane); }
+ public void setRootPane(JRootPane root)
+ {
+ if (rootPane != null)
+ remove(rootPane);
+ rootPane = root;
+ add(rootPane, BorderLayout.CENTER);
+ }
- /////////////////////////////////////////////////////////////////////////////////
- protected void addImpl(Component comp, Object constraints, int index)
- { super.addImpl(comp, constraints, index); }
-
- public AccessibleContext getAccessibleContext()
- { return null; }
-
- int getDefaultCloseOperation()
- { return close_action; }
+ public JRootPane createRootPane()
+ {
+ return new JRootPane();
+ }
-
- public JMenuBar getJMenuBar()
- { return getRootPane().getJMenuBar(); }
-
- public void setJMenuBar(JMenuBar menubar)
- { getRootPane().setJMenuBar(menubar); }
-
-
- protected String paramString()
- { return "JFrame"; }
-
- protected void processKeyEvent(KeyEvent e)
- { super.processKeyEvent(e); }
-
- protected void processWindowEvent(WindowEvent e)
- {
- // System.out.println("PROCESS_WIN_EV-1: " + e);
-
- // super.processWindowEvent(e);
-
- // System.out.println("PROCESS_WIN_EV-2: " + e);
- switch (e.getID())
- {
- case WindowEvent.WINDOW_CLOSING:
- {
- switch(close_action)
- {
- case EXIT_ON_CLOSE:
- {
- System.out.println("user requested exit on close");
- System.exit(1);
- break;
- }
- case DISPOSE_ON_CLOSE:
- {
- System.out.println("user requested dispose on close");
- //dispose();
- break;
- }
- case HIDE_ON_CLOSE:
-
- case DO_NOTHING_ON_CLOSE:
- break;
- }
- break;
- }
-
- case WindowEvent.WINDOW_CLOSED:
- case WindowEvent.WINDOW_OPENED:
- case WindowEvent.WINDOW_ICONIFIED:
- case WindowEvent.WINDOW_DEICONIFIED:
- case WindowEvent.WINDOW_ACTIVATED:
- case WindowEvent.WINDOW_DEACTIVATED:
- break;
- }
- }
-
+ public Container getContentPane()
+ {
+ return getRootPane().getContentPane();
+ }
- public void remove(Component comp)
- { getContentPane().remove(comp); }
-
+ public void setContentPane(Container contentPane)
+ {
+ getRootPane().setContentPane(contentPane);
+ }
- void setDefaultCloseOperation(int operation)
- { close_action = operation; }
+ public Component getGlassPane()
+ {
+ return getRootPane().getGlassPane();
+ }
*** Patch too long, truncated ***
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
