[kaffe] CVS kaffe (robilad): Resynced with GNU classpath: awt, swing, xml, io, ...

Kaffe CVS cvs-commits at kaffe.org
Sat Jul 9 19:16:11 PDT 2005


PatchSet 6718 
Date: 2005/07/10 02:11:27
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU classpath: awt, swing, xml, io, ...

Members: 
	ChangeLog:1.4242->1.4243 
	libraries/javalib/Makefile.am:1.372->1.373 
	libraries/javalib/Makefile.in:1.462->1.463 
	libraries/javalib/all.files:1.143->1.144 
	libraries/javalib/gnu/classpath/SystemProperties.java:1.7->1.8 
	libraries/javalib/gnu/java/awt/FocusManager.java:INITIAL->1.1 
	libraries/javalib/gnu/xml/transform/AbstractNumberNode.java:1.5->1.6 
	libraries/javalib/gnu/xml/transform/ApplyImportsNode.java:1.5->1.6 
	libraries/javalib/gnu/xml/transform/ApplyTemplatesNode.java:1.5->1.6 
	libraries/javalib/gnu/xml/transform/AttributeNode.java:1.5->1.6 
	libraries/javalib/gnu/xml/transform/Bindings.java:1.5->1.6 
	libraries/javalib/gnu/xml/transform/CallTemplateNode.java:1.5->1.6 
	libraries/javalib/gnu/xml/transform/CopyOfNode.java:1.5->1.6 
	libraries/javalib/gnu/xml/transform/CurrentFunction.java:1.3->1.4 
	libraries/javalib/gnu/xml/transform/DocumentFunction.java:1.5->1.6 
	libraries/javalib/gnu/xml/transform/ElementAvailableFunction.java:1.3->1.4 
	libraries/javalib/gnu/xml/transform/ElementNode.java:1.5->1.6 
	libraries/javalib/gnu/xml/transform/ForEachNode.java:1.5->1.6 
	libraries/javalib/gnu/xml/transform/FormatNumberFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/transform/FunctionAvailableFunction.java:1.3->1.4 
	libraries/javalib/gnu/xml/transform/GenerateIdFunction.java:1.3->1.4 
	libraries/javalib/gnu/xml/transform/IfNode.java:1.5->1.6 
	libraries/javalib/gnu/xml/transform/KeyFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/transform/ParameterNode.java:1.5->1.6 
	libraries/javalib/gnu/xml/transform/SortKey.java:1.4->1.5 
	libraries/javalib/gnu/xml/transform/StreamSerializer.java:1.8->1.9 
	libraries/javalib/gnu/xml/transform/Stylesheet.java:1.8->1.9 
	libraries/javalib/gnu/xml/transform/SystemPropertyFunction.java:1.5->1.6 
	libraries/javalib/gnu/xml/transform/TemplateNode.java:1.5->1.6 
	libraries/javalib/gnu/xml/transform/TransformerImpl.java:1.8->1.9 
	libraries/javalib/gnu/xml/transform/UnparsedEntityUriFunction.java:1.3->1.4 
	libraries/javalib/gnu/xml/transform/ValueOfNode.java:1.6->1.7 
	libraries/javalib/gnu/xml/transform/WhenNode.java:1.5->1.6 
	libraries/javalib/gnu/xml/transform/WithParam.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/AndExpr.java:1.5->1.6 
	libraries/javalib/gnu/xml/xpath/ArithmeticExpr.java:1.5->1.6 
	libraries/javalib/gnu/xml/xpath/BooleanFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/CeilingFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/ConcatFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/Constant.java:1.5->1.6 
	libraries/javalib/gnu/xml/xpath/ContainsFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/CountFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/EqualityExpr.java:1.6->1.7 
	libraries/javalib/gnu/xml/xpath/Expr.java:1.9->1.10 
	libraries/javalib/gnu/xml/xpath/FalseFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/FloorFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/FunctionCall.java:1.8->1.9 
	libraries/javalib/gnu/xml/xpath/IdFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/LangFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/LastFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/LocalNameFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/NameFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/NameTest.java:1.9->1.10 
	libraries/javalib/gnu/xml/xpath/NamespaceTest.java:1.5->1.6 
	libraries/javalib/gnu/xml/xpath/NamespaceUriFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/NegativeExpr.java:1.5->1.6 
	libraries/javalib/gnu/xml/xpath/NodeTypeTest.java:1.6->1.7 
	libraries/javalib/gnu/xml/xpath/NormalizeSpaceFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/NotFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/NumberFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/OrExpr.java:1.5->1.6 
	libraries/javalib/gnu/xml/xpath/ParenthesizedExpr.java:1.5->1.6 
	libraries/javalib/gnu/xml/xpath/Pattern.java:1.3->1.4 
	libraries/javalib/gnu/xml/xpath/PositionFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/Predicate.java:1.5->1.6 
	libraries/javalib/gnu/xml/xpath/RelationalExpr.java:1.6->1.7 
	libraries/javalib/gnu/xml/xpath/Root.java:1.6->1.7 
	libraries/javalib/gnu/xml/xpath/RoundFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/Selector.java:1.7->1.8 
	libraries/javalib/gnu/xml/xpath/StartsWithFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/Steps.java:1.3->1.4 
	libraries/javalib/gnu/xml/xpath/StringFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/StringLengthFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/SubstringAfterFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/SubstringBeforeFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/SubstringFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/SumFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/Test.java:1.6->1.7 
	libraries/javalib/gnu/xml/xpath/TranslateFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/TrueFunction.java:1.4->1.5 
	libraries/javalib/gnu/xml/xpath/UnionExpr.java:1.6->1.7 
	libraries/javalib/gnu/xml/xpath/VariableReference.java:1.5->1.6 
	libraries/javalib/gnu/xml/xpath/XPathParser.java:1.9->1.10 
	libraries/javalib/gnu/xml/xpath/XPathParser.y:1.7->1.8 
	libraries/javalib/java/awt/KeyboardFocusManager.java:1.11->1.12 
	libraries/javalib/java/io/ObjectStreamClass.java:1.32->1.33 
	libraries/javalib/java/net/URLClassLoader.java:1.26->1.27 
	libraries/javalib/java/util/logging/FileHandler.java:1.7->1.8 
	libraries/javalib/javax/swing/FocusManager.java:1.5->1.6 
	libraries/javalib/javax/swing/JMenu.java:1.12->1.13 
	libraries/javalib/javax/swing/JProgressBar.java:1.5->1.6 
	libraries/javalib/javax/swing/filechooser/FileSystemView.java:1.3->1.4 
	libraries/javalib/javax/swing/plaf/basic/BasicButtonUI.java:1.9->1.10 
	libraries/javalib/javax/swing/plaf/basic/BasicComboBoxEditor.java:1.4->1.5 
	libraries/javalib/javax/swing/plaf/basic/BasicFileChooserUI.java:1.4->1.5 
	libraries/javalib/javax/swing/plaf/basic/BasicGraphicsUtils.java:1.6->1.7 
	libraries/javalib/javax/swing/plaf/basic/BasicLabelUI.java:1.5->1.6 
	libraries/javalib/javax/swing/plaf/basic/BasicListUI.java:1.15->1.16 
	libraries/javalib/javax/swing/plaf/basic/BasicLookAndFeel.java:1.14->1.15 
	libraries/javalib/javax/swing/plaf/basic/BasicMenuBarUI.java:1.7->1.8 
	libraries/javalib/javax/swing/plaf/basic/BasicMenuUI.java:1.7->1.8 
	libraries/javalib/javax/swing/plaf/basic/BasicPopupMenuUI.java:1.10->1.11 
	libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.16->1.17 
	libraries/javalib/javax/swing/plaf/basic/BasicSpinnerUI.java:1.5->1.6 
	libraries/javalib/javax/swing/plaf/basic/BasicSplitPaneDivider.java:1.8->1.9 
	libraries/javalib/javax/swing/plaf/basic/BasicTableUI.java:1.8->1.9 
	libraries/javalib/javax/swing/plaf/basic/BasicTextUI.java:1.16->1.17 
	libraries/javalib/javax/swing/plaf/basic/BasicToolTipUI.java:1.3->1.4 
	libraries/javalib/javax/swing/plaf/basic/BasicTreeUI.java:1.8->1.9 
	libraries/javalib/javax/swing/plaf/metal/MetalIconFactory.java:INITIAL->1.1 
	libraries/javalib/javax/swing/plaf/metal/MetalLookAndFeel.java:1.13->1.14 
	libraries/javalib/javax/xml/namespace/QName.java:1.9->1.10 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4242 kaffe/ChangeLog:1.4243
