From d20896570088b28f206315ae34b0ff03123d26b0 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Thu, 28 Apr 2005 23:00:08 +0000 Subject: 2005-04-28 Andrew John Hughes * Changes from HEAD --> generics-branch (2004-04-17 to 2004-04-28) 2005-04-28 Robert Schuster * java/beans/Introspector: Fixed bug #12624, BeanDescriptors will now be set correctly. (flushCaches): Now flushes all cached intermediate data. 2005-04-28 Michael Koch * javax/swing/JTextArea.java (replaceRange): Removed error throwing. 2005-04-28 Michael Koch * java/security/AccessControlContext.java: Reformatted. 2005-04-28 Andreas Tobler * java/security/Security.java (Security): Silence the warning about no providers found in the no debug case. 2005-04-28 Michael Koch * java/nio/charset/Charset.java (providers2): Renamed from 'providers'. 2005-04-27 Roman Kennke * javax/swing/plaf/basic/BasicScrollBarUI (getThumbBounds): Do not make thumb smaller than minimumThumbSize. * javax/swing/plaf/metal/MetalLookAndFeel (initComponentDefaults): Added color defaults for ScrollBar. * javax/swing/plaf/metal/MetalScrollBarUI (paintThumb): Added. (getMinimumThumbSize): Added. 2005-04-27 Thomas Fitzsimmons * java/net/URL.java: Remove org.metastatic.jessie from default protocol search path. 2005-04-27 Roman Kennke * javax/swing/plaf/metal/MetalLookAndFeel (initComponentDefaults): Added some default colors. 2005-04-27 Roman Kennke * javax/swing/plaf/basic/BasicScrollBarUI.java (configureScrollBarColors: Changed key 'ScrollBar.thumbLightShadow' to 'ScrollBar.thumbShadow'. The formes does not exist. (paintThumb): Use BasicGraphicsUtils for painting the thumb. 2005-04-27 Chris Burdess * java/net/protocol/http/HTTPURLConnection.java (connect): Accept absolute and relative paths in Location header. 2005-04-27 Roman Kennke * java/awt/MediaTracker.java: Added 2005 to copyright statement. * javax/swing/BoxLayout.java: Likewise. * javax/swing/UIManager.java: Likewise. * javax/swing/plaf/basic/BasicButtonListener.java: Likewise. * javax/swing/plaf/basic/BasicGraphicsUtils.java: Likewise. * javax/swing/plaf/basic/BasicLookAndFeel.java: Likewise. * javax/swing/plaf/basic/BasicMenuItemUI.java: Likewise. * javax/swing/plaf/basic/BasicScrollPaneUI.java: Likewise. * javax/swing/plaf/metal/MetalLookAndFeel.java: Likewise. * javax/swing/text/Document.java: Likewise. * javax/swing/text/GapContent.java: Likewise. * javax/swing/text/SimpleAttributeSet.java: Likewise. * javax/swing/tree/DefaultTreeSelectionModel.java: Likewise. 2005-04-26 Tom Tromey * autogen.sh: Use '-I m4'. * m4/lib-ld.m4, m4/lib-link.m4, m4/lib-prefix.m4: New files. * m4/pkg.m4, m4/accross.m4, m4/iconv.m4, m4/acinclude.m4: Moved from... * pkg.m4, accross.m4, iconv.m4, acinclude.m4: ... here. Removed. 2005-04-26 Luca Barbieri * gnu/java/nio/channels/FileChannelImpl.java (tryLock): Pass 'false' to native lock(). (lock): Pass 'true' to native lock(). 2005-04-26 Tom Tromey * gnu/java/nio/charset/iconv/IconvCharset.java (name): Removed unused field. (IconvCharset): Updated. 2005-04-26 Chris Burdess * gnu/java/net/protocol/http/HTTPURLConnection.java: Throw FileNotFoundException and implement getErrorStream on 404. 2005-04-26 Tom Tromey * javax/swing/text/html/parser/ParserDelegator.java (callBack, gnu): Now package-private. * javax/swing/text/html/parser/DocumentParser.java (parser, callBack, gnu): Now package-private. * javax/swing/text/StringContent.java (content, setOffset, checkLocation): Now package-private. * javax/swing/text/JTextComponent.java (doc): Now package-private. * javax/swing/plaf/basic/BasicToolBarUI.java (owner, lastGoodOrientation, origParent, borders, cachedBounds, cachedOrientation, DragWindow): Now package-private. * javax/swing/plaf/basic/BasicTabbedPaneUI.java (incrButton, decrButton, viewport, panel, currentScrollLocation, layoutManager, tabAreaRect, contentRect, createIncreaseButton, createDecreaseButton, findPointForIndex): Now package-private. * javax/swing/plaf/basic/BasicSplitPaneDivider.java (currentDividerLocation, moveDividerTo): Now package-private. * javax/swing/plaf/basic/BasicSliderUI.java (findClosestTick): Now package-private. * javax/swing/plaf/basic/BasicScrollBarUI.java (calculatePreferredSize, valueForYPosition, valueForXPosition): Now package-private. * javax/swing/plaf/basic/BasicPopupMenuUI.java (topWindowListener): Now package-private. * javax/swing/plaf/basic/BasicOptionPaneUI.java (iconSize, OK_STRING, YES_STRING, NO_STRING, CANCEL_STRING): Now constants. (messageAreaContainer, buttonContainer, resetSelectedValue): Now package-private. * javax/swing/plaf/basic/BasicListUI.java (damageLayout): Now package-private. * javax/swing/plaf/basic/BasicInternalFrameTitlePane.java (title): Now package-private. * javax/swing/plaf/basic/BasicDesktopIconUI.java (button): Now package-private. * javax/swing/plaf/basic/BasicComboBoxUI.java (largestItemSize, borderInsets): Now package-private. (arrowButtonWidth): Likewise. Now a constant. * javax/swing/plaf/basic/BasicColorChooserUI.java (chooser, pane, makeTabs, updatePreviewPanel): Now package-private. * javax/swing/plaf/basic/BasicArrowButton.java (shadow, darkShadow, highlight): Now package-private. * javax/swing/colorchooser/DefaultSwatchChooserPanel.java (addColorToQueue): Now package-private. * javax/swing/colorchooser/DefaultRGBChooserPanel.java (spinnerChange, sliderChange, updateChange, R, G, B, RSpinner, GSpinner, BSpinner): Now package-private. * javax/swing/colorchooser/DefaultHSBChooserPanel.java (gradientImage, trackImage, slider, hRadio, sRadio, bRadio, hSpinner, sSpinner, bSpinner, gradientPoint, internalChange, spinnerTrigger, locked, handlingMouse, updateImage, updateSlider, updateTrack): Now package-private. * javax/swing/TransferHandler.java (clipboard): Now package-private. * javax/swing/ToolTipManager.java (showTip, hideTip): Now package-private. * javax/swing/Timer.java (drainEvents, queueEvent): Now package-private. * javax/swing/RepaintManager.java (globalManager): Now package-private. * javax/swing/JFormattedTextField.java (editValid): Now package-private. * javax/swing/JColorChooser.java (makeModal): Now package-private. * java/awt/geom/GeneralPath.java (rule, types, xpoints, ypoints, index, path): Now package-private. * java/awt/geom/Area.java (solids, holes, cubicCubicIntersect, lineQuadIntersect, lineCubicIntersect, linesIntersect, pointEquals): Now package-private. * java/awt/geom/Arc2D.java (type): Now package-private. * java/awt/Window.java (windowFocusOwner): Now package-private. * java/awt/TextComponent.java (editable, selectionStart, selectionEnd, text, getIndexAtPoint, getCharacterBounds): Now package-private. * java/awt/MenuItem.java (actionCommand, enabled, label): Now package-private. * java/awt/MenuComponent.java (focusListener): Now package-private. * java/awt/Frame.java (state): Now package-private. * java/awt/Choice.java (pItems): Now package-private. * java/awt/Checkbox.java (state): Now package-private. * java/awt/Button.java (actionCommand, label): Now package-private. * gnu/javax/swing/text/html/parser/support/Parser.java (attributes, _handleEndTag_remaining, _handleStartTag): Now package-private. * gnu/java/beans/decoder/PersistenceParser.java (javaHandler): Now package-private. * gnu/java/awt/peer/gtk/GdkGraphics2D.java (paint, stroke, fg, bg, clip, transform, font, comp): Now package-private. 2005-04-26 Tom Tromey * java/awt/Robot.java (waitForIdle): Call invokeAndWait in a static way. 2005-04-26 Roman Kennke * javax/swing/plaf/basic/BasicToggleButtonUI.java: (getPropertyPrefix): Added. 2005-04-26 Roman Kennke * javax/swing/plaf/basic/BasicButtonUI.java (getPropertyPrefix): Added. (installDefaults): Use getPropertyPrefix instead of hard-coded prefix. 2005-04-26 Roman Kennke * javax/swing/JToggleButton.java (JToggleButton): Removed horizontalAlignment setting, this was wrong. Added setting of an actionCommand, ToggleButtons have "" as default actionCommand. 2005-04-26 David Daney * java/net/InetAddress.java (InetAddress): Make a private copy of the address. * java/net/Inet4Address.java (getAddress): Return a copy of the address. * java/net/Inet6Address.java (Inet6Address): Use private copy of the address (getAddress): Return a copy of the address. (equals): Rewrote. 2005-04-26 Michael Koch * javax/swing/ImageIcon.java: Merged copyright with GCJ. 2005-04-25 Tom Tromey * java/awt/AWTKeyStroke.java (vktable): Now package-private. 2005-04-25 Mark Wielaard * iconv.m4: New file. * configure.ac: Use AM_ICONV. * native/jni/java-nio/Makefile.am (libjavanio_la_LIBADD): Add LTLIBICONV. * native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c: Include config.h and jcl.h, use if defined(HAVE_ICONV), add new static variables infid and outfid, add char_union. (Java_gnu_java_nio_charset_iconv_IconvDecoder_openIconv): Guard with if defined(HAVE_ICONV), use JCL_jstring_to_cstring, JCL_free_cstring and JCL_ThrowException, cache inremaining and outremaining fieldIDs. (Java_gnu_java_nio_charset_iconv_IconvDecoder_decode): Guard with if defined(HAVE_ICONV), use ICONV_CONST for iconv argument, used cached fieldIDs, use char_union. (Java_gnu_java_nio_charset_iconv_IconvDecoder_closeIconv): Guard with if defined(HAVE_ICONV). * native/jni/java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c: Include config.h and jcl.h, use if defined(HAVE_ICONV), add new static variables infid and outfid, add char_union. (Java_gnu_java_nio_charset_iconv_IconvEncoder_openIconv): Guard with if defined(HAVE_ICONV), use JCL_jstring_to_cstring, JCL_free_cstring and JCL_ThrowException, cache inremaining and outremaining fieldIDs. (Java_gnu_java_nio_charset_iconv_IconvEncoder_encode): Guard with if defined(HAVE_ICONV), use ICONV_CONST for iconv argument, used cached fieldIDs, use char_union. (Java_gnu_java_nio_charset_iconv_IconvEncoder_closeIconv): Guard with if defined(HAVE_ICONV). * gnu/java/nio/charset/iconv/IconvDecoder.java (dispose): Renamed. (finalize): Renamed from dispose. * gnu/java/nio/charset/iconv/IconvEncoder.java (dispose): Renamed. (finalize): Renamed from dispose. 2005-04-25 Sven de Marothy * java/io/InputStreamReader.java: (InputStreamReader): Always replace invalid chars. (read): Return -1 if zero bytes are read. * native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c, * native/jni/java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c: Correct C pointer arithmetic. 2005-04-25 David Gilbert * java/awt/Transparency.java (getTransparency): fixed API docs. 2005-04-25 Roman Kennke * javax/swing/plaf/basic/BasicScrollBarUI.java (initDefaults): Initialize thumb*Color fields correctly. 2005-04-25 Roman Kennke * javax/swing/text/GapContent.java: Added API comments. 2005-04-25 Roman Kennke * javax/swing/plaf/metal/MetalBorders.java: Added inner class ScrollPaneBorder. * javax/swing/plaf/metal/MetalLookAndFeel.java (initComponentDefaults): Added default for "ScrollPane.border" to use the new ScrollPaneBorder. 2005-04-25 Roman Kennke * javax/swing/text/AbstractDocument.java: Added FIXME comments. This class still has to be implemented thread-safe. 2005-04-25 Roman Kennke * javax/swing/tree/DefaultTreeSelectionModel.java (DefaultTreeSelectionModel): Initialize listenerList here. 2005-04-25 Roman Kennke * javax/swing/plaf/metal/MetalTextFieldUI.java (createUI): Return one instance per Component instead of a shared instance. 2005-04-24 Tom Tromey * native/jni/Makefile.am (JNIDIRS): New macro. (SUBDIRS): Use it. * configure.ac (--enable-core-jni): New option. * NEWS: Document new option. 2005-04-24 Tom Tromey * include/jni_md-x86-linux-gnu.h (JNIIMPORT): New define. (jsize): New typedef. * include/jni.h: Re-merged with libgcj. * doc/vmintegration.texinfo (JNI Implementation): New node. * NEWS: Document the change. 2005-04-24 Tom Tromey * gnu/classpath/Configuration.java.in (default_awt_peer_toolkit): Now set by configure. * configure.ac (--enable-default-toolkit): New option. * NEWS: Document new option. 2005-04-24 Tom Tromey * configure.ac: Formatting fixes. 2005-03-22 Mike Stump * native/fdlibm/ieeefp.h: ppc64 is also __IEEE_BIG_ENDIAN. 2005-04-23 Tom Tromey * javax/swing/text/StyleConstants.java (StyleConstants): Now package-private. 2005-04-23 Mark Wielaard * java/net/URL.java (URL(URL,String,URLStreamHandler)): Add spec to MalformedURLException. 2005-04-23 Michael Koch * java/net/ServerSocket.java (getChannel): Improved javadoc comment. 2005-04-23 Roman Kennke * javax/swing/text/Document.java: Added API documentation comments. 2005-04-23 Roman Kennke * javax/swing/text/AbstractDocument.java (getDocumentProperties): Implemented. (setDocumentProperties): Implemented. (getProperty): Implemented. (putProperty): Implemented. 2005-04-22 Tom Tromey * accross.m4: New file, from gcc. * configure.ac: Only call AC_C_BIGENDIAN once. Use a single AC_CHECK_HEADERS call for most headers. Likewise for AC_CHECK_FUNCS. Use AC_COMPILE_CHECK_SIZEOF. Don't look for function named 'sizeof'. 2005-04-22 Thomas Fitzsimmons * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (connectSignals): Realize the window widget after connecting signals. 2005-04-22 Roman Kennke * javax/swing/BoxLayout (preferredLayoutSize): Fixed computation so that it correctly adds the top and bottom insets of the container. 2005-04-22 Roman Kennke * javax/swing/plaf/basic/BasicMenuItemUI.java (paintText): Make use of the 'selectionForeground' UI default for text painting. 2005-04-22 Roman Kennke * javax/swing/plaf/basic/BasicLookAndFeel.java (initSystemColorDefaults): Modified colors to match the BasicLookAndFeel in the reference implementation. (initComponentDefaults): Likewise. 2005-04-22 Tom Tromey * doc/vmintegration.texinfo (Introduction): Typo fix. (Initialization): Removed redundant 'current'. 2005-04-22 Michael Koch * gnu/classpath/SystemProperties.java: Reformatted. 2005-04-21 Casey Marshall * gnu/java/security/der/DERValue.java (getValueAs): new method. * gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java (): read both dates with 'DERValue.getValueAs', with 'GENERALIZED_TIME' as the argument. 2005-04-21 Michael Koch * include/gnu_java_nio_charset_iconv_IconvDecoder.h, include/gnu_java_nio_charset_iconv_IconvEncoder.h: Regenerated with gcjh from gcc 4.0 branch. 2005-04-20 Tom Tromey * .classpath: Updated. 2005-04-20 Roman Kennke * javax/swing/plaf/basic/BasicLookAndFeel.java (initComponentDefaults): Changed Button.border to be BasicBorders.getButtonBorder as it should be. 2005-04-20 Roman Kennke * javax/swing/plaf/basic/BasicTabbedPaneUI.java: (getMaximumSize): Return (Short.MAX_VALUE, Short.MAX_VALUE) as it should according to a mauve testcase, instead of the preferred size. 2005-04-20 Sven de Marothy * java/io/OutputStreamWriter.java: (close): Do nothing on multiple closes. 2005-04-20 Roman Kennke * javax/swing/JMenu.java (add): add(Component) now calls PopupMenu.insert(..) instead of PopupMenu.add(..). add(..) is not implemented for Component, so JComponent.add(..) is called instead, adding the component in the wrong place. 2005-04-20 Roman Kennke * javax/swing/plaf/basic/BasicButtonListener.java (mousePressed): replaced query to getModifiersEx with getModifiers. This method relied on faulty behaviour in getModifierEx. (mouseReleased): replaced query to getModifiersEx with getModifiers. This method relied on faulty behaviour in getModifierEx. 2005-04-20 Roman Kennke * javax/swing/plaf/metal/MetalLookAndFeel.java (getDefaults): Call addCustomEntriesToTable on the theme. 2005-04-20 Roman Kennke * javax/swing/tree/DefaultTreeSelectionModel.java (constructor): Added implementation. (getRowMapper): Added implementation. (setSelectionMode): Added implementation. (getSelectionMode): Added implementation. (getSelectionPath): Added implementation. (getSelectionPaths): Added implementation. (getSelectionCount): Added implementation. (isSelectionEmpty): Added implementation. (getSelectionRows): Added implementation. (getMinSelectionRow): Added implementation. (getMaxSelectionRow): Added implementation. (getLeadSelectionRow): Added implementation. (getLeadSelectionPath): Added implementation. 2005-04-20 Sven de Marothy * java/nio/charset/Charset.java: (defaultCharset()): New method. Status updated to 1.5 2005-04-20 Sven de Marothy * gnu/java/io/EncodingManager.java: Removed charset alias properties. * gnu/java/io/decode/Decoder.java, * gnu/java/io/decode/Decoder8859_1.java, * gnu/java/io/decode/Decoder8859_13.java, * gnu/java/io/decode/Decoder8859_15.java, * gnu/java/io/decode/Decoder8859_2.java, * gnu/java/io/decode/Decoder8859_3.java, * gnu/java/io/decode/Decoder8859_4.java, * gnu/java/io/decode/Decoder8859_5.java, * gnu/java/io/decode/Decoder8859_6.java, * gnu/java/io/decode/Decoder8859_7.java, * gnu/java/io/decode/Decoder8859_8.java, * gnu/java/io/decode/Decoder8859_9.java, * gnu/java/io/decode/DecoderASCII.java, * gnu/java/io/decode/DecoderCp1047.java, * gnu/java/io/decode/DecoderEBCDIC_XML_US.java, * gnu/java/io/decode/DecoderEightBitLookup.java, * gnu/java/io/decode/DecoderUTF16BE.java, * gnu/java/io/decode/DecoderUTF16LE.java, * gnu/java/io/decode/DecoderUTF32BE.java, * gnu/java/io/decode/DecoderUTF32LE.java, * gnu/java/io/decode/DecoderUTF8.java, * gnu/java/io/decode/DecoderUnicodeBig.java, * gnu/java/io/decode/DecoderUnicodeLittle.java, * gnu/java/io/decode/DecoderWindows1250.java, * gnu/java/io/decode/DecoderWindows1252.java, * gnu/java/io/decode/package.html * gnu/java/io/encode/Encoder.java, * gnu/java/io/encode/Encoder8859_1.java, * gnu/java/io/encode/Encoder8859_13.java, * gnu/java/io/encode/Encoder8859_15.java, * gnu/java/io/encode/Encoder8859_2.java, * gnu/java/io/encode/Encoder8859_3.java, * gnu/java/io/encode/Encoder8859_4.java, * gnu/java/io/encode/Encoder8859_5.java, * gnu/java/io/encode/Encoder8859_6.java, * gnu/java/io/encode/Encoder8859_7.java, * gnu/java/io/encode/Encoder8859_8.java, * gnu/java/io/encode/Encoder8859_9.java, * gnu/java/io/encode/EncoderASCII.java, * gnu/java/io/encode/EncoderCp1047.java, * gnu/java/io/encode/EncoderEBCDIC_XML_US.java, * gnu/java/io/encode/EncoderEightBitLookup.java, * gnu/java/io/encode/EncoderUTF16BE.java, * gnu/java/io/encode/EncoderUTF16LE.java, * gnu/java/io/encode/EncoderUTF32BE.java, * gnu/java/io/encode/EncoderUTF32LE.java, * gnu/java/io/encode/EncoderUTF8.java, * gnu/java/io/encode/EncoderUnicodeBig.java, * gnu/java/io/encode/EncoderUnicodeLittle.java, * gnu/java/io/encode/EncoderWindows1250.java, * gnu/java/io/encode/EncoderWindows1252.java, * gnu/java/io/encode/package.html: Removed 2005-04-19 Michael Koch * java/awt/geom/QuadCurve2D.java: Fixed Brian Gough's name for real. 2005-04-19 Roman Kennke * javax/swing/plaf/basic/BasicButtonUI.java (paint): This should not care about margin and insets at the same time, as insets already include the margin through the border. * javax/swing/plaf/basic/BasicGraphicsUtils.java (getPreferredButtonSize): Likewise. * javax/swing/plaf/metal/MetalBorders.java (getBorderInsets): Likewise. 2005-04-19 Roman Kennke * examples/gnu/classpath/examples/swing/Demo.java: Pulled out GNULookAndFeel so that it can be accessed. On startup, if the property swing.defaultlaf is not set, display a message on how to set the L&F for the demo. Changed font for bottom buttons to normal. * examples/gnu/classpath/examples/swing/GNULookAndFeel.java: Pulled out of Demo.java. 2005-04-19 Roman Kennke * javax/swing/plaf/basic/BasicOptionPaneUI.java (createMessageArea): The JPanel that holds the message area doesn't need to override getPreferredSize. This prevents some message components from rendering nicely. 2005-04-19 Andrew John Hughes * java/net/URL.java: (toURI()): Implemented. 2005-04-18 Roman Kennke * javax/swing/plaf/metal/MetalInternalFrameUI.java (createUI): Do not share instances between components. * javax/swing/plaf/metal/MetalSliderUI.java (createUI): Do not share instances between components. 2005-04-18 Roman Kennke * javax/swing/plaf/metal/MetalBorders: (PopupMenuBorder): Added. * javax/swing/plaf/metal/MetalLookAndFeel (initComponentDefaults): Added PopupMenuBorder. 2005-04-18 Sven de Marothy * java/io/InputStreamReader.java: (read): Fix several bugs leading to incorrect length being returned. 2005-04-18 Sven de Marothy * java/nio/ByteBufferImpl.java: (putChar): Inlined for speed. (put, get): Bulk methods can use arraycopy. * java/nio/CharBufferImpl.java: (put, get): Bulk methods can use arraycopy. 2005-04-18 Roman Kennke * javax/swing/tree/DefaultTreeSelectionModel.java: Added API documentation all over the class. 2005-04-18 Sven de Marothy * include/Makefile.am, * native/jni/java-nio/Makefile.am: Added new files. * gnu/java/nio/charset/iconv/IconvCharset.java, * gnu/java/nio/charset/iconv/IconvDecoder.java, * gnu/java/nio/charset/iconv/IconvEncoder.java, * gnu/java/nio/charset/iconv/IconvMetaData.java, * gnu/java/nio/charset/iconv/IconvProvider.java, * native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c, * native/jni/java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c, * include/gnu_java_nio_charset_iconv_IconvDecoder.h, * include/gnu_java_nio_charset_iconv_IconvEncoder.h, New files. 2005-04-18 Roman Kennke * java/lang/String.java: Make value, offset and count fields package private instead of private. 2005-04-18 Roman Kennke * javax/swing/plaf/basic/BasicScrollPaneUI.java (installDefaults): Link managed JScrollPane in instance field. (uninstallDefaults): Unlink managed JScrollPane in instance field. 2005-04-18 Roman Kennke * javax/swing/plaf/basic/BasicScrollBarUI.java (PropertyChangeHandler.propertyChange): Add default to switch statement to avoid errors with unusual values for orientation. (installComponents): Likewise. 2005-04-18 Roman Kennke * javax/swing/plaf/metal/MetalScrollBarUI.java: (createUI): Instances cannot be shared among JScrollPanes. 2005-04-18 Sven de Marothy * java/lang/String.java: Value, offset and count should be private. 2005-04-18 Roman Kennke * javax/swing/plaf/metal/MetalLookAndFeel.java (initComponentDefaults): Added defaults for Menu, MenuBar MenuEntry fonts. 2005-04-18 Roman Kennke * javax/swing/plaf/basic/BasicScrollBarUI.java (installUI): Install listeners after everything all, otherwise we get strange NPEs in some situations, especially with custom L&Fs. (createIncreaseButton): Orientation is expected to be SwingConstants.NORTH, ..SOUTH, ..WEST or ..EAST and not HORIZONTAL or VERTICAL. (createDecreaseButton): Orientation is expected to be SwingConstants.NORTH, ..SOUTH, ..WEST or ..EAST and not HORIZONTAL or VERTICAL. (installComponents): Orientation for buttons is expected to be SwingConstants.NORTH, ..SOUTH, ..WEST or ..EAST and not HORIZONTAL or VERTICAL. 2005-04-18 Jeroen Frijters * java/nio/ByteBufferImpl.java (get(), put(byte)): Inlined checks and field updates. * java/nio/CharBufferImpl.java (CharBufferImpl(CharBufferImpl)): Copy array_offset field. (get(), put(char)): Inlined checks and field updates. Fixed to take array_offset into account. (get(int), put(int, char)): Fixed to take array_offset into account. 2005-04-18 Jeroen Frijters * java/lang/Class.java (getModifiers, newInstance): Changed call to VMClass.getModifiers(). * vm/reference/java/lang/VMClass.java (getModifiers(Class, boolean)): New method. 2005-04-18 Jeroen Frijters * java/awt/GraphicsEnvironment.java (localGraphicsEnvironment): New field. (getLocalGraphicsEnvironment): Added support for java.awt.graphicsenv property. (isHeadless): Added support for java.awt.headless property. (isHeadlessInstance): Call headless(). 2005-04-18 Jeroen Frijters * gnu/java/beans/IntrospectionIncubator.java (addToPropertyHash, addToListenerHash): Don't confuse get(), set(), is(), add() and remove() with properties or events. 2005-04-18 Roman Kennke * javax/swing/JToolBar.java (addImpl): Adjust added AbstractButtons to look and feel like toolbar buttons. * javax/swing/plaf/metal/MetalBorders.java: Adjusted insets of ButtonBorder. (RolloverMarginBorder): Added class for toolbar buttons. (getButtonBorder): Adjusted factory method to return a shared instance of button border. (getToolbarButtonBorder): Added factory method to return a shared instance of toolbar button border. (getMarginBorder): Added factory method to return a shared instance of margin border. * javax/swing/plaf/metal/MetalButtonUI.java (installDefauls): If button is child of a JToolBar then set special border on this button. 2005-04-17 Roman Kennke * javax/swing/text/SimpleAttributeSet.java (addAttribute): Removed null pointer check. * javax/swing/text/StyleContext.java (NamedStyle.setResolveParent): Added null pointer check. 2005-04-17 Roman Kennke * examples/gnu/classpath/exammples/swing/Demo.java: Print a short summary for available values for the property swing.defaultlaf. Set MetalLookAndFeel as default. Pulled out GNULookAndFeel so that it is accessible. * examples/gnu/classpath/exammples/swing/GNULookAndFeel.java: Pulled out this class from Demo.java. 2005-04-17 Roman Kennke * javax/swing/UIManager.java: Make the UIManager respect the swing.defaultlaf system property. --- java/awt/AWTKeyStroke.java | 5 ++-- java/awt/Button.java | 6 +++-- java/awt/Checkbox.java | 3 ++- java/awt/Choice.java | 3 ++- java/awt/Frame.java | 3 ++- java/awt/GraphicsEnvironment.java | 56 ++++++++++++++++++++++++++++++--------- java/awt/MediaTracker.java | 2 +- java/awt/MenuComponent.java | 3 ++- java/awt/MenuItem.java | 9 ++++--- java/awt/Robot.java | 3 +-- java/awt/TextComponent.java | 19 ++++++++----- java/awt/Transparency.java | 4 +-- java/awt/Window.java | 3 ++- java/awt/geom/Arc2D.java | 5 ++-- java/awt/geom/Area.java | 23 ++++++++++------ java/awt/geom/GeneralPath.java | 23 ++++++++++------ java/awt/geom/QuadCurve2D.java | 4 +-- 17 files changed, 117 insertions(+), 57 deletions(-) (limited to 'java/awt') diff --git a/java/awt/AWTKeyStroke.java b/java/awt/AWTKeyStroke.java index 95e9b8d5f..6f126fbd3 100644 --- a/java/awt/AWTKeyStroke.java +++ b/java/awt/AWTKeyStroke.java @@ -111,11 +111,12 @@ public class AWTKeyStroke implements Serializable private static Constructor ctor; /** - * A table of keyCode names to values. + * A table of keyCode names to values. This is package-private to + * avoid an accessor method. * * @see #getAWTKeyStroke(String) */ - private static final HashMap vktable = new HashMap(); + static final HashMap vktable = new HashMap(); static { // Using reflection saves the hassle of keeping this in sync with KeyEvent, diff --git a/java/awt/Button.java b/java/awt/Button.java index eb0fe3b7a..a71a0d7eb 100644 --- a/java/awt/Button.java +++ b/java/awt/Button.java @@ -77,13 +77,15 @@ private static final long serialVersionUID = -8774683716313001058L; /** * @serial The action command name for this button. + * This is package-private to avoid an accessor method. */ -private String actionCommand; +String actionCommand; /** * @serial The label for this button. + * This is package-private to avoid an accessor method. */ -private String label; +String label; // List of ActionListeners for this class. private transient ActionListener action_listeners; diff --git a/java/awt/Checkbox.java b/java/awt/Checkbox.java index 2a8b62afd..a0c86c1c8 100644 --- a/java/awt/Checkbox.java +++ b/java/awt/Checkbox.java @@ -89,8 +89,9 @@ private String label; /** * @serial The state of this checkbox. + * This is package-private to avoid an accessor method. */ -private boolean state; +boolean state; // The list of listeners for this object. private transient ItemListener item_listeners; diff --git a/java/awt/Choice.java b/java/awt/Choice.java index c6a532a5b..cdfd7042e 100644 --- a/java/awt/Choice.java +++ b/java/awt/Choice.java @@ -74,8 +74,9 @@ private static final long serialVersionUID = -4075310674757313071L; /** * @serial A list of items for the choice box, which can be null. + * This is package-private to avoid an accessor method. */ -private Vector pItems = new Vector(); +Vector pItems = new Vector(); /** * @serial The index of the selected item in the choice box. diff --git a/java/awt/Frame.java b/java/awt/Frame.java index d180984ab..77596ef81 100644 --- a/java/awt/Frame.java +++ b/java/awt/Frame.java @@ -186,8 +186,9 @@ private boolean resizable = true; /** * @serial The state of this frame. * // FIXME: What are the values here? + * This is package-private to avoid an accessor method. */ -private int state; +int state; /** * @serial The title of the frame. diff --git a/java/awt/GraphicsEnvironment.java b/java/awt/GraphicsEnvironment.java index b963f4bab..f93e0f97e 100644 --- a/java/awt/GraphicsEnvironment.java +++ b/java/awt/GraphicsEnvironment.java @@ -1,5 +1,5 @@ /* GraphicsEnvironment.java -- information about the graphics environment - Copyright (C) 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -39,7 +39,7 @@ exception statement from your version. */ package java.awt; import gnu.java.awt.ClasspathToolkit; - +import gnu.classpath.SystemProperties; import java.awt.image.BufferedImage; import java.util.Locale; @@ -56,6 +56,8 @@ import java.util.Locale; */ public abstract class GraphicsEnvironment { + private static GraphicsEnvironment localGraphicsEnvironment; + /** * The environment must be obtained from a factory or query method, hence * this constructor is protected. @@ -65,16 +67,43 @@ public abstract class GraphicsEnvironment } /** - * Returns the local graphics environment. + * Returns the local graphics environment. If the java.awt.graphicsenv + * system property is set, it instantiates the specified class, + * otherwise it assume that the awt toolkit is a ClasspathToolkit + * and delegates to it to create the instance. * - * XXX Not implemented in Classpath yet. * @return the local environment */ public static GraphicsEnvironment getLocalGraphicsEnvironment() { - ClasspathToolkit tk; - tk = ((ClasspathToolkit) Toolkit.getDefaultToolkit ()); - return tk.getLocalGraphicsEnvironment (); + if (localGraphicsEnvironment != null) + return localGraphicsEnvironment; + + String graphicsenv = SystemProperties.getProperty("java.awt.graphicsenv", + null); + if (graphicsenv != null) + { + try + { + // We intentionally use the bootstrap class loader. + localGraphicsEnvironment = (GraphicsEnvironment) + Class.forName(graphicsenv).newInstance(); + return localGraphicsEnvironment; + } + catch (Exception x) + { + throw (InternalError) + new InternalError("Unable to instantiate java.awt.graphicsenv") + .initCause(x); + } + } + else + { + ClasspathToolkit tk; + tk = ((ClasspathToolkit) Toolkit.getDefaultToolkit()); + localGraphicsEnvironment = tk.getLocalGraphicsEnvironment(); + return localGraphicsEnvironment; + } } /** @@ -83,7 +112,8 @@ public abstract class GraphicsEnvironment * Windows Toolkit (java.awt) throw a {@link HeadlessException} if this * returns true. * - * XXX For now, Classpath assumes that it is never headless. + * This method returns true if the java.awt.headless property is set + * to "true". * * @return true if the environment is headless, meaning that graphics are * unsupported @@ -91,16 +121,16 @@ public abstract class GraphicsEnvironment */ public static boolean isHeadless() { - // XXX Should be: getLocalGraphicsEnvironment().isHeadlessInstance(); - return false; + String headless = SystemProperties.getProperty("java.awt.headless", null); + return "true".equalsIgnoreCase(headless); } /** * Check if the given environment is headless, meaning that it does not * support a display, keyboard, or mouse. Many methods in the Abstract * Windows Toolkit (java.awt) throw a {@link HeadlessException} if this - * returns true. This default implementation returns false, so subclasses - * need only override it if they are headless. + * returns true. This default implementation returns isHeadless(), so + * subclasses need only override it if they differ. * * @return true if the environment is headless, meaning that graphics are * unsupported @@ -108,7 +138,7 @@ public abstract class GraphicsEnvironment */ public boolean isHeadlessInstance() { - return false; + return isHeadless(); } /** diff --git a/java/awt/MediaTracker.java b/java/awt/MediaTracker.java index 2c51fbd19..d36461ba1 100644 --- a/java/awt/MediaTracker.java +++ b/java/awt/MediaTracker.java @@ -1,5 +1,5 @@ /* MediaTracker.java -- Class used for keeping track of images - Copyright (C) 1999, 2002i, 2004 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/java/awt/MenuComponent.java b/java/awt/MenuComponent.java index f5677feeb..3d41e4079 100644 --- a/java/awt/MenuComponent.java +++ b/java/awt/MenuComponent.java @@ -161,8 +161,9 @@ private static final long serialVersionUID = -4536902356223894379L; * * @see AccessibleAWTMenuComponent#addFocusListener(java.awt.event.FocusListener) * @serial ignored. + * This is package-private to avoid an accessor method. */ - private transient FocusListener focusListener; + transient FocusListener focusListener; /*************************************************************************/ diff --git a/java/awt/MenuItem.java b/java/awt/MenuItem.java index 56082d36a..f40f4af11 100644 --- a/java/awt/MenuItem.java +++ b/java/awt/MenuItem.java @@ -75,13 +75,15 @@ private static final long serialVersionUID = -21757335363267194L; /** * @serial The name of the action command generated by this item. + * This is package-private to avoid an accessor method. */ -private String actionCommand; +String actionCommand; /** * @serial Indicates whether or not this menu item is enabled. + * This is package-private to avoid an accessor method. */ -private boolean enabled = true; +boolean enabled = true; /** * @serial The mask of events that are enabled for this menu item. @@ -90,8 +92,9 @@ long eventMask; /** * @serial This menu item's label + * This is package-private to avoid an accessor method. */ -private String label; +String label; /** * @serial The shortcut for this menu item, if any diff --git a/java/awt/Robot.java b/java/awt/Robot.java index 23b6f8104..8741b89b4 100644 --- a/java/awt/Robot.java +++ b/java/awt/Robot.java @@ -394,10 +394,9 @@ public class Robot throw new IllegalThreadStateException ("Robot: waitForIdle called from " + "the event dispatch thread"); - EventQueue q = Toolkit.getDefaultToolkit ().getSystemEventQueue (); try { - q.invokeAndWait (new Runnable () { public void run () { } }); + EventQueue.invokeAndWait (new Runnable () { public void run () { } }); } catch (InterruptedException e) { diff --git a/java/awt/TextComponent.java b/java/awt/TextComponent.java index 4c384391a..34ea698e3 100644 --- a/java/awt/TextComponent.java +++ b/java/awt/TextComponent.java @@ -76,23 +76,27 @@ private static final long serialVersionUID = -2214773872412987419L; /** * @serial Indicates whether or not this component is editable. + * This is package-private to avoid an accessor method. */ -private boolean editable; +boolean editable; /** * @serial The starting position of the selected text region. + * This is package-private to avoid an accessor method. */ -private int selectionStart; +int selectionStart; /** * @serial The ending position of the selected text region. + * This is package-private to avoid an accessor method. */ -private int selectionEnd; +int selectionEnd; /** * @serial The text in the component + * This is package-private to avoid an accessor method. */ -private String text; +String text; /** * A list of listeners that will receive events from this object. @@ -708,8 +712,9 @@ paramString() /*******************************/ // Provide AccessibleAWTTextComponent access to several peer functions that - // aren't publicly exposed. - private synchronized int + // aren't publicly exposed. This is package-private to avoid an accessor + // method. + synchronized int getIndexAtPoint(Point p) { TextComponentPeer tcp = (TextComponentPeer)getPeer(); @@ -718,7 +723,7 @@ paramString() return -1; } - private synchronized Rectangle + synchronized Rectangle getCharacterBounds(int i) { TextComponentPeer tcp = (TextComponentPeer)getPeer(); diff --git a/java/awt/Transparency.java b/java/awt/Transparency.java index 9636458ff..0ad4efee8 100644 --- a/java/awt/Transparency.java +++ b/java/awt/Transparency.java @@ -1,5 +1,5 @@ /* Transparency.java -- common transparency modes in graphics - Copyright (C) 2000, 2002 Free Software Foundation + Copyright (C) 2000, 2002, 2005 Free Software Foundation This file is part of GNU Classpath. @@ -61,7 +61,7 @@ public interface Transparency /** * Return the transparency type. * - * @return One of {@see #OPAQUE}, {@see #BITMASK}, or {@see #TRANSLUCENT}. + * @return One of {@link #OPAQUE}, {@link #BITMASK}, or {@link #TRANSLUCENT}. */ int getTransparency(); } // interface Transparency diff --git a/java/awt/Window.java b/java/awt/Window.java index 0a39d20b1..e4e0a3600 100644 --- a/java/awt/Window.java +++ b/java/awt/Window.java @@ -90,7 +90,8 @@ public class Window extends Container implements Accessible private transient boolean shown; - private transient Component windowFocusOwner; + // This is package-private to avoid an accessor method. + transient Component windowFocusOwner; /* * The number used to generate the name returned by getName. diff --git a/java/awt/geom/Arc2D.java b/java/awt/geom/Arc2D.java index 5ce3b08e8..2cdc17080 100644 --- a/java/awt/geom/Arc2D.java +++ b/java/awt/geom/Arc2D.java @@ -73,8 +73,9 @@ public abstract class Arc2D extends RectangularShape */ public static final int PIE = 2; - /** The closure type of this arc. */ - private int type; + /** The closure type of this arc. This is package-private to avoid an + * accessor method. */ + int type; /** * Create a new arc, with the specified closure type. diff --git a/java/awt/geom/Area.java b/java/awt/geom/Area.java index 68f905f08..782552940 100644 --- a/java/awt/geom/Area.java +++ b/java/awt/geom/Area.java @@ -89,13 +89,15 @@ public class Area implements Shape, Cloneable /** * Segment vectors containing solid areas and holes + * This is package-private to avoid an accessor method. */ - private Vector solids; + Vector solids; /** * Segment vectors containing solid areas and holes + * This is package-private to avoid an accessor method. */ - private Vector holes; + Vector holes; /** * Vector (temporary) storing curve-curve intersections @@ -1315,9 +1317,10 @@ public class Area implements Shape, Cloneable * This is a reasonably accurate method, although the recursion depth * is typically around 20, the bounding-box tests allow for significant * pruning of the subdivision tree. + * + * This is package-private to avoid an accessor method. */ - private Intersection[] cubicCubicIntersect(CubicSegment curve1, - CubicSegment curve2) + Intersection[] cubicCubicIntersect(CubicSegment curve1, CubicSegment curve2) { Rectangle2D r1 = curve1.getBounds(); Rectangle2D r2 = curve2.getBounds(); @@ -1349,8 +1352,9 @@ public class Area implements Shape, Cloneable * Or null if no intersections are found1 * This is done through combining the line's equation with the * parametric form of the Bezier and solving the resulting quadratic. + * This is package-private to avoid an accessor method. */ - private Intersection[] lineQuadIntersect(LineSegment l, QuadSegment c) + Intersection[] lineQuadIntersect(LineSegment l, QuadSegment c) { double[] y = new double[3]; double[] x = new double[3]; @@ -1453,8 +1457,9 @@ public class Area implements Shape, Cloneable * Returns the intersections between a line and a cubic segment * This is done through combining the line's equation with the * parametric form of the Bezier and solving the resulting quadratic. + * This is package-private to avoid an accessor method. */ - private Intersection[] lineCubicIntersect(LineSegment l, CubicSegment c) + Intersection[] lineCubicIntersect(LineSegment l, CubicSegment c) { double[] y = new double[4]; double[] x = new double[4]; @@ -1560,8 +1565,9 @@ public class Area implements Shape, Cloneable /** * Returns the intersection between two lines, or null if there is no * intersection. + * This is package-private to avoid an accessor method. */ - private Intersection linesIntersect(LineSegment a, LineSegment b) + Intersection linesIntersect(LineSegment a, LineSegment b) { Point2D P1 = a.P1; Point2D P2 = a.P2; @@ -1605,8 +1611,9 @@ public class Area implements Shape, Cloneable /** * Determines if two points are equal, within an error margin * 'snap distance' + * This is package-private to avoid an accessor method. */ - private boolean pointEquals(Point2D a, Point2D b) + boolean pointEquals(Point2D a, Point2D b) { return (a.equals(b) || a.distance(b) < PE_EPSILON); } diff --git a/java/awt/geom/GeneralPath.java b/java/awt/geom/GeneralPath.java index 0dc9ede29..70f7de7df 100644 --- a/java/awt/geom/GeneralPath.java +++ b/java/awt/geom/GeneralPath.java @@ -88,15 +88,18 @@ public final class GeneralPath implements Shape, Cloneable /** A big number, but not so big it can't survive a few float operations */ private static final double BIG_VALUE = java.lang.Double.MAX_VALUE / 10.0; - /** The winding rule. */ - private int rule; + /** The winding rule. + * This is package-private to avoid an accessor method. + */ + int rule; /** * The path type in points. Note that xpoints[index] and ypoints[index] maps * to types[index]; the control points of quad and cubic paths map as * well but are ignored. + * This is package-private to avoid an accessor method. */ - private byte[] types; + byte[] types; /** * The list of all points seen. Since you can only append floats, it makes @@ -104,15 +107,18 @@ public final class GeneralPath implements Shape, Cloneable * allow a general path of double precision points. * Note: Storing x and y coords seperately makes for a slower transforms, * But it speeds up and simplifies box-intersection checking a lot. + * These are package-private to avoid accessor methods. */ - private float[] xpoints; - private float[] ypoints; + float[] xpoints; + float[] ypoints; /** The index of the most recent moveto point, or null. */ private int subpath = -1; - /** The next available index into points. */ - private int index; + /** The next available index into points. + * This is package-private to avoid an accessor method. + */ + int index; /** * Constructs a GeneralPath with the default (NON_ZERO) @@ -534,8 +540,9 @@ public final class GeneralPath implements Shape, Cloneable /** * The GeneralPath whose segments are being iterated. + * This is package-private to avoid an accessor method. */ - private final GeneralPath path; + final GeneralPath path; /** * The affine transformation used to transform coordinates. diff --git a/java/awt/geom/QuadCurve2D.java b/java/awt/geom/QuadCurve2D.java index 9ec22e4f1..2d737270e 100644 --- a/java/awt/geom/QuadCurve2D.java +++ b/java/awt/geom/QuadCurve2D.java @@ -562,7 +562,7 @@ public abstract class QuadCurve2D implements Shape, Cloneable * result of -1 indicates that the equation is constant (i.e., * always or never zero). * - * @author Brian Gouph (bjg@network-theory.com) + * @author Brian Gough (bjg@network-theory.com) * (original C implementation in the GNU Scientific Library) * @@ -607,7 +607,7 @@ public abstract class QuadCurve2D implements Shape, Cloneable * result of -1 indicates that the equation is constant (i.e., * always or never zero). * - * @author Brian Gouph (bjg@network-theory.com) + * @author Brian Gough (bjg@network-theory.com) * (original C implementation in the GNU Scientific Library) * -- cgit v1.2.1