Age | Commit message (Collapse) | Author | Files | Lines |
|
to refer to it from java.io.
* java/nio/channels/FileChannelImpl.java: Moved to package
gnu/java/nio/channels, since we need to refer to it from java.io.
* java/nio/channels/natFileChannelImpl.cc: Removed file.
* Makefile.am, configure.in: Updated accordingly.
From-SVN: r78660
|
|
* gnu/java/nio/channels/FileChannelImpl.java: New class, renamed
from java/nio/channels. Don't depend on FileDescriptor.
(in, out, err): New static fields.
(mode): New field.
(SET, CUR, READ, WRITE, APPEND, EXCL, SYNC, DSYNC): Moved constants
from FileDescriptor.
(by): Removed MappedByteBuffer field.
(map): New working implementation.
* gnu/java/nio/channels/natFileChannelPosix.cc: New file, though
some code "ported" from natFileDescriptoPosix.cc.
* gnu/java/nio/channels/natFileChannelEcos.cc: Likewise.
* gnu/java/nio/channels/natFileChannelWin32.cc Likewise.
From-SVN: r78659
|
|
2004-02-28 Michael Koch <konqueror@gmx.de>
* java/io/ObjectInputStream.java: Compile fix, damn I commited the
wrong code.
From-SVN: r78629
|
|
* java/io/ObjectInputStream.java
(readClassDescriptor): Keep elements of the mapping non null.
(checkTypeConsistency): New method.
(readFields): Fixed main loop and base logic. Small reindentation.
* java/io/ObjectStreamField.java
(lookupField): New method to update the field reference.
(checkFieldType): New method.
* java/io/ObjectStreamClass.java
(setClass, setFields): Call lookupField when building the field
database. Check the real field type.
From-SVN: r78627
|
|
* java/nio/ByteOrder.java
(nativeOrder): Use equals() to compare strings.
From-SVN: r78626
|
|
* gnu/java/nio/FileLockImpl.java
(finalize): Made protected.
* java/nio/channels/FileChannel.java
(MapMode.READ_ONLY): Made final.
(MapMode.READ_WRITE): Made final.
(MapMode.PRIVATE): Made final.
* java/nio/channels/SocketChannel.java
(open): Simplified code.
* java/nio/channels/spi/AbstractSelectableChannel.java
(registered): Unused, removed.
(keyFor): Check channel is open, only locate key
and not add a new one.
(register): Don't delete attachments.
From-SVN: r78519
|
|
* gnu/java/awt/ComponentDataBlitOp.java
(INSTANCE): Made final.
* gnu/java/awt/image/ImageDecoder.java:
Reworked imports.
(cm): Unused, removed.
From-SVN: r78517
|
|
* gnu/java/nio/DatagramChannelImpl.java
(send): Check if target address is resolved.
From-SVN: r78508
|
|
2004-02-25 Andrew Haley <aph@redhat.com>
PR java/14296:
* java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Make sure
we have a valid method index.
From-SVN: r78504
|
|
java.nio.channels.Pipe and...
2004-02-26 Michael Koch <konqueror@gmx.de>
* Makefile.am: Generate and install headers for inner classes in
java.nio.channels.Pipe and gnu.java.nio.PipeImpl.
* Makefile.in: Regenerated.
From-SVN: r78493
|
|
From-SVN: r78447
|
|
copies in the top level.
2004-02-22 Zack Weinberg <zack@codesourcery.com>
Nathanael Nerode <neroden@twcny.rr.com>
Alexandre Oliva <aoliva@redhat.com>
boehm-gc:
libjava/libltdl:
* config.sub, config.guess: Replace with forwarding scripts
which invoke the master copies in the top level.
From-SVN: r78332
|
|
2004-02-20 Michael Koch <konqueror@gmx.de>
* gnu/java/net/protocol/jar/Handler.java
(): Removed unneeded check for file != null. java.net.URL.getFile()
returns an empty string but never null.
From-SVN: r78176
|
|
* gnu/gcj/convert/Convert.java
(main): Use equals() to compare strings.
From-SVN: r78174
|
|
2004-02-19 Andrew Cagney <cagney@redhat.com>
* config.guess: Update from version 2003-10-16 to 2004-02-16.
* config.sub: Update from version 2003-11-03 to 2004-02-16.
Index: boehm-gc/ChangeLog
2004-02-19 Andrew Cagney <cagney@redhat.com>
* config.guess: Update from version 2002-01-10 to 2004-02-16.
* config.sub: Update from version 2002-01-02 to 2004-02-16.
Index: libjava/libltdl/ChangeLog
2004-02-19 Andrew Cagney <cagney@redhat.com>
* config.guess: Update from version 2003-10-07 to 2004-02-16.
* config.sub: Update from version 2003-10-07 to 2004-02-16.
From-SVN: r78171
|
|
2004-02-20 Michael Koch <konqueror@gmx.de>
* javax/swing/AbstractButton.java: Made several constants final.
(getRolloverSelectedIcon): Made public.
(getSelectedIcon): Made public.
From-SVN: r78169
|
|
inherit it.
* java/nio/ByteBuffer.java (endian): Make non-private so other
java.nio classes can inherit it.
(<init>): Don't bother clearing array_offset.
* java/nio/ByteBuffer.java (allocate): Re-implement using wrap.
* java/nio/ByteBuffer.java (get(byte[],int,int)): Check underflow.
Remove redundant test.
* java/nio/ByteBufferImpl.java (asCharBuffer, asShortBuffer,
asIntBuffer, asLongBuffer, asFloatBuffer, asDoubleBuffer):
Use new XxxViewBufferImpl constructors.
* java/nio/MappedByteBufferImpl.java: Likewise.
* java/nio/DirectByteBufferImpl.java: Likewise.
* java/nio/ByteBufferImpl.java: Remove one constructor.
Inline super in remaining constructor.
* java/nio/ByteBuffer.java: Remove unused constructor.
* java/nio/ByteBufferImpl.java (shiftDown): New optimized method.
* java/nio/ByteBufferImpl.java (get, put): Add array_offset.
* java/nio/DirectByteBufferImpl.java (owner): New field.
(offset): Remove unused field.
(<init>): Modify one and add another constructor. Change callers.
(allocateDirect): Removed - not used.
(getImpl, putImpl): Make static and pass address explicitly,
to make them useful for MappedByteBufferImpl.
(get, put): Check for underflow. Modify for new getImpl.
(getImpl): New native method where target is array.
(get(byte[],int,int)): Use the above.
(adjustAddress): New static native method.
(slice, duplicate, asReadOnly): New implementations.
* java/nio/natDirectByteBufferImpl.cc (getImpl, putImpl, shiftDown,
adjustAddress): New or updated native methods.
From-SVN: r77919
|
|
* java/nio/CharViewBufferImpl.java: New convenience constructor.
Fix buggy call to super constructor.
* java/nio/DoubleViewBufferImpl.java: Likewise.
* java/nio/FloatViewBufferImpl.java: Likewise.
* java/nio/IntViewBufferImpl.java: Likewise.
* java/nio/LongViewBufferImpl.java: Likewise.
* java/nio/ShortViewBufferImpl.java: Likewise.
From-SVN: r77917
|
|
* java/nio/CharBufferImpl.java: Inline super constructor.
* java/nio/DoubleBufferImpl.java: Likewise.
* java/nio/FloatBufferImpl.java: Likewise.
* java/nio/IntBufferImpl.java: Likewise.
* java/nio/LongBufferImpl.java: Likewise.
* java/nio/ShortBufferImpl.java: Likewise.
* java/nio/CharBuffer.java: Remove unused constructor.
* java/nio/DoubleBuffer.java: Likewise.
* java/nio/FloatBuffer.java: Likewise.
* java/nio/IntBuffer.java: Likewise.
* java/nio/LongBuffer.java: Likewise.
* java/nio/ShortBuffer.java: Likewise.
From-SVN: r77916
|
|
fieldmapping.
2004-02-15 Ito Kazumitsu <kaz@maczuka.gcd.org>
* java/io/ObjectInputStream.java (readClassDescriptor): Avoid the
overflow of fieldmapping.
From-SVN: r77843
|
|
2004-02-14 Sascha Brawer <brawer@dandelis.ch>
* javax/swing/undo/UndoManager.java: Re-written from scratch.
From-SVN: r77827
|
|
implCloseChannel, as in the spec.
* java/nio/channels/spi/AbstractInterruptibleChannel.java (close):
Set closed before calling implCloseChannel, as in the spec.
From-SVN: r77809
|
|
From-SVN: r77695
|
|
From-SVN: r77694
|
|
2004-02-09 Graydon Hoare <graydon@redhat.com>
* javax/swing/ToggleButtonModel.java: Remove dead class.
* javax/swing/plaf/basic/BasicDefaults.java: Remove dead class.
* javax/swing/plaf/basic/BasicButtonListener.java: New class.
* javax/swing/plaf/basic/BasicRootPaneUI.java: New class.
* Makefile.am: Update for new and removed files.
* Makefile.in: Regenerate.
* gnu/java/awt/peer/gtk/GdkGraphics2D.java: Initialize default hints.
* javax/swing/AbstractButton.java
(AbstractButton): Initialize fields correctly in ctor.
* javax/swing/JCheckbox.java
(JCheckBox): Override painting flags.
* javax/swing/DefaultButtonModel.java: Conform to sun.
* javax/swing/JComponent.java (paint): Fill with background color
if available.
(processComponentKeyEvent)
(processFocusEvent)
(processKeyEvent)
(processMouseMotionEvent): Remove event-consuming empty methods.
(getUIClassID): Return "ComponentUI" not "JComponent"
* javax/swing/JFrame.java: Remove some debugging chatter.
(JFrame): Subscribe to window events.
* javax/swing/JRadioButton.java
(JRadioButton): Override painting flags.
* javax/swing/JRootPane.java
(JRootPane): Set background from UIDefaults.
* javax/swing/JToggleButton.java
(ToggleButtonModel): New inner class.
(JToggleButton): Override layout alighment.
* javax/swing/SwingUtilities.java:
(getLocalBounds): Return width and height, not x and y.
(calculateInnerArea): Use local bounds, not bounds.
(layoutCompoundLabel): Provide overridden form.
(layoutCompoundLabel): Correct bugs.
* javax/swing/UIDefaults.java: Correct comment.
* javax/swing/plaf/basic/BasicButtonUI.java:
Move most logic into defaults, external listener.
(paintIcon): Implement icon painting.
(paint): Fix state painting to conform to changes in model.
* javax/swing/plaf/basic/BasicCheckBoxUI.java:
Remove most dead/wrong methods.
(getDefaultIcon): Return defaults.getIcon("CheckBox.icon").
* javax/swing/plaf/basic/BasicIconFactory.java:
(DummyIcon): New class.
(getMenuItemCheckIcon)
(getMenuItemArrowIcon)
(getMenuArrowIcon)
(getCheckBoxMenuItemIcon)
(getRadioButtonMenuItemIcon)
(createEmptyFrameIcon): Return DummyIcons, not null.
(getCheckBoxIcon): Implement an icon that looks like sun's.
(getRadioButtonIcon): Implement an icon that looks like sun's.
* javax/swing/plaf/basic/BasicLookAndFeel.java
(initComponentDefaults): Fix impossible values, add some missing.
* javax/swing/plaf/basic/BasicPanelUI.java (gap): Remove field.
* javax/swing/plaf/basic/BasicRadioButtonUI.java:
Remove most dead/wrong methods.
(icon): New field.
(getDefaultIcon): New method.
* javax/swing/plaf/basic/BasicToggleButtonUI.java:
Remove most dead/wrong methods.
* javax/swing/plaf/metal/MetalLookAndFeel.java
(getDefaults): Return super.getDefaults(), not BasicDefaults.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
(Java_gnu_java_awt_peer_gtk_GdkGraphics_clearRect):
Implement "clearing" as drawing, when on pixmap drawables.
* javax/swing/JButton.java (getUIClassID):
* javax/swing/JCheckBox.java (getUIClassID):
* javax/swing/JEditorPane.java (getUIClassID):
* javax/swing/JLabel.java (getUIClassID):
* javax/swing/JList.java (getUIClassID):
* javax/swing/JOptionPane.java (getUIClassID):
* javax/swing/JPanel.java (getUIClassID):
* javax/swing/JPasswordField.java (uiClassID):
* javax/swing/JRadioButton.java (getUIClassID):
* javax/swing/JRootPane.java (getUIClassID):
* javax/swing/JScrollPane.java (getUIClassID):
* javax/swing/JTabbedPane.java (getUIClassID):
* javax/swing/JToggleButton.java (getUIClassID):
* javax/swing/JTree.java (getUIClassID):
* javax/swing/JViewport.java (getUIClassID):
* javax/swing/text/JTextComponent.java (getUIClassID):
Return "fooUI" not "Jfoo"
From-SVN: r77686
|
|
* java/net/DatagramSocket.java
(setReuseAddress): Use Boolean.valueOf() instead of creating a new
Boolean object.
(setBroadcast): Likewise.
* java/net/MulticastSocket.java
(setLoopbackMode): Likewise.
* java/net/ServerSocket.java
(setReuseAddress): Likewise.
* java/net/Socket.java
(setTcpNoDelay): Likewise.
(setSoLinger): Likewise.
(setOOBInline): Likewise.
(setKeepAlive): Likewise.
(setReuseAddress): Likewise.
* java/net/URLConnection.java
(setContentHandler): Replace == with equals().
* java/net/URLStreamHandler.java
(hostSEquals): Fix checking host addresses.
(toExternalForm): Dont check protocol for null. We know already its
not null.
From-SVN: r77670
|
|
* java/awt/BorderLayout.java
(calcCompSize): Invisible components get zero dimensions.
* java/awt/Button.java
(setLabel): Set actionCommand.
* java/awt/Component.java
(show): Invalidate component and parent container.
(hide): Likewise.
From-SVN: r77613
|
|
* java/awt/GridBagLayout.java
(GridBagLayout): New private field, internalcomptable.
(lookupInternalConstraints): New method.
(ArrangeGrid): Use components' MINSIZE. Use internalcomptable.
(GetLayoutInfo): Reimplement.
(calcCellSizes): Ignore rows/columns with size 0.
From-SVN: r77612
|
|
* gnu/java/awt/EmbeddedWindow.java
(setHandle): Use java.awt.Component.getPeer() instead of
java.awt.Component.peer directly.
From-SVN: r77605
|
|
* gnu/java/awt/peer/gtk/GtkButtonPeer.java
(gtkSetLabel): New native method definition.
(setLabel): Use gtkSetLabel.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
(Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetLabel): New method.
From-SVN: r77604
|
|
* config/rs6000/linux64.h (MD_FALLBACK_FRAME_STATE_FOR): Don't
bump retaddr here.
* include/powerpc-signal.h: Revert 2004-01-21 change.
(INIT_SEGV, INIT_FPE): Provide powerpc64 versions. Check return
from syscall for ppc32 versions.
From-SVN: r77601
|
|
* java/nio/ByteBuffer.java (shiftDown): New helper method.
* java/nio/natDirectByteBufferImpl.cc (shiftDown): New implementation.
* java/nio/ByteBufferImpl.java (compact): Use new shiftDown method.
* sava/nio/ByteBufferHelper.java: Remove redundant 'final' specifiers.
Pass ByteOrder parameter to most methods, since the underlying
ByteBuffer's order isn't always what we should use.
* java/nio/ByteBufferImpl.java: Pass byte-order various places.
* java/nio/DirectByteBufferImpl.java: Likewise.
Use ByteBufferHelper methods.
* java/nio/MappedByteBufferImpl.java: Likewise.
(compact): Use shiftDown.
* java/nio/CharViewBufferImpl.java (<init>): Pass byte-order.
(get, put): Use ByteBufferHelper.
(compact): Use new shiftDown method.
(duplicate(boolean)): New helper method.
(duplicate, asReadOnlyBuffer): Use it.
(order): Return endian field.
* java/nio/DoubleViewBufferImpl.java: Likewise.
* java/nio/FloatViewBufferImpl.java: Likewise.
* java/nio/IntViewBufferImpl.java: Likewise.
* java/nio/LongViewBufferImpl.java: Likewise.
* java/nio/ShortViewBufferImpl.java: Likewise.
* java/nio/CharViewBufferImpl.java (subsequence): Redundant test.
* java/nio/DirectByteBufferImpl.java (shiftDown): New native method.
(compact): Re-implement using shiftDown.
From-SVN: r77501
|
|
From-SVN: r77491
|
|
* include/i386-signal.h (HANDLE_DIVIDE_OVERFLOW): Add volatile
qualifier to _regs.
From-SVN: r77489
|
|
* include/i386-signal.h (HANDLE_DIVIDE_OVERFLOW): Add volatile
qualifier to _regs.
[[Split portion of a mixed commit.]]
From-SVN: r77488.2
|
|
* include/i386-signal.h (MAKE_THROW_FRAME): Add volatile
qualifier to _regs.
From-SVN: r77484
|
|
* java/io/ObjectInputStream.java
(currentClassLoader): Reverted to old version of this method.
From-SVN: r77397
|
|
dump flag.
2004-02-06 Jeroen Frijters <jeroen@frijters.net>
* java/io/ObjectInputStream.java: Made all calls
to dumpElement[ln] conditional on dump flag. (readObject): Changed to
use cached info from ObjectStreamClass. (readClassDescriptor):
Cache more information in ObjectStreamClass. (processResolution,
readFields): Use cached info from ObjectStreamClass.
(newObject): Throw exception instead of returning null for failure.
(getField, getMethod, callReadMethod, setBooleanField, setByteField,
setCharField, setDoubleField, setFloatField, setIntField,
setLongField, setShortField, setObjectField, readObjectParams):
Removed. (dumpElement, dumpElementln): Removed dump flag condition
check.
* java/io/ObjectStreamField.java (hasReadMethod): Removed.
(setClass): Added call to cacheMethods() (findMethod): New method.
(cacheMethods): New method. (ObjectStreamClass): Added call to
cacheMethods(). (setFields): Cache fields. (getClassUID): Use
AccessController.doPrivileged to invoke setAccessible.
(readObjectMethod, readResolveMethod, realClassIsSerializable,
realClassIsExternalizable, fieldMapping, firstNonSerializableParent):
New fields.
* java/io/ObjectStreamField.java (ObjectStreamField): New constructor.
(ObjectStreamField): Removed FIXME workaround. (getTypeString,
isPrimitive): Made safe for cases where type == null.
(setBooleanField, setByteField, setCharField, setShortField,
setIntField, setLongField, setFloatField, setDoubleField,
setObjectField): New methods.
From-SVN: r77395
|
|
2004-02-05 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/awt/Component.java (getFont): Return a default font
instead of null.
From-SVN: r77352
|
|
2004-02-05 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/awt/Scrollbar.java (next_scrollbar_number): New field.
(Scrollbar (int, int, int, int, int)): Make default page
increment 10.
(setValues): Only call peer.setValues if one of the values has
changed.
(generateName): New method.
(getUniqueLong): New method.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c
(range_scrollbar): Remove structure.
(post_adjustment_event): Remove function.
(post_change_event): Accept jobject argument.
(create): Cast jints to gdoubles. Round scrollbar values to the
nearest integer. Clamp min, max and value settings.
(connectJObject): Connect hook to widget->window.
(connectSignals): Remove range_scrollbar structure variables.
Remove "move-slider" connection. Pass global peer reference to
"value-changed" callback.
(setLineIncrement): Cast jint value to gdouble.
(setPageIncrement): Likewise.
(setValues): Likewise. Clamp min, max and value settings.
From-SVN: r77332
|
|
* javax/swing/AbstractCellEditor.java
(getCellEditorValue): Removed.
* javax/swing/Box.java: Reformated.
(serialVersionUID): New field.
* javax/swing/ButtonGroup.java:
Removed some weird whitespace.
* javax/swing/CellEditor.java: Reformated.
* javax/swing/CellRendererPane.java
(serialVersionUID): New field.
(AccessibleCellRendererPaneserialVersionUID): New field.
* javax/swing/DefaultListModel.java
(serialVersionUID): New field.
* javax/swing/JEditorPane.java
(serialVersionUID): New field.
(setPage): Throws IOException.
(addHyperlinkListener): Implemented.
(removeHyperlinkListener): Implemented.
(getHyperlinkListener): New method.
* javax/swing/JFileChooser.java
(serialVersionUID): New field.
(AccessibleJFileChooser.serialVersionUID): New field.
(addActionListener): Implemented.
(removeActionListener): Implemented.
(getActionListeners): New method.
* javax/swing/JFormattedTextField.java
(serialVersionUID): New field.
(AbstractFormatter.serialVersionUID): New field.
(clone): Throws CloneNotSupportedException
(setEditValid): Add missing argument.
(stringToValue): Throws ParseExcpetion.
(valueToString): Throws ParseException.
(commitEdit): Throws ParseException.
* javax/swing/JLabel.java
(serialVersionUID): New field.
* javax/swing/JList.java
(serialVersionUID): New field.
(addListSelectionListener): Reformated.
(removeListSelectionListener): Reformated.
(getListSelectionListeners): New method.
* javax/swing/colorchooser/AbstractColorChooserPanel.java:
Reformated.
(serialVersionUID): New field.
* javax/swing/table/AbstractTableModel.java
(getValueAt): Removed.
(getColumnCount): Removed.
(getRowCount): Removed.
From-SVN: r77329
|
|
* java/awt/datatransfer/DataFlavor.java
(imageFlavor): Javadoc added.
(javaJVMLocalObjectType): Fixed.
From-SVN: r77328
|
|
* java/lang/Thread.java
(Thread): Reordered.
(setContextClassLoader): Fixed javadoc comment.
(setPriority): Reordered.
(yield): Reordered.
(initialize_native): Reordered.
(gen_name): Reordered.
From-SVN: r77327
|
|
2004-02-05 Michael Koch <konqueror@gmx.de>
* java/lang/Thread.java: Reordered fields, reformated much code,
no functional changes, some variables renamed, javadoc comments
merged.
From-SVN: r77322
|
|
2004-02-05 Michael Koch <konqueror@gmx.de>
* java/util/zip/Deflater.java,
java/util/zip/DeflaterOutputStream.java,
java/util/zip/GZIPInputStream.java:
Reformated and javadoc comments merged from classpath.
From-SVN: r77319
|
|
* gnu/java/nio/NIOServerSocket.java
(impl): Unused, removed.
* gnu/java/nio/SocketChannelImpl.java
(finnishConnect): Don't throw NoConnectionPendingException if not
connected or no connection pending.
From-SVN: r77317
|
|
2004-02-02 Graydon Hoare <graydon@redhat.com>
* javax/swing/SwingUtilities.java: Many new functions.
* java/awt/Container.java (LightweightDispatcher): Reimplement.
* javax/swing/basic/BasicGraphicsUtils.java
(getPreferredButtonSize): Start layout from top-left corner.
From-SVN: r77271
|
|
and m10.
* java/awt/geom/AffineTransform.java:
Corrected comments on the field definitions for
m11 and m10.
(shear): Fixed few errors that caused shear
transformation to be performed incorrectly.
(createInverse): Fixed to return correct
inverse of the given matrix.
From-SVN: r77261
|
|
is not set in parent environment.
* java/lang/natPosixProcess.cc (startProcess): Handle case where
PATH or LD_LIBRARY_PATH is not set in parent environment.
From-SVN: r77203
|
|
2004-02-03 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkListPeer.java,
java/awt/BorderLayout.java, java/awt/CardLayout.java,
java/awt/CheckboxGroup.java, java/awt/Choice.java,
java/awt/Component.java, java/awt/Container.java,
java/awt/FontMetrics.java, java/awt/GridBagLayout.java,
java/awt/LayoutManager2.java, java/awt/List.java,
java/awt/Menu.java, java/awt/MenuBar.java,
java/awt/MenuItem.java, java/awt/Polygon.java,
java/awt/Rectangle.java, java/awt/ScrollPane.java,
java/awt/Scrollbar.java, java/awt/TextArea.java,
java/awt/TextField.java,
java/awt/image/renderable/RenderContext.java,
javax/swing/JApplet.java: Fix handling of alias methods, where a
method has been deprecated in favour of a new one with the same
funtion but a different name. Put the method implementation in
the deprecated method and have the new method call the
deprecated one. Make all other code call the new method.
From-SVN: r77178
|