--- kaffe/ChangeLog:1.4242	Sat Jul  9 16:21:27 2005
+++ kaffe/ChangeLog	Sun Jul 10 02:11:27 2005
@@ -1,5 +1,252 @@
 2005-07-09  Dalibor Topic  <robilad at kaffe.org>
 
+	Resynced with GNU classpath.
+
+	2005-07-09  Chris Burdess  <dog at gnu.org>
+
+        * gnu/xml/transform/AbstractNumberNode.java,
+        gnu/xml/transform/ApplyImportsNode.java,
+        gnu/xml/transform/ApplyTemplatesNode.java,
+        gnu/xml/transform/AttributeNode.java,
+        gnu/xml/transform/Bindings.java,
+        gnu/xml/transform/CallTemplateNode.java,
+        gnu/xml/transform/CopyOfNode.java,
+        gnu/xml/transform/CurrentFunction.java,
+        gnu/xml/transform/DocumentFunction.java,
+        gnu/xml/transform/ElementAvailableFunction.java,
+        gnu/xml/transform/ElementNode.java,
+        gnu/xml/transform/ForEachNode.java,
+        gnu/xml/transform/FormatNumberFunction.java,
+        gnu/xml/transform/FunctionAvailableFunction.java,
+        gnu/xml/transform/GenerateIdFunction.java,
+        gnu/xml/transform/IfNode.java,
+        gnu/xml/transform/KeyFunction.java,
+        gnu/xml/transform/ParameterNode.java,
+        gnu/xml/transform/SortKey.java,
+        gnu/xml/transform/StreamSerializer.java,
+        gnu/xml/transform/Stylesheet.java,
+        gnu/xml/transform/SystemPropertyFunction.java,
+        gnu/xml/transform/TemplateNode.java,
+        gnu/xml/transform/TransformerImpl.java,
+        gnu/xml/transform/UnparsedEntityUriFunction.java,
+        gnu/xml/transform/ValueOfNode.java,
+        gnu/xml/transform/WhenNode.java,
+        gnu/xml/transform/WithParam.java,
+        gnu/xml/xpath/AndExpr.java,
+        gnu/xml/xpath/ArithmeticExpr.java,
+        gnu/xml/xpath/BooleanFunction.java,
+        gnu/xml/xpath/CeilingFunction.java,
+        gnu/xml/xpath/ConcatFunction.java,
+        gnu/xml/xpath/Constant.java,
+        gnu/xml/xpath/ContainsFunction.java,
+        gnu/xml/xpath/CountFunction.java,
+        gnu/xml/xpath/EqualityExpr.java,
+        gnu/xml/xpath/Expr.java,
+        gnu/xml/xpath/FalseFunction.java,
+        gnu/xml/xpath/FloorFunction.java,
+        gnu/xml/xpath/FunctionCall.java,
+        gnu/xml/xpath/IdFunction.java,
+        gnu/xml/xpath/LangFunction.java,
+        gnu/xml/xpath/LastFunction.java,
+        gnu/xml/xpath/LocalNameFunction.java,
+        gnu/xml/xpath/NameFunction.java,
+        gnu/xml/xpath/NameTest.java,
+        gnu/xml/xpath/NamespaceTest.java,
+        gnu/xml/xpath/NamespaceUriFunction.java,
+        gnu/xml/xpath/NegativeExpr.java,
+        gnu/xml/xpath/NodeTypeTest.java,
+        gnu/xml/xpath/NormalizeSpaceFunction.java,
+        gnu/xml/xpath/NotFunction.java,
+        gnu/xml/xpath/NumberFunction.java,
+        gnu/xml/xpath/OrExpr.java,
+        gnu/xml/xpath/ParenthesizedExpr.java,
+        gnu/xml/xpath/Pattern.java,
+        gnu/xml/xpath/PositionFunction.java,
+        gnu/xml/xpath/Predicate.java,
+        gnu/xml/xpath/RelationalExpr.java,
+        gnu/xml/xpath/Root.java,
+        gnu/xml/xpath/RoundFunction.java,
+        gnu/xml/xpath/Selector.java,
+        gnu/xml/xpath/StartsWithFunction.java,
+        gnu/xml/xpath/Steps.java,
+        gnu/xml/xpath/StringFunction.java,
+        gnu/xml/xpath/StringLengthFunction.java,
+        gnu/xml/xpath/SubstringAfterFunction.java,
+        gnu/xml/xpath/SubstringBeforeFunction.java,
+        gnu/xml/xpath/SubstringFunction.java,
+        gnu/xml/xpath/SumFunction.java,
+        gnu/xml/xpath/Test.java,
+        gnu/xml/xpath/TranslateFunction.java,
+        gnu/xml/xpath/TrueFunction.java,
+        gnu/xml/xpath/UnionExpr.java,
+        gnu/xml/xpath/VariableReference.java,
+        gnu/xml/xpath/XPathParser.java,
+        gnu/xml/xpath/XPathParser.y,
+        javax/xml/namespace/QName.java: Corrections to handling of XSL
+        variables and minor conformance updates.
+
+	2005-07-09  Archie Cobbs  <archie at dellroad.org>
+
+        * java/net/URLClassLoader.java: disallow directories as resources
+
+	2005-07-09  Casey Marshall  <csm at gnu.org>
+
+        * java/util/logging/FileHandler.java
+        (written): new field.
+        (logFiles): new field.
+        (<init>): initialize the OutputStream last.
+        (createFileStream): made non-static; append '.%g' to 'pattern'
+        if not included; open existing files if 'append' is set; return
+        byte-counting stream; use 'has', not 'String.indexOf'.
+        (publish): rotate the file if we go beyond the byte limit; flush
+        the stream after publishing each record.
+        (rotate): new method.
+        (has): new method.
+        (ostr): new member class.
+
+	2005-07-08  Anthony Balkissoon  <abalkiss at redhat.com>
+
+        * javax/swing/plaf/basic/BasicFileChooserUI.java:
+        (ApproveSelectionAction.actionPerformed): Allow directories to be
+        selected unless selection mode is FILES_ONLY.
+
+	2005-07-08  David Gilbert  <david.gilbert at object-refinery.com>
+
+        * javax/swing/plaf/basic/BasicButtonUI.java: minor API doc fixes,
+        * javax/swing/plaf/basic/BasicComboBoxEditor.java: likewise,
+        * javax/swing/plaf/basic/BasicGraphicsUtils.java: likewise,
+        * javax/swing/plaf/basic/BasicLabelUI.java: likewise,
+        * javax/swing/plaf/basic/BasicListUI.java: likewise,
+        * javax/swing/plaf/basic/BasicLookAndFeel.java: likewise,
+        * javax/swing/plaf/basic/BasicMenuBarUI.java: likewise,
+        * javax/swing/plaf/basic/BasicMenuUI.java: likewise,
+        * javax/swing/plaf/basic/BasicPopupMenuUI.java: likewise,
+        * javax/swing/plaf/basic/BasicScrollBarUI.java: likewise,
+        * javax/swing/plaf/basic/BasicSpinnerUI.java: likewise,
+        * javax/swing/plaf/basic/BasicSplitPaneDivider.java: likewise,
+        * javax/swing/plaf/basic/BasicToolTipUI.java: likewise.
+
+	2005-07-08  Anthony Balkissoon  <abalkiss at redhat.com>
+
+        * javax/swing/filechooser/FileSystemView.java:
+        (getFiles): Added check for non-existent directory, in which case
+        default to home directory.
+
+	2005-07-08  David Gilbert  <david.gilbert at object-refinery.com>
+
+        * javax/swing/plaf/metal/MetalIconFactory.java: new file, implements
+        core tree icons.
+
+	2005-07-08  Roman Kennke  <roman at kennke.org>
+
+        * javax/swing/plaf/metal/MetalLookAndFeel.java
+        (getDefaults): Call theme.addCustomEntriesToTable() only once
+        during initialization of the defaults table.
+
+	2005-07-08  Roman Kennke  <roman at kennke.org>
+
+        * javax/swing/plaf/basic/BasicTableUI.java
+        (installDefaults): Initialize cell borders.
+        (paint): Set correct cell border before painting.
+        * javax/swing/plaf/basic/BasicLookAndFeel.java
+        (initComponentDefault): Corrected color value for the
+        Table.focusCellHighlightBorder UIResource.
+
+	2005-07-07  Jeroen Frijters  <jeroen at frijters.net>
+
+        * java/io/ObjectStreamClass.java
+        (findAccessibleMethod): Added code to make method accessible.
+
+	2005-07-07  Robert Schuster <robertschuster at fsfe.org>
+
+        * javax/swing/JMenu.java
+        (setSelected): Added isEnabled() to expression.
+
+	2005-07-07  Anthony Balkissoon  <abalkiss at redhat.com>
+
+        * javax/swing/JTable.java:
+        (clearSelection): Added clearing of columns as well as rows.
+
+	2005-07-07  Anthony Balkissoon  <abalkiss at redhat.com>
+
+        * javax/swing/plaf/basic/BasicTableUI.java:
+        (MouseInputHandler.mousePressed): Added check for control being pressed
+        and mouse clicked on already selected cell.  In this case, deselect
+        the cell.
+
+	2005-07-07  Anthony Balkissoon  <abalkiss at redhat.com>
+
+        * javax/swing/DefaultListSelectionModel.java:
+        (addSelectionInterval): Added check for leadSelectionIndex being
+        unselected (ie - after a remove operation).
+
+	2005-07-07  Lillian Angel  <langel at redhat.com>
+
+        * javax/swing/plaf/basic/BasicTreeUI.java
+        (getRowCount): Implemented
+        (getPreferredSize): Implemented
+        (getMinimumSize): Implemented
+        (getMaximumSize): Implemented
+        (getCellBounds): checked if parameter is null
+        (paintRecursive): added in a variable to keep track of the
+        length of vertical line to be drawn. Now paints tree nicely.
+
+	2005-07-07  Lillian Angel  <langel at redhat.com>
+
+        * javax/swing/plaf/basic/BasicTreeUI.java
+        Formatted code so else's are on new lines
+
+	2005-07-07  Lillian Angel  <langel at redhat.com>
+
+        * javax/swing/plaf/basic/BasicTreeUI.java
+        Formatted code to get rid of TABs
+        (getPathForRow): took out redundant code.
+        (getNextVisibleNode): took out redundant code.
+
+	2005-07-07  Roman Kennke  <roman at kennke.org>
+
+        * javax/swing/plaf/basic/BasicTextUI.java
+        (DocumentHandler.insertUpdate): Update caret position when document
+        changes.
+        (DocumentHandler.removeUpdate): Update caret position when document
+        changes.
+
+	2005-07-07  Roman Kennke  <roman at kennke.org>
+
+        * gnu/java/awt/FocusManager.java: New class. Provides a concrete
+        implementation of javax.swing.FocusManager so that we can support
+        the old-style FocusManager in Swing and AWT.
+        * gnu/classpath/SystemProperties.java: Add new system property
+        gnu.java.awt.FocusManager that sets the class that should be used
+        as the default FocusManager in AWT and Swing.
+        * java/awt/KeyboardFocusManager.java
+        (setCurrentKeyboardFocusManager): Use createFocusManager instead
+        of creating the instance directly.
+        (createFocusManager): New method. Instantiate a KeyboardFocusManager
+        that is set by the system property gnu.java.awt.FocusManager.
+        * javax/swing.FocusManager.java
+        (constructor): Call super() here.
+        (getCurrentManager): Return the current AWT KeyboardFocusManager
+        here.
+        (setCurrentManager): Set the current AWT KeyboardFocusManager
+        here.
+        (processKeyEvent): Removed method. This is no longer in the
+        API.
+        (focusNextComponent): Removed method. This is no longer in the
+        API.
+        (focusPreviousComponent): Removed method. This is no longer in the
+        API.
+
+	2005-07-07  David Gilbert  <david.gilbert at object-refinery.com>
+
+        * javax/swing/JProgressBar.java
+        (JProgressBar(int, int, int)): fix order of parameters,
+        (JProgressBar()): reorder arguments in call to other constructor,
+        (JProgressBar(int): likewise,
+        (JProgressBar(int, int): likewise.
+
+2005-07-09  Dalibor Topic  <robilad at kaffe.org>
+
 	* kaffe/scripts/javadoc.in,
 	kaffe/scripts/compat/javadoc.in:
 	Make sure the scripts find gjdoc.jar.
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.372 kaffe/libraries/javalib/Makefile.am:1.373
--- kaffe/libraries/javalib/Makefile.am:1.372	Thu Jul  7 00:37:59 2005
+++ kaffe/libraries/javalib/Makefile.am	Sun Jul 10 02:11:32 2005
@@ -1120,6 +1120,7 @@
 	gnu/java/awt/ComponentDataBlitOp.java \
 	gnu/java/awt/EmbeddedWindow.java \
 	gnu/java/awt/EventModifier.java \
+	gnu/java/awt/FocusManager.java \
 	gnu/java/awt/GradientPaintContext.java
 gnu_java_awt_color_SRCS = \
 	gnu/java/awt/color/CieXyzConverter.java \
@@ -3838,6 +3839,7 @@
 	javax/swing/plaf/metal/MetalCheckBoxUI.java \
 	javax/swing/plaf/metal/MetalComboBoxUI.java \
 	javax/swing/plaf/metal/MetalDesktopIconUI.java \
+	javax/swing/plaf/metal/MetalIconFactory.java \
 	javax/swing/plaf/metal/MetalInternalFrameUI.java \
 	javax/swing/plaf/metal/MetalLabelUI.java \
 	javax/swing/plaf/metal/MetalLookAndFeel.java \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.462 kaffe/libraries/javalib/Makefile.in:1.463
--- kaffe/libraries/javalib/Makefile.in:1.462	Thu Jul  7 00:37:59 2005
+++ kaffe/libraries/javalib/Makefile.in	Sun Jul 10 02:11:33 2005
@@ -1546,6 +1546,7 @@
 	gnu/java/awt/ComponentDataBlitOp.java \
 	gnu/java/awt/EmbeddedWindow.java \
 	gnu/java/awt/EventModifier.java \
+	gnu/java/awt/FocusManager.java \
 	gnu/java/awt/GradientPaintContext.java
 
 gnu_java_awt_color_SRCS = \
@@ -4412,6 +4413,7 @@
 	javax/swing/plaf/metal/MetalCheckBoxUI.java \
 	javax/swing/plaf/metal/MetalComboBoxUI.java \
 	javax/swing/plaf/metal/MetalDesktopIconUI.java \
+	javax/swing/plaf/metal/MetalIconFactory.java \
 	javax/swing/plaf/metal/MetalInternalFrameUI.java \
 	javax/swing/plaf/metal/MetalLabelUI.java \
 	javax/swing/plaf/metal/MetalLookAndFeel.java \
Index: kaffe/libraries/javalib/all.files
diff -u kaffe/libraries/javalib/all.files:1.143 kaffe/libraries/javalib/all.files:1.144
--- kaffe/libraries/javalib/all.files:1.143	Thu Jul  7 00:38:00 2005
+++ kaffe/libraries/javalib/all.files	Sun Jul 10 02:11:36 2005
@@ -679,6 +679,7 @@
 gnu/java/awt/ComponentDataBlitOp.java
 gnu/java/awt/EmbeddedWindow.java
 gnu/java/awt/EventModifier.java
+gnu/java/awt/FocusManager.java
 gnu/java/awt/GradientPaintContext.java
 gnu/java/awt/color/CieXyzConverter.java
 gnu/java/awt/color/ClutProfileConverter.java
@@ -3249,6 +3250,7 @@
 javax/swing/plaf/metal/MetalCheckBoxUI.java
 javax/swing/plaf/metal/MetalComboBoxUI.java
 javax/swing/plaf/metal/MetalDesktopIconUI.java
+javax/swing/plaf/metal/MetalIconFactory.java
 javax/swing/plaf/metal/MetalInternalFrameUI.java
 javax/swing/plaf/metal/MetalLabelUI.java
 javax/swing/plaf/metal/MetalLookAndFeel.java
Index: kaffe/libraries/javalib/gnu/classpath/SystemProperties.java
diff -u kaffe/libraries/javalib/gnu/classpath/SystemProperties.java:1.7 kaffe/libraries/javalib/gnu/classpath/SystemProperties.java:1.8
--- kaffe/libraries/javalib/gnu/classpath/SystemProperties.java:1.7	Mon Jul  4 00:04:34 2005
+++ kaffe/libraries/javalib/gnu/classpath/SystemProperties.java	Sun Jul 10 02:11:36 2005
@@ -106,6 +106,12 @@
     if (defaultProperties.get("file.encoding") == null)
       defaultProperties.put("file.encoding", "8859_1");
 
+    // Default to the Swing FocusManager so that the old-style Swing API
+    // for FocusManager can be supported without hardcoding it in AWT.
+    if (defaultProperties.get("gnu.java.awt.FocusManager") == null)
+      defaultProperties.put("gnu.java.awt.FocusManager",
+                            "gnu.java.awt.FocusManager");
+
     // XXX FIXME - Temp hack for old systems that set the wrong property
     if (defaultProperties.get("java.io.tmpdir") == null)
       defaultProperties.put("java.io.tmpdir",
===================================================================
Checking out kaffe/libraries/javalib/gnu/java/awt/FocusManager.java
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/gnu/java/awt/FocusManager.java,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/javalib/gnu/java/awt/FocusManager.java	Sun Jul 10 02:16:10 2005
@@ -0,0 +1,52 @@
+/* FocusManager.java -- Provide Swing FocusManager API compatibility
+   Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.java.awt;
+
+/**
+ * This is a subclass of the otherwise abstract class
+ * {@link javax.swing.FocusManager}. Its sole purpose is to make the Swing
+ * FocusManager usable as a FocusManager in AWT, so that we can provide both
+ * the new (1.4) KeyboardFocusManager API and still support the older
+ * Swing FocusManager.
+ *
+ * @author Roman Kennke
+ */
+public class FocusManager
+  extends javax.swing.FocusManager
+{
+}
Index: kaffe/libraries/javalib/gnu/xml/transform/AbstractNumberNode.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/AbstractNumberNode.java:1.5 kaffe/libraries/javalib/gnu/xml/transform/AbstractNumberNode.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/AbstractNumberNode.java:1.5	Mon Jul  4 00:05:56 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/AbstractNumberNode.java	Sun Jul 10 02:11:37 2005
@@ -306,6 +306,15 @@
   abstract int[] compute(Stylesheet stylesheet, Node context, int pos, int len)
     throws TransformerException;
 
+  public boolean references(QName var)
+  {
+    if (format.references(var))
+      {
+        return true;
+      }
+    return super.references(var);
+  }
+
   public String toString()
   {
     StringBuffer buf = new StringBuffer(getClass().getName());
Index: kaffe/libraries/javalib/gnu/xml/transform/ApplyImportsNode.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/ApplyImportsNode.java:1.5 kaffe/libraries/javalib/gnu/xml/transform/ApplyImportsNode.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/ApplyImportsNode.java:1.5	Mon Jul  4 00:05:56 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/ApplyImportsNode.java	Sun Jul 10 02:11:37 2005
@@ -81,6 +81,6 @@
                    parent, nextSibling);
       }
   }
-  
+
 }
 
