[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: swing, awt, logging and documentation fixes
Kaffe CVS
cvs-commits at kaffe.org
Tue Jul 26 02:04:18 PDT 2005
PatchSet 6767
Date: 2005/07/26 08:58:29
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: swing, awt, logging and documentation fixes
Members:
ChangeLog:1.4292->1.4293
libraries/javalib/gnu/java/net/protocol/http/HTTPURLConnection.java:1.13->1.14
libraries/javalib/java/awt/AWTEvent.java:1.24->1.25
libraries/javalib/java/awt/MediaTracker.java:1.21->1.22
libraries/javalib/java/text/SimpleDateFormat.java:1.53->1.54
libraries/javalib/java/util/jar/JarFile.java:1.11->1.12
libraries/javalib/java/util/logging/FileHandler.java:1.8->1.9
libraries/javalib/java/util/logging/LogManager.java:1.12->1.13
libraries/javalib/java/util/logging/Logger.java:1.8->1.9
libraries/javalib/javax/accessibility/AccessibleComponent.java:1.3->1.4
libraries/javalib/javax/accessibility/AccessibleRelation.java:1.3->1.4
libraries/javalib/javax/accessibility/AccessibleRelationSet.java:1.3->1.4
libraries/javalib/javax/accessibility/AccessibleResourceBundle.java:1.3->1.4
libraries/javalib/javax/accessibility/AccessibleRole.java:1.3->1.4
libraries/javalib/javax/accessibility/AccessibleState.java:1.3->1.4
libraries/javalib/javax/accessibility/AccessibleStateSet.java:1.3->1.4
libraries/javalib/javax/accessibility/AccessibleText.java:1.5->1.6
libraries/javalib/javax/swing/AbstractButton.java:1.18->1.19
libraries/javalib/javax/swing/BoundedRangeModel.java:1.3->1.4
libraries/javalib/javax/swing/ButtonModel.java:1.3->1.4
libraries/javalib/javax/swing/CellEditor.java:1.3->1.4
libraries/javalib/javax/swing/ComboBoxEditor.java:1.3->1.4
libraries/javalib/javax/swing/ComboBoxModel.java:1.3->1.4
libraries/javalib/javax/swing/DefaultButtonModel.java:1.10->1.11
libraries/javalib/javax/swing/Icon.java:1.2->1.3
libraries/javalib/javax/swing/JApplet.java:1.8->1.9
libraries/javalib/javax/swing/JButton.java:1.7->1.8
libraries/javalib/javax/swing/JCheckBox.java:1.5->1.6
libraries/javalib/javax/swing/JComboBox.java:1.9->1.10
libraries/javalib/javax/swing/JDialog.java:1.7->1.8
libraries/javalib/javax/swing/JFrame.java:1.10->1.11
libraries/javalib/javax/swing/JMenu.java:1.14->1.15
libraries/javalib/javax/swing/JRadioButton.java:1.7->1.8
libraries/javalib/javax/swing/JToggleButton.java:1.9->1.10
libraries/javalib/javax/swing/JTree.java:1.22->1.23
libraries/javalib/javax/swing/JWindow.java:1.10->1.11
libraries/javalib/javax/swing/ListCellRenderer.java:1.2->1.3
libraries/javalib/javax/swing/ListModel.java:1.3->1.4
libraries/javalib/javax/swing/ListSelectionModel.java:1.2->1.3
libraries/javalib/javax/swing/LookAndFeel.java:1.5->1.6
libraries/javalib/javax/swing/MenuElement.java:1.2->1.3
libraries/javalib/javax/swing/MutableComboBoxModel.java:1.3->1.4
libraries/javalib/javax/swing/Renderer.java:1.2->1.3
libraries/javalib/javax/swing/RootPaneContainer.java:1.3->1.4
libraries/javalib/javax/swing/ScrollPaneConstants.java:1.2->1.3
libraries/javalib/javax/swing/Scrollable.java:1.2->1.3
libraries/javalib/javax/swing/SingleSelectionModel.java:1.2->1.3
libraries/javalib/javax/swing/SpinnerModel.java:1.4->1.5
libraries/javalib/javax/swing/SwingConstants.java:1.2->1.3
libraries/javalib/javax/swing/UIDefaults.java:1.10->1.11
libraries/javalib/javax/swing/WindowConstants.java:1.2->1.3
libraries/javalib/javax/swing/package.html:1.3->1.4
libraries/javalib/javax/swing/plaf/basic/BasicFileChooserUI.java:1.5->1.6
libraries/javalib/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java:1.8->1.9
libraries/javalib/javax/swing/plaf/basic/BasicInternalFrameUI.java:1.9->1.10
libraries/javalib/javax/swing/plaf/basic/BasicListUI.java:1.16->1.17
libraries/javalib/javax/swing/plaf/basic/BasicLookAndFeel.java:1.18->1.19
libraries/javalib/javax/swing/plaf/basic/BasicMenuItemUI.java:1.8->1.9
libraries/javalib/javax/swing/plaf/basic/BasicPopupMenuUI.java:1.11->1.12
libraries/javalib/javax/swing/plaf/basic/BasicTreeUI.java:1.11->1.12
libraries/javalib/javax/swing/plaf/metal/DefaultMetalTheme.java:1.3->1.4
libraries/javalib/javax/swing/plaf/metal/MetalLookAndFeel.java:1.14->1.15
libraries/javalib/javax/swing/plaf/metal/MetalTheme.java:1.5->1.6
libraries/javalib/javax/swing/plaf/metal/MetalTreeUI.java:1.2->1.3
libraries/javalib/javax/swing/table/TableColumn.java:1.8->1.9
libraries/javalib/javax/swing/table/TableColumnModel.java:1.5->1.6
libraries/javalib/javax/swing/text/JTextComponent.java:1.20->1.21
libraries/javalib/javax/swing/text/html/parser/ParserDelegator.java:1.6->1.7
libraries/javalib/javax/swing/tree/DefaultMutableTreeNode.java:1.6->1.7
libraries/javalib/javax/swing/tree/DefaultTreeCellRenderer.java:1.7->1.8
libraries/javalib/javax/swing/tree/DefaultTreeSelectionModel.java:1.13->1.14
libraries/javalib/javax/swing/tree/MutableTreeNode.java:1.3->1.4
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4292 kaffe/ChangeLog:1.4293
--- kaffe/ChangeLog:1.4292 Mon Jul 25 16:03:20 2005
+++ kaffe/ChangeLog Tue Jul 26 08:58:29 2005
@@ -2,6 +2,373 @@
Resynced with GNU Classpath.
+ 2005-07-14 Lillian Angel <langel at redhat.com>
+ * javax/swing/plaf/basic/BasicTreeUI.java
+ (paintControlIcons): Changed so root does not have control icon.
+
+ 2005-07-14 Lillian Angel <langel at redhat.com>
+ * javax/swing/plaf/basic/BasicTreeUI.java
+ (installUI): Expanded root initially
+ (paint): call function to paint controls
+ (paintRecursive): added to indentation when painting to increase space
+ (paintControlIcons): Implemented to recursively paint the control icons.
+ * javax/swing/tree/DefaultTreeCellRenderer.java
+ (getTreeCellRendererComponent): reset the font properly
+
+ 2005-07-14 Roman Kennke <roman at kennke.org>
+
+ * javax/swing/AbstractButton.java
+ (getActionCommand): If both the actionCommand and text fields
+ are null, then return "".
+
+ 2005-07-14 Guilhem Lavaux <guilhem at kaffe.org>
+
+ * java/util/logging/Logger.java
+ (resetLogger): Remove all handlers from the handler list.
+
+ * java/util/logging/LogManager.java
+ (reset): Call resetLogger() too.
+ (readConfiguration): Call reset().
+
+ 2005-07-14 Mark Wielaard <mark at klomp.org>
+
+ * gnu/java/net/protocol/http/HTTPURLConnection.java
+ (proxyHostname, proxyPort, agent, keepAlive, maxConnections):
+ Likewise.
+ * java/text/SimpleDateFormat.java (field, size): Likewise.
+ * java/util/jar/JarFile.java (readSignatures): Likewise.
+ * java/util/logging/FileHandler.java (written): Likewise.
+ * javax/swing/plaf/basic/BasicFileChooserUI.java: Make shared
+ fields package private.
+ (closeDialog): Make package private.
+ (filterEntries): Likewise.
+ * javax/swing/plaf/basic/BasicPopupMenuUI.java
+ (mouseInputListener): Likewise.
+ * javax/swing/plaf/basic/BasicTreeUI.java
+ (getNextVisibleNode, getPreviousVisibleNode, selectPath): Likewise.
+ * javax/swing/text/JTextComponent.java (caret, editable): Likewise.
+
+ 2005-07-14 Robert Schuster <robertschuster at fsfe.org>
+
+ * javax/swing/AbstractButton.java: Minor doc fixes.
+ (getActionCommand): Access field directly.
+ (setActionCommand): Dito.
+ (fireActionPerformed): Copy ActionEvent instance instead
+ of reusing it.
+
+ 2005-07-13 Roman Kennke <roman at kennke.org>
+
+ * javax/swing/BoundedRangeModel.java:
+ Added/Fixed interface API documentation.
+ * javax/swing/ButtonModel.java:
+ Added/Fixed interface API documentation.
+ * javax/swing/CellEditor.java:
+ Added/Fixed interface API documentation.
+ * javax/swing/ComboBoxEditor.java:
+ Added/Fixed interface API documentation.
+ * javax/swing/ComboBoxModel.java:
+ Added/Fixed interface API documentation.
+ * javax/swing/Icon.java:
+ Added/Fixed interface API documentation.
+ * javax/swing/JComboBox.java
+ (KeySelectionManager): Added/Fixed interface API documentation.
+ * javax/swing/ListCellRenderer.java:
+ Added/Fixed interface API documentation.
+ * javax/swing/ListModel.java:
+ Added/Fixed interface API documentation.
+ * javax/swing/ListSelectionModel.java:
+ Added/Fixed interface API documentation.
+ * javax/swing/MenuElement.java:
+ Added/Fixed interface API documentation.
+ * javax/swing/MutableComboBoxModel.java:
+ Added/Fixed interface API documentation.
+ * javax/swing/Renderer.java:
+ Added/Fixed interface API documentation.
+ * javax/swing/RootPaneContainer.java:
+ Added/Fixed interface API documentation.
+ * javax/swing/ScrollPaneConstants.java:
+ Added/Fixed interface API documentation.
+ * javax/swing/Scrollable.java:
+ Added/Fixed interface API documentation.
+ * javax/swing/SingleSelectionModel.java:
+ Added/Fixed interface API documentation.
+: * javax/swing/SpinnerModel.java:
+ Added/Fixed interface API documentation.
+ * javax/swing/SwingConstants.java:
+ Added/Fixed interface API documentation.
+ * javax/swing/UIDefaults.java
+ (ActiveValue): interface API documentation.
+ (LazyValue): interface API documentation.
+ * javax/swing/WindowConstants.java:
+ Added/Fixed interface API documentation.
+ * javax/swing/package.html: Fixed package description to be more
+ a little bit more concise.
+
+ 2005-07-13 Lillian Angel <langel at redhat.com>
+
+ * javax/swing/plaf/basic/BasicLookAndFeel.java: Changed font to
+ match jdk.
+ * javax/swing/plaf/basic/BasicTreeUI.java: took out unneeded
+ import statement
+ * javax/swing/plaf/metal/MetalLookAndFeel.java: Changed
+ defaults to match jdk.
+
+ 2005-07-13 Lillian Angel <langel at redhat.com>
+
+ * javax/swing/plaf/basic/BasicLookAndFeel.java: Changed rowHeight
+ to the right height. This should be fixed later to something more
+ reasonable, as opposed to a 'magic' number.
+ * javax/swing/plaf/basic/BasicTreeUI.java
+ (paintLeaf): added in code to paint icons properly
+ (paintNonLeaf): same as above
+ * javax/swing/plaf/metal/MetalLookAndFeel.java: Changed default
+ icons to MetalIconFactory icons
+ * javax/swing/tree/DefaultTreeCellRenderer.java
+ (getTreeCellRendererComponent): Changed to paint icons separately from
+ Cell.
+
+ 2005-07-13 Anthony Balkissoon <abalkiss at redhat.com>
+
+ * javax/swing/plaf/basic/BasicListUI.java:
+ (KeyHandler.keyPressed): Implemented actions for the following key
+ presses: "ctrl \\", "END", "shift END", "HOME, "shift HOME", "ctrl /",
+ "ctrl A", "ctrl SPACE", "KP_UP", "KP_DOWN", "shift KP_UP",
+ "shift KP_DOWN".
+
+ 2005-07-13 Anthony Balkissoon <abalkiss at redhat.com>
+
+ * javax/swing/DefaultButtonModel.java:
+ (changeState): Removed this helper method.
+ (setArmed): Replaced call to changeState by code specific to setArmed.
+ (setEnabled): Likewise, for setEnabled.
+ (setPressed): Likewise, for setPressed.
+ (setRollover): Likewise, for setRollover.
+ (setSelected): Likewise, for setSelected.
+ * javax/swing/JToggleButton.java:
+ (ToggleButtonModel.setPressed): Replaced call to super.setPressed with
+ Toggle-specific code.
+ (ToggleButtonModel.setSelected): New method. Fire an ActionEvent in
+ addition to calling super.setSelected.
+
+ 2005-07-13 David Gilbert <david.gilbert at object-refinery.com>
+
+ * javax/accessibility/AccessibleComponent.java: minor API doc fixes,
+ * javax/accessibility/AccessibleRelation.java: likewise,
+ * javax/accessibility/AccessibleRelationSet.java: likewise,
+ * javax/accessibility/AccessibleResourceBundle.java: likewise,
+ * javax/accessibility/AccessibleRole.java: likewise,
+ * javax/accessibility/AccessibleState.java: likewise,
+ * javax/accessibility/AccessibleStateSet.java: likewise,
+ * javax/accessibility/AccessibleText.java: likewise.
+
+ 2005-07-13 Robert Schuster <robertschuster at fsfe.org>
+
+ * java/awt/AWTEvent.java:
+ (toString): Generalized string generation.
+
+ 2005-07-13 David Gilbert <david.gilbert at object-refinery.com>
+
+ * javax/swing/LookAndFeel.java: added API docs all over,
+ * javax/swing/plaf/metal/DefaultMetalTheme.java: likewise,
+ * javax/swing/plaf/metal/MetalLookAndFeel.java: likewise,
+ * javax/swing/plaf/metal/MetalTheme.java: likewise.
+
+ 2005-07-13 David Gilbert <david.gilbert at object-refinery.com>
+
+ * javax/swing/table/TableColumn.java: updated API docs,
+ * javax/swing/table/TableColumnModel.java: likewise.
+
+ 2005-07-13 David Gilbert <david.gilbert at object-refinery.com>
+
+ * java/util/zip/Inflater.java: minor API doc fixes.
+
+ 2005-07-13 David Gilbert <david.gilbert at object-refinery.com>
+
+ * javax/swing/tree/DefaultMutableTreeNode.java: minor API doc fixes,
+ * javax/swing/tree/DefaultTreeSelectionModel.java
+ (addSelectionPath): modified parameter name to match doc comment,
+ (addSelectionPaths): likewise,
+ (removeSelectionPath): likewise,
+ (removeSelectionPaths): likewise,
+ (isPathSelected): likewise,
+ plus other minor API doc fixes all over.
+ * javax/swing/tree/MutableTreeNode.java: minor API doc fixes.
+
+ 2005-07-13 Robert Schuster <robertschuster at fsfe.org>
+
+ * javax/swing/AbstractButton.java: Minimal documentation fixes.
+ (getActionCommand): Returns button's label when
+ actionCommand is null.
+ * javax/swing/JButton.java,
+ javax/swing/JToggleButton.java: Removed explicit call to
+ setActionCommand in constructors.
+
+ 2005-07-13 Robert Schuster <robertschuster at fsfe.org>
+
+ * javax/swing/JToggleButton.java:
+ (paramString): Returns value of same method in superclass now.
+ * javax/swing/JRadioButton.java:
+ (paramString): Dito.
+ * javax/swing/JButton.java:
+ (paramString): Returns value of same method in superclass now,
+ more verbose information added.
+ * javax/swing/JCheckBox.java:
+ (paramString): Dito.
+
+ 2005-07-12 Anthony Balkissoon <abalkiss at redhat.com>
+
+ * javax/swing/plaf/basic/BasicMenuItemUI.java:
+ (paintMenuItem): Replaced incorrect hilighting criteria.
+ (paintText): Likewise.
+
+ 2005-07-12 Lillian Angel <langel at redhat.com>
+
+ * javax/swing/plaf/basic/BasicTreeUI.java
+ (paintLeaf): fixed size of selection background to depend on
+ if icon exists
+ (paintNonLeaf): fixed size of selection background to depend on
+ if icon exists
+
+ 2005-07-12 Anthony Balkissoon <abalkiss at redhat.com>
+
+ * javax/swing/DefaultButtonModel.java:
+ (changeState): If the button is a JToggleButton fire action events
+ when it changes between (selected/unselected) not when it changes
+ from pressed to unpressed. Fire action events after firing
+ ItemStateChanged events.
+
+ 2005-07-12 Lillian Angel <langel at redhat.com>
+
+ * javax/swing/JTree.java:
+ Formatting copyright
+ * javax/swing/tree/DefaultTreeCellRenderer.java:
+ Formatting copyright
+ * javax/swing/tree/DefaultTreeSelectionModel.java:
+ Formatting copyright
+
+ 2005-07-12 Roman Kennke <roman at kennke.org>
+
+ * javax/swing/plaf/metal/MetalTreeUI.java
+ (createUI): Return a different instance of MetalTreeUI for each
+ JTree. The TreeUI is stateful, so a shared instance would not
+ work.
+
+ 2005-07-12 Roman Kennke <roman at kennke.org>
+
+ * javax/swing/plaf/basic/BasicTreeUI.java
+ I accidentally introduced revalidate calls for repaint calls.
+ Reverted.
+
+ 2005-07-12 Roman Kennke <roman at kennke.org>
+
+ * javax/swing/plaf/basic/BasicTreeUI.java
+ Fixed formatting of the copyright notice.
+
+ 2005-07-12 Roman Kennke <roman at kennke.org>
+
+ * javax/swing/plaf/basic/BasicInternalFrameUI.java
+ (installDefaults): Create border based on defaults in current
+ LookAndFeel.
+ * javax/swing/plaf/basic/BasicLookAndFeel.java
+ (initComponentDefaults): Included border for InternalFrame as
+ LazyValue.
+
+ 2005-07-12 Lillian Angel <langel at redhat.com>
+
+ * javax/swing/plaf/basic/BasicLookAndFeel.java:
+ Took out icon defaults.
+ * javax/swing/plaf/basic/BasicTreeUI.java
+ (installUI): set root to visible
+ (getCellBounds): took out addition to width since there may not be
+ an icon.
+ * javax/swing/plaf/metal/MetalLookAndFeel.java:
+ Added in icon defaults
+
+ 2005-07-12 Roman Kennke <roman at kennke.org>
+
+ * javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
+ Removed ad-hoc icons. Replaced them by
+ BasicIconFactory.createEmptyFrameIcon just like in the JDK.
+ (PropertyChangeHandler.propertyChange): Handle change events
+ for closable, iconifiable and maximizable here.
+ (createButtons): Recognize if the JInternalFrame is closable,
+ iconifiable or maximizable.
+
+ 2005-07-12 Roman Kennke <roman at kennke.org>
+
+ * javax/swing/plaf/basic/BasicLookAndFeel.java
+ (initComponentDefaults): Corrected color values for BasicL&F buttons.
+
+ 2005-07-12 Anthony Balkissoon <abalkiss at redhat.com>
+
+ * javax/swing/JMenu.java:
+ (isSelected): Call super.isSelected() instead of super.isArmed().
+ * javax/swing/plaf/basic/BasicMenuItemUI.java:
+ (paintMenuItem): Replaced incorrect selection criteria with call to
+ isSelected().
+ (paintText): Likewise.
+
+ 2005-07-12 Lillian Angel <langel at redhat.com>
+
+ * javax/swing/plaf/basic/BasicLookAndFeel.java
+ Changed default color of text non selection background.
+ * javax/swing/plaf/basic/BasicTreeUI.java
+ Removed irrelevant comment
+ * javax/swing/tree/DefaultTreeCellRenderer.java
+ (getTreeCellRendererComponent): changed to use background's non
+ selection default color instead
+
+ 2005-07-12 Roman Kennke <roman at kennke.org>
+
+ * javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
+ (TitlePaneLayout.layoutContainer): Do not change any state of
+ the components here (visible/enableActions). This is not the purpose of
+ a layout manager and can lead to loops. Also correct the layout
+ to be closer to the layout of the reference implementation.
+ (TitlePaneLayout.preferredLayoutSize): Return (22, 18)
+ here. That is what the JDK returns for the title bar.
+ (PaneButton): Don't set the border to null.
+ (createButtons): The buttons are opaque.
+ (createButtonIcons): Don't create icons in the Basic L&F.
+
+ 2005-07-12 Anthony Balkissoon <abalkiss at redhat.com>
+
+ * javax/swing/JApplet.java,
+ * javax/swing/JDialog.java,
+ * javax/swing/JFrame.java,
+ * javax/swing/JWindow.java:
+ (addImpl): Add to the frame itself if we are in the init
+ stage, otherwise add to the contentPane.
+
+ 2005-07-12 Mark Wielaard <mark at klomp.org>
+
+ * java/awt/MediaTracker.java (checkAll): Set and check status of
+ MediaEntry with checkImage() if prepareImage() returns false.
+ (statusAll): Likewise.
+ (checkID): Likewise.
+ (statusID): Likewise.
+
+ 2005-07-12 Mark Wielaard <mark at klomp.org>
+
+ * javax/swing/text/JTextComponent.java
+ (CaretBlinkTimer.actionPerformed): Check that caret != null.
+ (CaretBlinkTimer.update): Likewise.
+
+ 2005-07-12 Mark Wielaard <mark at klomp.org>
+
+ Reported by Simon Kitching <skitching at apache.org>
+ * java/lang/String.java (toCharArray): Return value.clone() when
+ count == value.length.
+
+ 2005-07-12 Audrius Meskauskas <AudriusA at Bioinformatics.org>
+
+ * javax/swing/text/html/parser/ParserDelegator.java (gnuParser.getDTD):
+ Added comment about 'super'.
+
+2005-07-25 Dalibor Topic <robilad at kaffe.org>
+
+ Resynced with GNU Classpath.
+
2005-07-11 Thomas Fitzsimmons <fitzsim at redhat.com>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c:
Index: kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPURLConnection.java
diff -u kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPURLConnection.java:1.13 kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPURLConnection.java:1.14
--- kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPURLConnection.java:1.13 Thu Jul 7 23:17:25 2005
+++ kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPURLConnection.java Tue Jul 26 08:58:33 2005
@@ -82,11 +82,12 @@
*/
private HTTPConnection connection;
- private String proxyHostname;
- private int proxyPort;
- private String agent;
- private boolean keepAlive;
- private int maxConnections;
+ // These are package private for use in anonymous inner classes.
+ String proxyHostname;
+ int proxyPort;
+ String agent;
+ boolean keepAlive;
+ int maxConnections;
private Request request;
private Headers requestHeaders;
Index: kaffe/libraries/javalib/java/awt/AWTEvent.java
diff -u kaffe/libraries/javalib/java/awt/AWTEvent.java:1.24 kaffe/libraries/javalib/java/awt/AWTEvent.java:1.25
--- kaffe/libraries/javalib/java/awt/AWTEvent.java:1.24 Mon Jul 4 00:06:00 2005
+++ kaffe/libraries/javalib/java/awt/AWTEvent.java Tue Jul 26 08:58:34 2005
@@ -1,3 +1,4 @@
+
/* AWTEvent.java -- the root event in AWT
Copyright (C) 1999, 2000, 2002, 2005 Free Software Foundation
@@ -238,16 +239,7 @@
*/
public String toString ()
{
- String string = null;
-
- if (source instanceof Component)
- string = getClass ().getName () + "[" + paramString () + "] on "
- + ((Component) source).getName ();
- else if (source instanceof MenuComponent)
- string = getClass ().getName () + "[" + paramString () + "] on "
- + ((MenuComponent) source).getName ();
- else
- string = getClass ().getName () + "[" + paramString () + "] on "
+ String string = getClass ().getName () + "[" + paramString () + "] on "
+ source;
return string;
Index: kaffe/libraries/javalib/java/awt/MediaTracker.java
diff -u kaffe/libraries/javalib/java/awt/MediaTracker.java:1.21 kaffe/libraries/javalib/java/awt/MediaTracker.java:1.22
--- kaffe/libraries/javalib/java/awt/MediaTracker.java:1.21 Wed Jul 6 13:21:17 2005
+++ kaffe/libraries/javalib/java/awt/MediaTracker.java Tue Jul 26 08:58:34 2005
@@ -241,15 +241,24 @@
{
if (load && ((e.status & LOADING) == 0))
{
- e.status = LOADING;
- result = false;
- boolean complete = target.prepareImage(e.image, e);
- if (complete)
- {
- e.status = COMPLETE;
- result = true;
- }
- }
+ if (target.prepareImage(e.image, e))
+ e.status = COMPLETE;
+ else
+ {
+ e.status = LOADING;
+ int flags = target.checkImage(e.image, e);
+ if ((flags & ImageObserver.ABORT) != 0)
+ e.status = ABORTED;
+ else if ((flags & ImageObserver.ERROR) != 0)
+ e.status = ERRORED;
+ else if ((flags & ImageObserver.ALLBITS) != 0)
+ e.status = COMPLETE;
+ }
+ boolean complete = (e.status
+ & (COMPLETE | ABORTED | ERRORED)) != 0;
+ if (!complete)
+ result = false;
+ }
else
result = false;
}
@@ -373,11 +382,19 @@
{
if (load && e.status == 0)
{
- boolean complete = target.prepareImage(e.image, e);
- if (complete)
+ if (target.prepareImage(e.image, e))
e.status = COMPLETE;
else
- e.status = LOADING;
+ {
+ e.status = LOADING;
+ int flags = target.checkImage(e.image, e);
+ if ((flags & ImageObserver.ABORT) != 0)
+ e.status = ABORTED;
+ else if ((flags & ImageObserver.ERROR) != 0)
+ e.status = ERRORED;
+ else if ((flags & ImageObserver.ALLBITS) != 0)
+ e.status = COMPLETE;
+ }
}
result |= e.status;
e = e.next;
@@ -422,13 +439,22 @@
if (load && ((e.status & LOADING) == 0))
{
e.status = LOADING;
- result = false;
- boolean complete = target.prepareImage(e.image, e);
- if (complete)
- {
- e.status = COMPLETE;
- result = true;
- }
+ if (target.prepareImage(e.image, e))
+ e.status = COMPLETE;
+ else
+ {
+ int flags = target.checkImage(e.image, e);
+ if ((flags & ImageObserver.ABORT) != 0)
+ e.status = ABORTED;
+ else if ((flags & ImageObserver.ERROR) != 0)
+ e.status = ERRORED;
+ else if ((flags & ImageObserver.ALLBITS) != 0)
+ e.status = COMPLETE;
+ }
+ boolean complete = (e.status
+ & (COMPLETE | ABORTED | ERRORED)) != 0;
+ if (!complete)
+ result = false;
}
else
result = false;
@@ -567,11 +593,19 @@
{
if (load && e.status == 0)
{
- boolean complete = target.prepareImage(e.image, e);
- if (complete)
+ if (target.prepareImage(e.image, e))
e.status = COMPLETE;
- else
- e.status = LOADING;
+ else
+ {
+ e.status = LOADING;
+ int flags = target.checkImage(e.image, e);
+ if ((flags & ImageObserver.ABORT) != 0)
+ e.status = ABORTED;
+ else if ((flags & ImageObserver.ERROR) != 0)
+ e.status = ERRORED;
+ else if ((flags & ImageObserver.ALLBITS) != 0)
+ e.status = COMPLETE;
+ }
}
result |= e.status;
}
Index: kaffe/libraries/javalib/java/text/SimpleDateFormat.java
diff -u kaffe/libraries/javalib/java/text/SimpleDateFormat.java:1.53 kaffe/libraries/javalib/java/text/SimpleDateFormat.java:1.54
--- kaffe/libraries/javalib/java/text/SimpleDateFormat.java:1.53 Mon Jul 4 00:07:23 2005
+++ kaffe/libraries/javalib/java/text/SimpleDateFormat.java Tue Jul 26 08:58:34 2005
@@ -73,14 +73,16 @@
private class CompiledField
{
/**
- * The ID of the field within the local pattern characters,
+ * The ID of the field within the local pattern characters.
+ * Package private for use in out class.
*/
- private int field;
+ int field;
/**
* The size of the character sequence.
+ * Package private for use in out class.
*/
- private int size;
+ int size;
/**
* The character used.
Index: kaffe/libraries/javalib/java/util/jar/JarFile.java
diff -u kaffe/libraries/javalib/java/util/jar/JarFile.java:1.11 kaffe/libraries/javalib/java/util/jar/JarFile.java:1.12
--- kaffe/libraries/javalib/java/util/jar/JarFile.java:1.11 Mon Jul 4 00:07:28 2005
+++ kaffe/libraries/javalib/java/util/jar/JarFile.java Tue Jul 26 08:58:35 2005
@@ -495,7 +495,8 @@
}
// Only called with lock on this JarFile.
- private void readSignatures() throws IOException
+ // Package private for use in inner classes.
+ void readSignatures() throws IOException
{
Map pkcs7Dsa = new HashMap();
Map pkcs7Rsa = new HashMap();
Index: kaffe/libraries/javalib/java/util/logging/FileHandler.java
diff -u kaffe/libraries/javalib/java/util/logging/FileHandler.java:1.8 kaffe/libraries/javalib/java/util/logging/FileHandler.java:1.9
--- kaffe/libraries/javalib/java/util/logging/FileHandler.java:1.8 Sun Jul 10 02:11:40 2005
+++ kaffe/libraries/javalib/java/util/logging/FileHandler.java Tue Jul 26 08:58:35 2005
@@ -228,8 +228,9 @@
/**
* The number of bytes that have currently been written to the stream.
+ * Package private for use in inner classes.
*/
- private long written;
+ long written;
/**
Index: kaffe/libraries/javalib/java/util/logging/LogManager.java
diff -u kaffe/libraries/javalib/java/util/logging/LogManager.java:1.12 kaffe/libraries/javalib/java/util/logging/LogManager.java:1.13
--- kaffe/libraries/javalib/java/util/logging/LogManager.java:1.12 Mon Jul 4 00:07:29 2005
+++ kaffe/libraries/javalib/java/util/logging/LogManager.java Tue Jul 26 08:58:35 2005
@@ -446,11 +446,15 @@
if (logger == null)
iter.remove();
else if (logger != rootLogger)
- logger.setLevel(null);
+ {
+ logger.resetLogger();
+ logger.setLevel(null);
+ }
}
}
rootLogger.setLevel(Level.INFO);
+ rootLogger.resetLogger();
}
/**
@@ -513,6 +517,7 @@
checkAccess();
newProperties = new Properties();
newProperties.load(inputStream);
+ reset();
this.properties = newProperties;
keys = newProperties.propertyNames();
@@ -534,7 +539,7 @@
String handlerName = tokenizer.nextToken();
try
{
- Class handlerClass = Class.forName(handlerName);
+ Class handlerClass = ClassLoader.getSystemClassLoader().loadClass(handlerName);
getLogger("").addHandler((Handler) handlerClass
.newInstance());
}
Index: kaffe/libraries/javalib/java/util/logging/Logger.java
diff -u kaffe/libraries/javalib/java/util/logging/Logger.java:1.8 kaffe/libraries/javalib/java/util/logging/Logger.java:1.9
--- kaffe/libraries/javalib/java/util/logging/Logger.java:1.8 Mon Jul 4 00:07:30 2005
+++ kaffe/libraries/javalib/java/util/logging/Logger.java Tue Jul 26 08:58:35 2005
@@ -1181,4 +1181,17 @@
return stackTrace[index];
}
+ /**
+ * Reset and close handlers attached to this logger. This function is package
+ * private because it must only be avaiable to the LogManager.
+ */
+ void resetLogger()
+ {
+ for (int i = 0; i < handlers.length; i++)
+ {
+ handlers[i].close();
+ handlerList.remove(handlers[i]);
+ }
+ handlers = getHandlers();
+ }
}
Index: kaffe/libraries/javalib/javax/accessibility/AccessibleComponent.java
diff -u kaffe/libraries/javalib/javax/accessibility/AccessibleComponent.java:1.3 kaffe/libraries/javalib/javax/accessibility/AccessibleComponent.java:1.4
--- kaffe/libraries/javalib/javax/accessibility/AccessibleComponent.java:1.3 Mon Jul 4 00:07:33 2005
+++ kaffe/libraries/javalib/javax/accessibility/AccessibleComponent.java Tue Jul 26 08:58:35 2005
@@ -117,7 +117,7 @@
* Get the font of this component
*
* @return the font of the component, or null if not supported
- * @see setFont(Font)
+ * @see #setFont(Font)
*/
Font getFont();
Index: kaffe/libraries/javalib/javax/accessibility/AccessibleRelation.java
diff -u kaffe/libraries/javalib/javax/accessibility/AccessibleRelation.java:1.3 kaffe/libraries/javalib/javax/accessibility/AccessibleRelation.java:1.4
--- kaffe/libraries/javalib/javax/accessibility/AccessibleRelation.java:1.3 Mon Jul 4 00:07:33 2005
+++ kaffe/libraries/javalib/javax/accessibility/AccessibleRelation.java Tue Jul 26 08:58:35 2005
@@ -1,5 +1,5 @@
/* AccessibleRelation.java -- the relation between accessible objects
- Copyright (C) 2002 Free Software Foundation
+ Copyright (C) 2002, 2005 Free Software Foundation
This file is part of GNU Classpath.
@@ -36,6 +36,8 @@
exception statement from your version. */
package javax.accessibility;
+
+import java.util.Locale;
/**
* The relation between one accessible object and one or more other objects.
Index: kaffe/libraries/javalib/javax/accessibility/AccessibleRelationSet.java
diff -u kaffe/libraries/javalib/javax/accessibility/AccessibleRelationSet.java:1.3 kaffe/libraries/javalib/javax/accessibility/AccessibleRelationSet.java:1.4
--- kaffe/libraries/javalib/javax/accessibility/AccessibleRelationSet.java:1.3 Mon Jul 4 00:07:33 2005
+++ kaffe/libraries/javalib/javax/accessibility/AccessibleRelationSet.java Tue Jul 26 08:58:35 2005
@@ -1,5 +1,5 @@
/* AccessibleRelationSet.java -- the combined relations of an accessible object
- Copyright (C) 2002 Free Software Foundation
+ Copyright (C) 2002, 2005 Free Software Foundation
This file is part of GNU Classpath.
@@ -37,6 +37,7 @@
package javax.accessibility;
+import java.util.Locale;
import java.util.Vector;
/**
@@ -159,7 +160,7 @@
/**
* Check if the relation key is in the set.
*
- * @param relation the relation to locate
+ * @param key the relation to locate
* @return true if it is in the set
*/
public boolean contains(String key)
@@ -174,7 +175,7 @@
/**
* Get the relation that matches the key.
*
- * @param relation the relation to locate
+ * @param key the relation to locate
* @return the relation in the set, or null
*/
public AccessibleRelation get(String key)
Index: kaffe/libraries/javalib/javax/accessibility/AccessibleResourceBundle.java
diff -u kaffe/libraries/javalib/javax/accessibility/AccessibleResourceBundle.java:1.3 kaffe/libraries/javalib/javax/accessibility/AccessibleResourceBundle.java:1.4
--- kaffe/libraries/javalib/javax/accessibility/AccessibleResourceBundle.java:1.3 Mon Jul 4 00:07:33 2005
+++ kaffe/libraries/javalib/javax/accessibility/AccessibleResourceBundle.java Tue Jul 26 08:58:35 2005
@@ -39,13 +39,14 @@
package javax.accessibility;
import java.util.ListResourceBundle;
+import java.util.Locale;
/**
* This class is deprecated. It once was used for localizing accessibility
* strings, and was never meant for external use anyway.
*
* @author Eric Blake (ebb9 at email.byu.edu)
- * @see AccessibleBundle.toDisplayString(String, Locale)
+ * @see AccessibleBundle#toDisplayString(String, Locale)
* @since 1.2
* @deprecated this class is no longer used
* @status updated to 1.4
Index: kaffe/libraries/javalib/javax/accessibility/AccessibleRole.java
diff -u kaffe/libraries/javalib/javax/accessibility/AccessibleRole.java:1.3 kaffe/libraries/javalib/javax/accessibility/AccessibleRole.java:1.4
--- kaffe/libraries/javalib/javax/accessibility/AccessibleRole.java:1.3 Mon Jul 4 00:07:33 2005
+++ kaffe/libraries/javalib/javax/accessibility/AccessibleRole.java Tue Jul 26 08:58:35 2005
@@ -1,5 +1,5 @@
/* AccessibleRole.java -- the primary role of an accessible object
- Copyright (C) 2002 Free Software Foundation
+ Copyright (C) 2002, 2005 Free Software Foundation
This file is part of GNU Classpath.
@@ -36,6 +36,8 @@
exception statement from your version. */
package javax.accessibility;
+
+import java.util.Locale;
/**
* The role of an accessible object. For example, this could be "button" or
Index: kaffe/libraries/javalib/javax/accessibility/AccessibleState.java
diff -u kaffe/libraries/javalib/javax/accessibility/AccessibleState.java:1.3 kaffe/libraries/javalib/javax/accessibility/AccessibleState.java:1.4
--- kaffe/libraries/javalib/javax/accessibility/AccessibleState.java:1.3 Mon Jul 4 00:07:33 2005
+++ kaffe/libraries/javalib/javax/accessibility/AccessibleState.java Tue Jul 26 08:58:35 2005
@@ -1,5 +1,5 @@
/* AccessibleState.java -- a state of an accessible object
- Copyright (C) 2002 Free Software Foundation
+ Copyright (C) 2002, 2005 Free Software Foundation
This file is part of GNU Classpath.
@@ -36,6 +36,9 @@
exception statement from your version. */
package javax.accessibility;
+
+import java.awt.Dimension;
+import java.util.Locale;
/**
* A state portion of an accessible object. A combination of states represent
Index: kaffe/libraries/javalib/javax/accessibility/AccessibleStateSet.java
diff -u kaffe/libraries/javalib/javax/accessibility/AccessibleStateSet.java:1.3 kaffe/libraries/javalib/javax/accessibility/AccessibleStateSet.java:1.4
--- kaffe/libraries/javalib/javax/accessibility/AccessibleStateSet.java:1.3 Mon Jul 4 00:07:33 2005
+++ kaffe/libraries/javalib/javax/accessibility/AccessibleStateSet.java Tue Jul 26 08:58:35 2005
@@ -1,5 +1,5 @@
/* AccessibleStateSet.java -- the combined state of an accessible object
- Copyright (C) 2002 Free Software Foundation
+ Copyright (C) 2002, 2005 Free Software Foundation
This file is part of GNU Classpath.
@@ -37,6 +37,7 @@
package javax.accessibility;
+import java.util.Locale;
import java.util.Vector;
/**
Index: kaffe/libraries/javalib/javax/accessibility/AccessibleText.java
diff -u kaffe/libraries/javalib/javax/accessibility/AccessibleText.java:1.5 kaffe/libraries/javalib/javax/accessibility/AccessibleText.java:1.6
--- kaffe/libraries/javalib/javax/accessibility/AccessibleText.java:1.5 Mon Jul 4 00:07:33 2005
+++ kaffe/libraries/javalib/javax/accessibility/AccessibleText.java Tue Jul 26 08:58:35 2005
@@ -125,7 +125,7 @@
* Returns the section of text at the index, or null if the index or part
* is invalid.
*
- * @param part {@link CHARACTER}, {@link WORD}, or {@link SENTENCE}
+ * @param part {@link #CHARACTER}, {@link #WORD}, or {@link #SENTENCE}
* @param index the 0-based character index
* @return the selection of text at that index, or null
*/
@@ -135,7 +135,7 @@
* Returns the section of text after the index, or null if the index or part
* is invalid.
*
- * @param part {@link CHARACTER}, {@link WORD}, or {@link SENTENCE}
+ * @param part {@link #CHARACTER}, {@link #WORD}, or {@link #SENTENCE}
* @param index the 0-based character index
* @return the selection of text after that index, or null
*/
@@ -145,7 +145,7 @@
* Returns the section of text before the index, or null if the index or part
* is invalid.
*
- * @param part {@link CHARACTER}, {@link WORD}, or {@link SENTENCE}
+ * @param part {@link #CHARACTER}, {@link #WORD}, or {@link #SENTENCE}
* @param index the 0-based character index
* @return the selection of text before that index, or null
*/
Index: kaffe/libraries/javalib/javax/swing/AbstractButton.java
diff -u kaffe/libraries/javalib/javax/swing/AbstractButton.java:1.18 kaffe/libraries/javalib/javax/swing/AbstractButton.java:1.19
--- kaffe/libraries/javalib/javax/swing/AbstractButton.java:1.18 Thu Jul 7 02:19:02 2005
+++ kaffe/libraries/javalib/javax/swing/AbstractButton.java Tue Jul 26 08:58:36 2005
@@ -598,24 +598,33 @@
}
/**
- * Get the action command string for this button's model.
+ * <p>Returns the action command string for this button's model.</p>
+ *
+ * <p>If the action command was set to <code>null</code>, the button's
+ * text (label) is returned instead.</p>
*
* @return The current action command string from the button's model
*/
public String getActionCommand()
{
- return getModel().getActionCommand();
+ String ac = model.getActionCommand();
+ if (ac != null)
+ return ac;
+ else if (text != null)
+ return text;
+ else
+ return "";
}
/**
- * Set the action command string for this button's model.
+ * Sets the action command string for this button's model.
*
- * @param aCommand The new action command string to set in the button's
+ * @param actionCommand The new action command string to set in the button's
* model.
*/
- public void setActionCommand(String aCommand)
+ public void setActionCommand(String actionCommand)
{
- getModel().setActionCommand(aCommand);
+ model.setActionCommand(actionCommand);
}
/**
@@ -744,11 +753,19 @@
*/
protected void fireActionPerformed(ActionEvent e)
{
- e.setSource(this);
+ // Dispatch a copy of the given ActionEvent in order to
+ // set the source and action command correctly.
+ ActionEvent ae = new ActionEvent(
+ this,
+ e.getID(),
+ getActionCommand(),
+ e.getWhen(),
+ e.getModifiers());
+
ActionListener[] listeners = getActionListeners();
for (int i = 0; i < listeners.length; i++)
- listeners[i].actionPerformed(e);
+ listeners[i].actionPerformed(ae);
}
/**
Index: kaffe/libraries/javalib/javax/swing/BoundedRangeModel.java
diff -u kaffe/libraries/javalib/javax/swing/BoundedRangeModel.java:1.3 kaffe/libraries/javalib/javax/swing/BoundedRangeModel.java:1.4
--- kaffe/libraries/javalib/javax/swing/BoundedRangeModel.java:1.3 Mon Jul 4 00:08:09 2005
+++ kaffe/libraries/javalib/javax/swing/BoundedRangeModel.java Tue Jul 26 08:58:36 2005
@@ -41,6 +41,9 @@
import javax.swing.event.ChangeListener;
/**
+ * The data model that is used in components that display a range of values,
+ * like {@link JProgressBar} and {@link JSlider}.
+ *
* @author Andrew Selkirk
*/
public interface BoundedRangeModel
Index: kaffe/libraries/javalib/javax/swing/ButtonModel.java
diff -u kaffe/libraries/javalib/javax/swing/ButtonModel.java:1.3 kaffe/libraries/javalib/javax/swing/ButtonModel.java:1.4
*** Patch too long, truncated ***
More information about the kaffe
mailing list