Index: kaffe/libraries/javalib/gnu/xml/transform/ApplyTemplatesNode.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/ApplyTemplatesNode.java:1.5 kaffe/libraries/javalib/gnu/xml/transform/ApplyTemplatesNode.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/ApplyTemplatesNode.java:1.5	Mon Jul  4 00:05:56 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/ApplyTemplatesNode.java	Sun Jul 10 02:11:37 2005
@@ -41,6 +41,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import javax.xml.namespace.QName;
 import javax.xml.transform.TransformerException;
@@ -111,14 +112,26 @@
       {
         if (withParams != null)
           {
-            // push the parameter context
-            stylesheet.bindings.push(false);
-            // set the parameters
+            // compute the parameter values
+            LinkedList values = new LinkedList();
             for (Iterator i = withParams.iterator(); i.hasNext(); )
               {
                 WithParam p = (WithParam) i.next();
                 Object value = p.getValue(stylesheet, mode, context, pos, len);
-                stylesheet.bindings.set(p.name, value, false);
+                Object[] pair = new Object[2];
+                pair[0] = p.name;
+                pair[1] = value;
+                values.add(pair);
+              }
+            // push the parameter context
+            stylesheet.bindings.push(Bindings.WITH_PARAM);
+            // set the parameters
+            for (Iterator i = values.iterator(); i.hasNext(); )
+              {
+                Object[] pair = (Object[]) i.next();
+                QName name = (QName) pair[0];
+                Object value = pair[1];
+                stylesheet.bindings.set(name, value, Bindings.WITH_PARAM);
               }
           }
         Collection ns = (Collection) ret;
@@ -154,7 +167,7 @@
         if (withParams != null)
           {
             // pop the variable context
-            stylesheet.bindings.pop(false);
+            stylesheet.bindings.pop(Bindings.WITH_PARAM);
           }
       }
     // apply-templates doesn't have processable children
@@ -164,6 +177,35 @@
                    context, pos, len,
                    parent, nextSibling);
       }
+  }
+
+  public boolean references(QName var)
+  {
+    if (select != null && select.references(var))
+      {
+        return true;
+      }
+    if (withParams != null)
+      {
+        for (Iterator i = withParams.iterator(); i.hasNext(); )
+          {
+            if (((WithParam) i.next()).references(var))
+              {
+                return true;
+              }
+          }
+      }
+    if (sortKeys != null)
+      {
+        for (Iterator i = sortKeys.iterator(); i.hasNext(); )
+          {
+            if (((SortKey) i.next()).references(var))
+              {
+                return true;
+              }
+          }
+      }
+    return super.references(var);
   }
   
   public String toString()
Index: kaffe/libraries/javalib/gnu/xml/transform/AttributeNode.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/AttributeNode.java:1.5 kaffe/libraries/javalib/gnu/xml/transform/AttributeNode.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/AttributeNode.java:1.5	Mon Jul  4 00:05:56 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/AttributeNode.java	Sun Jul 10 02:11:37 2005
@@ -237,6 +237,19 @@
       }
     return ret;
   }
+
+  public boolean references(QName var)
+  {
+    if (name != null && name.references(var))
+      {
+        return true;
+      }
+    if (namespace != null && namespace.references(var))
+      {
+        return true;
+      }
+    return super.references(var);
+  }
   
   public String toString()
   {
Index: kaffe/libraries/javalib/gnu/xml/transform/Bindings.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/Bindings.java:1.5 kaffe/libraries/javalib/gnu/xml/transform/Bindings.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/Bindings.java:1.5	Mon Jul  4 00:05:56 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/Bindings.java	Sun Jul 10 02:11:37 2005
@@ -57,6 +57,10 @@
   implements XPathVariableResolver, Cloneable
 {
 
+  static final int VARIABLE = 0;
+  static final int PARAM = 1;
+  static final int WITH_PARAM = 2;
+
   final Stylesheet stylesheet;
 
   /**
@@ -69,13 +73,21 @@
    */
   final LinkedList parameters;
 
+  /**
+   * Argument (with-param) value stack.
+   */
+  final LinkedList withParameters;
+
   Bindings(Stylesheet stylesheet)
   {
     this.stylesheet = stylesheet;
     variables = new LinkedList();
     parameters = new LinkedList();
-    push(true);
-    push(false);
+    withParameters = new LinkedList();
+    for (int i = 0; i < 3; i++)
+      {
+        push(i);
+      }
   }
 
   public Object clone()
@@ -90,53 +102,87 @@
       }
   }
 
-  void push(boolean global)
+  void push(int type)
   {
-    if (global)
+    switch (type)
       {
+      case VARIABLE:
         variables.addFirst(new HashMap());
-      }
-    else
-      {
+        break;
+      case PARAM:
         parameters.addFirst(new HashMap());
+        break;
+      case WITH_PARAM:
+        withParameters.addFirst(new HashMap());
+        break;
       }
   }
 
-  void pop(boolean global)
+  void pop(int type)
   {
-    if (global)
+    switch (type)
       {
+      case VARIABLE:
         variables.removeFirst();
-      }
-    else
-      {
+        break;
+      case PARAM:
         parameters.removeFirst();
+        break;
+      case WITH_PARAM:
+        withParameters.removeFirst();
+        break;
       }
   }
 
-  public boolean containsKey(String name, boolean global)
+  public boolean containsKey(QName name, int type)
   {
-    Iterator i = global ? variables.iterator() : parameters.iterator();
-    while (i.hasNext())
+    Iterator i = null;
+    switch (type)
       {
-        Map ctx = (Map) i.next();
-        if (ctx.containsKey(name))
+      case VARIABLE:
+        i = variables.iterator();
+        break;
+      case PARAM:
+        i = parameters.iterator();
+        break;
+      case WITH_PARAM:
+        Map ctx = (Map) withParameters.getFirst();
+        return ctx.containsKey(name);
+      }
+    if (i != null)
+      {
+        while (i.hasNext())
           {
-            return true;
+            Map ctx = (Map) i.next();
+            if (ctx.containsKey(name))
+              {
+                return true;
+              }
           }
       }
     return false;
   }
 
-  public Object get(String name, Node context, int pos, int len)
+  public Object get(QName name, Node context, int pos, int len)
   {
     //System.err.println("bindings.get: "+name);
     //System.err.println("\t"+toString());
     Object ret = null;
-    for (Iterator i = variables.iterator(); i.hasNext() && ret == null; )
+    //if (parameters.size() > 1 && containsKey(name, PARAM))
+      // check that template defines parameter
       {
-        Map vctx = (Map) i.next();
-        ret = vctx.get(name);
+        Map cwp = (Map) withParameters.getFirst();
+        ret = cwp.get(name);
+        //System.err.println("\twith-param: ret="+ret);
+      }
+    if (ret == null)
+      {
+        for (Iterator i = variables.iterator(); i.hasNext() && ret == null; )
+          {
+            Map vctx = (Map) i.next();
+            ret = vctx.get(name);
+          }
+        //System.err.println("\tvariable: ret="+ret);
       }
     if (ret == null)
       {
@@ -145,6 +191,7 @@
             Map pctx = (Map) i.next();
             ret = pctx.get(name);
           }
+        //System.err.println("\tparam: ret="+ret);
       }
     /*if (ret instanceof Expr && context != null)
       {
@@ -163,23 +210,29 @@
     return ret;
   }
 
-  void set(String name, Object value, boolean global)
+  void set(QName name, Object value, int type)
   {
-    if (global)
-      {
-        Map context = (Map) variables.getFirst();
-        context.put(name, value);
-      }
-    else
+    switch (type)
       {
-        Map context = (Map) parameters.getFirst();
-        context.put(name, value);
+      case VARIABLE:
+        Map vctx = (Map) variables.getFirst();
+        vctx.put(name, value);
+        break;
+      case PARAM:
+        Map pctx = (Map) parameters.getFirst();
+        pctx.put(name, value);
+        break;
+      case WITH_PARAM:
+        Map wctx = (Map) withParameters.getFirst();
+        wctx.put(name, value);
+        break;
       }
+    //System.err.println("Set "+name+"="+value);
   }
 
   public Object resolveVariable(QName qName)
   {
-    return get(qName.toString(), null, 1, 1);
+    return get(qName, null, 1, 1);
   }
   
   public String toString()
@@ -187,6 +240,31 @@
     StringBuffer buf = new StringBuffer();
     boolean next = false;
     Collection seen = new HashSet();
+    Map wctx = (Map) withParameters.getFirst();
+    buf.append('(');
+    for (Iterator i = wctx.entrySet().iterator(); i.hasNext(); )
+      {
+        if (next)
+          {
+            buf.append(',');
+          }
+        else
+          {
+            next = true;
+          }
+        Map.Entry entry = (Map.Entry) i.next();
+        Object key = entry.getKey();
+        if (!seen.contains(key))
+          {
+            buf.append(key);
+            buf.append('=');
+            buf.append(entry.getValue());
+            seen.add(key);
+          }
+      }
+    buf.append(')');
+    next = false;
+    seen.clear();
     buf.append('{');
     for (Iterator i = variables.iterator(); i.hasNext(); )
       {
@@ -212,6 +290,10 @@
               }
           } 
       }
+    buf.append('}');
+    next = false;
+    seen.clear();
+    buf.append('[');
     for (Iterator i = parameters.iterator(); i.hasNext(); )
       {
         Map ctx = (Map) i.next();
@@ -236,7 +318,8 @@
               }
           } 
       }
-    buf.append('}');
+    buf.append(']');
     return buf.toString();
   }
+
 }
Index: kaffe/libraries/javalib/gnu/xml/transform/CallTemplateNode.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/CallTemplateNode.java:1.5 kaffe/libraries/javalib/gnu/xml/transform/CallTemplateNode.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/CallTemplateNode.java:1.5	Mon Jul  4 00:05:56 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/CallTemplateNode.java	Sun Jul 10 02:11:37 2005
@@ -39,6 +39,7 @@
 
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import javax.xml.namespace.QName;
 import javax.xml.transform.TransformerException;
@@ -90,14 +91,30 @@
   {
     if (withParams != null)
       {
-        // push the parameter context
-        stylesheet.bindings.push(false);
-        // set the parameters
+        // compute the parameter values
+        LinkedList values = new LinkedList();
         for (Iterator i = withParams.iterator(); i.hasNext(); )
           {
             WithParam p = (WithParam) i.next();
             Object value = p.getValue(stylesheet, mode, context, pos, len);
-            stylesheet.bindings.set(p.name, value, false);
+            Object[] pair = new Object[2];
+            pair[0] = p.name;
+            pair[1] = value;
+            values.add(pair);
+          }
+        // push the parameter context
+        stylesheet.bindings.push(Bindings.WITH_PARAM);
+        // set the parameters
+        for (Iterator i = values.iterator(); i.hasNext(); )
+          {
+            Object[] pair = (Object[]) i.next();
+            QName name = (QName) pair[0];
+            Object value = pair[1];
+            stylesheet.bindings.set(name, value, Bindings.WITH_PARAM);
+            if (stylesheet.debug)
+              {
+                System.err.println("with-param: " + name + " = " + value);
+              }
           }
       }
     TemplateNode t = stylesheet.getTemplate(mode, name);
@@ -109,7 +126,7 @@
     if (withParams != null)
       {
         // pop the variable context
-        stylesheet.bindings.pop(false);
+        stylesheet.bindings.pop(Bindings.WITH_PARAM);
       }
     // call-template doesn't have processable children
     if (next != null)
@@ -118,6 +135,21 @@
                    context, pos, len,
                    parent, nextSibling);
       }
+  }
+  
+  public boolean references(QName var)
+  {
+    if (withParams != null)
+      {
+        for (Iterator i = withParams.iterator(); i.hasNext(); )
+          {
+            if (((WithParam) i.next()).references(var))
+              {
+                return true;
+              }
+          }
+      }
+    return super.references(var);
   }
   
   public String toString()
Index: kaffe/libraries/javalib/gnu/xml/transform/CopyOfNode.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/CopyOfNode.java:1.5 kaffe/libraries/javalib/gnu/xml/transform/CopyOfNode.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/CopyOfNode.java:1.5	Mon Jul  4 00:05:56 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/CopyOfNode.java	Sun Jul 10 02:11:37 2005
@@ -170,6 +170,15 @@
       }
   }
   
+  public boolean references(QName var)
+  {
+    if (select != null && select.references(var))
+      {
+        return true;
+      }

*** Patch too long, truncated ***




More information about the kaffe mailing list