String.java, [...]: Merge from GNU Classpath HEAD.
2006-06-09 Thomas Fitzsimmons <fitzsim@redhat.com> * java/lang/String.java, classpath/native/jni/classpath/jcl.h, classpath/native/jni/qt-peer/eventmethods.h, classpath/native/jni/qt-peer/qtmenupeer.cpp, classpath/native/jni/qt-peer/.cvsignore, classpath/native/jni/gtk-peer/gdkdisplay.h, classpath/native/jni/gtk-peer/cairographics2d.h, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c, classpath/native/jni/gtk-peer/.cvsignore, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c, classpath/native/jni/gtk-peer/gtkpeer.h, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c, classpath/native/jni/gtk-peer/Makefile.am, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c, classpath/native/jawt/Makefile.am, classpath/native/jawt/.cvsignore, classpath/native/target/Linux/Makefile.in, classpath/native/plugin/gcjwebplugin.cc, classpath/native/plugin/Makefile.am, classpath/native/plugin/.cvsignore, classpath/resource/Makefile.in, classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java, classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java, classpath/gnu/java/awt/peer/gtk/CairoSurface.java, classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java, classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java, classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java, classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java, classpath/gnu/java/awt/peer/gtk/GdkGraphics2D.java, classpath/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java, classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java, classpath/gnu/java/awt/peer/gtk/GdkGraphics.java, classpath/gnu/java/awt/peer/gtk/GtkToolkit.java, classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java, classpath/gnu/java/awt/peer/gtk/BufferedImageGraphics.java, classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java, classpath/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java, classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java, classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java, classpath/gnu/java/awt/peer/gtk/GtkImage.java, classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java, classpath/gnu/java/awt/peer/gtk/GdkGlyphVector.java, classpath/gnu/java/awt/peer/gtk/GtkCanvasPeer.java, classpath/gnu/java/awt/peer/swing/SwingContainerPeer.java, classpath/gnu/java/awt/peer/swing/SwingComponent.java, classpath/gnu/java/awt/peer/swing/SwingTextFieldPeer.java, classpath/gnu/java/awt/peer/swing/SwingMenuBarPeer.java, classpath/gnu/java/awt/peer/swing/SwingFramePeer.java, classpath/gnu/java/awt/peer/swing/SwingComponentPeer.java, classpath/gnu/java/awt/peer/swing/SwingWindowPeer.java, classpath/gnu/java/awt/print/JavaPrinterJob.java, classpath/gnu/java/awt/print/PostScriptGraphics2D.java, classpath/gnu/java/awt/print/SpooledDocument.java, classpath/gnu/java/awt/print/JavaPrinterGraphics.java, classpath/gnu/java/awt/BitwiseXORComposite.java, classpath/gnu/java/awt/font/GNUGlyphVector.java, classpath/gnu/java/awt/font/opentype/NameDecoder.java, classpath/gnu/java/awt/java2d/RasterGraphics.java, classpath/gnu/java/awt/java2d/TexturePaintContext.java, classpath/gnu/java/awt/java2d/PolyEdge.java, classpath/gnu/java/awt/java2d/AbstractGraphics2D.java, classpath/gnu/java/awt/java2d/AlphaCompositeContext.java, classpath/gnu/java/awt/java2d/ImagePaint.java, classpath/gnu/java/awt/Buffers.java, classpath/gnu/classpath/Configuration.java.in, classpath/gnu/javax/swing/text/html/CombinedAttributes.java, classpath/gnu/javax/swing/text/html/CharacterAttributeTranslator.java, classpath/gnu/javax/swing/text/html/parser/htmlAttributeSet.java, classpath/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java, classpath/gnu/javax/swing/text/html/ImageViewIconFactory.java, classpath/tools/toolwrapper.c, classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java, classpath/tools/gnu/classpath/tools/native2ascii/Messages.java, classpath/tools/gnu/classpath/tools/getopt/FileArgumentCallback.java, classpath/tools/gnu/classpath/tools/getopt/OptionGroup.java, classpath/tools/gnu/classpath/tools/getopt/OptionException.java, classpath/tools/gnu/classpath/tools/getopt/Messages.java, classpath/tools/gnu/classpath/tools/getopt/Option.java, classpath/tools/gnu/classpath/tools/getopt/Parser.java, classpath/tools/gnu/classpath/tools/getopt/ClasspathToolParser.java, classpath/tools/gnu/classpath/tools/jarsigner/JarSigner.java, classpath/tools/gnu/classpath/tools/jarsigner/Main.java, classpath/tools/gnu/classpath/tools/jarsigner/Messages.java, classpath/tools/gnu/classpath/tools/jarsigner/package.html, classpath/tools/gnu/classpath/tools/keytool/ListCmd.java, classpath/tools/gnu/classpath/tools/keytool/StorePasswdCmd.java, classpath/tools/gnu/classpath/tools/keytool/ExportCmd.java, classpath/tools/gnu/classpath/tools/keytool/GenKeyCmd.java, classpath/tools/gnu/classpath/tools/keytool/Messages.java, classpath/tools/gnu/classpath/tools/keytool/package.html, classpath/tools/gnu/classpath/tools/keytool/Command.java, classpath/tools/gnu/classpath/tools/keytool/IdentityDBCmd.java, classpath/tools/gnu/classpath/tools/keytool/Main.java, classpath/tools/gnu/classpath/tools/keytool/DeleteCmd.java, classpath/tools/gnu/classpath/tools/keytool/CertReqCmd.java, classpath/tools/gnu/classpath/tools/keytool/SelfCertCmd.java, classpath/tools/gnu/classpath/tools/keytool/KeyCloneCmd.java, classpath/tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java, classpath/tools/gnu/classpath/tools/keytool/ImportCmd.java, classpath/tools/gnu/classpath/tools/keytool/PrintCertCmd.java, classpath/tools/gnu/classpath/tools/rmi/registry/package.html, classpath/tools/gnu/classpath/tools/rmi/RMIC.txt, classpath/tools/gnu/classpath/tools/rmi/RMIC.java, classpath/tools/gnu/classpath/tools/appletviewer/ErrorApplet.java, classpath/tools/gnu/classpath/tools/appletviewer/AppletClassLoader.java, classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletContext.java, classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletContext.java, classpath/tools/gnu/classpath/tools/appletviewer/AppletSecurityManager.java, classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletContext.java, classpath/tools/gnu/classpath/tools/appletviewer/AppletWarning.java, classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletViewer.java, classpath/tools/gnu/classpath/tools/appletviewer/AppletTag.java, classpath/tools/gnu/classpath/tools/appletviewer/ConsoleDialog.java, classpath/tools/gnu/classpath/tools/appletviewer/Main.java, classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java, classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletViewer.java, classpath/tools/gnu/classpath/tools/appletviewer/TagParser.java, classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java, classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java, classpath/tools/gnu/classpath/tools/serialver/Messages.java, classpath/tools/gnu/classpath/tools/serialver/SerialVer.java, classpath/tools/gnu/classpath/tools/jar/Creator.java, classpath/tools/gnu/classpath/tools/jar/Entry.java, classpath/tools/gnu/classpath/tools/jar/Lister.java, classpath/tools/gnu/classpath/tools/jar/Main.java, classpath/tools/gnu/classpath/tools/jar/Updater.java, classpath/tools/gnu/classpath/tools/jar/Messages.java, classpath/tools/gnu/classpath/tools/jar/Extractor.java, classpath/tools/gnu/classpath/tools/jar/Action.java, classpath/tools/gnu/classpath/tools/jar/Indexer.java, classpath/tools/gnu/classpath/tools/jar/WorkSet.java, classpath/tools/gnu/classpath/tools/giop/GRMIC.txt, classpath/tools/gnu/classpath/tools/giop/grmic/GiopRmicCompiler.java, classpath/tools/gnu/classpath/tools/giop/GRMIC.java, classpath/tools/Makefile.am, classpath/tools/jarsigner.in, classpath/tools/keytool.in, classpath/tools/appletviewer.in, classpath/tools/.cvsignore, classpath/configure.ac, classpath/javax/swing/JTabbedPane.java, classpath/javax/swing/AbstractButton.java, classpath/javax/swing/JViewport.java, classpath/javax/swing/KeyboardManager.java, classpath/javax/swing/JMenuItem.java, classpath/javax/swing/JMenuBar.java, classpath/javax/swing/MenuSelectionManager.java, classpath/javax/swing/JOptionPane.java, classpath/javax/swing/JSpinner.java, classpath/javax/swing/JCheckBoxMenuItem.java, classpath/javax/swing/JEditorPane.java, classpath/javax/swing/JFormattedTextField.java, classpath/javax/swing/JTree.java, classpath/javax/swing/CellRendererPane.java, classpath/javax/swing/JScrollPane.java, classpath/javax/swing/tree/VariableHeightLayoutCache.java, classpath/javax/swing/tree/TreeNode.java, classpath/javax/swing/tree/FixedHeightLayoutCache.java, classpath/javax/swing/tree/DefaultTreeCellEditor.java, classpath/javax/swing/tree/TreePath.java, classpath/javax/swing/tree/RowMapper.java, classpath/javax/swing/tree/DefaultMutableTreeNode.java, classpath/javax/swing/tree/DefaultTreeModel.java, classpath/javax/swing/tree/AbstractLayoutCache.java, classpath/javax/swing/tree/TreeSelectionModel.java, classpath/javax/swing/tree/DefaultTreeSelectionModel.java, classpath/javax/swing/tree/DefaultTreeCellRenderer.java, classpath/javax/swing/tree/ExpandVetoException.java, classpath/javax/swing/JList.java, classpath/javax/swing/table/JTableHeader.java, classpath/javax/swing/table/AbstractTableModel.java, classpath/javax/swing/table/DefaultTableModel.java, classpath/javax/swing/table/TableCellEditor.java, classpath/javax/swing/table/TableCellRenderer.java, classpath/javax/swing/ProgressMonitor.java, classpath/javax/swing/JToolBar.java, classpath/javax/swing/TransferHandler.java, classpath/javax/swing/DefaultCellEditor.java, classpath/javax/swing/DefaultButtonModel.java, classpath/javax/swing/JLayeredPane.java, classpath/javax/swing/text/DefaultEditorKit.java, classpath/javax/swing/text/DefaultCaret.java, classpath/javax/swing/text/FieldView.java, classpath/javax/swing/text/JTextComponent.java, classpath/javax/swing/text/TextAction.java, classpath/javax/swing/text/StyleContext.java, classpath/javax/swing/text/html/HTMLDocument.java, classpath/javax/swing/text/html/MinimalHTMLWriter.java, classpath/javax/swing/text/html/ImageView.java, classpath/javax/swing/text/html/HTMLEditorKit.java, classpath/javax/swing/text/AbstractWriter.java, classpath/javax/swing/text/GapContent.java, classpath/javax/swing/text/Utilities.java, classpath/javax/swing/text/PlainView.java, classpath/javax/swing/UIManager.java, classpath/javax/swing/JSplitPane.java, classpath/javax/swing/JComponent.java, classpath/javax/swing/SwingUtilities.java, classpath/javax/swing/border/AbstractBorder.java, classpath/javax/swing/border/CompoundBorder.java, classpath/javax/swing/border/TitledBorder.java, classpath/javax/swing/border/MatteBorder.java, classpath/javax/swing/border/BevelBorder.java, classpath/javax/swing/RepaintManager.java, classpath/javax/swing/JTable.java, classpath/javax/swing/UIDefaults.java, classpath/javax/swing/DefaultDesktopManager.java, classpath/javax/swing/JMenu.java, classpath/javax/swing/JLabel.java, classpath/javax/swing/JSlider.java, classpath/javax/swing/plaf/basic/BasicToolBarUI.java, classpath/javax/swing/plaf/basic/BasicButtonUI.java, classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java, classpath/javax/swing/plaf/basic/BasicTextAreaUI.java, classpath/javax/swing/plaf/basic/BasicToggleButtonUI.java, classpath/javax/swing/plaf/basic/BasicSpinnerUI.java, classpath/javax/swing/plaf/basic/BasicSliderUI.java, classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java, classpath/javax/swing/plaf/basic/BasicComboPopup.java, classpath/javax/swing/plaf/basic/BasicCheckBoxUI.java, classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java, classpath/javax/swing/plaf/basic/BasicProgressBarUI.java, classpath/javax/swing/plaf/basic/BasicRadioButtonUI.java, classpath/javax/swing/plaf/basic/BasicPanelUI.java, classpath/javax/swing/plaf/basic/BasicSplitPaneUI.java, classpath/javax/swing/plaf/basic/BasicTreeUI.java, classpath/javax/swing/plaf/basic/BasicTableHeaderUI.java, classpath/javax/swing/plaf/basic/BasicFileChooserUI.java, classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java, classpath/javax/swing/plaf/basic/BasicComboBoxUI.java, classpath/javax/swing/plaf/basic/BasicListUI.java, classpath/javax/swing/plaf/basic/BasicIconFactory.java, classpath/javax/swing/plaf/basic/BasicTextUI.java, classpath/javax/swing/plaf/basic/BasicLookAndFeel.java, classpath/javax/swing/plaf/basic/BasicDirectoryModel.java, classpath/javax/swing/plaf/basic/BasicRootPaneUI.java, classpath/javax/swing/plaf/basic/BasicTableUI.java, classpath/javax/swing/plaf/basic/SharedUIDefaults.java, classpath/javax/swing/plaf/multi/MultiComboBoxUI.java, classpath/javax/swing/plaf/multi/MultiListUI.java, classpath/javax/swing/plaf/multi/MultiSplitPaneUI.java, classpath/javax/swing/plaf/multi/MultiFileChooserUI.java, classpath/javax/swing/plaf/multi/MultiOptionPaneUI.java, classpath/javax/swing/plaf/multi/MultiTabbedPaneUI.java, classpath/javax/swing/plaf/multi/MultiLookAndFeel.java, classpath/javax/swing/plaf/metal/MetalSliderUI.java, classpath/javax/swing/plaf/metal/MetalIconFactory.java, classpath/javax/swing/plaf/metal/MetalComboBoxIcon.java, classpath/javax/swing/plaf/metal/MetalTabbedPaneUI.java, classpath/javax/swing/plaf/metal/MetalLookAndFeel.java, classpath/javax/swing/plaf/metal/MetalCheckBoxUI.java, classpath/javax/swing/plaf/metal/MetalSeparatorUI.java, classpath/javax/swing/plaf/metal/MetalBorders.java, classpath/javax/swing/plaf/metal/MetalSplitPaneDivider.java, classpath/javax/swing/plaf/metal/MetalScrollBarUI.java, classpath/javax/swing/plaf/metal/MetalRootPaneUI.java, classpath/javax/swing/plaf/metal/MetalInternalFrameUI.java, classpath/javax/swing/plaf/metal/MetalRadioButtonUI.java, classpath/javax/swing/plaf/metal/MetalToolTipUI.java, classpath/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java, classpath/javax/swing/plaf/metal/MetalFileChooserUI.java, classpath/javax/swing/plaf/metal/MetalUtils.java, classpath/javax/swing/plaf/metal/MetalComboBoxButton.java, classpath/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java, classpath/javax/swing/plaf/metal/MetalButtonUI.java, classpath/javax/swing/JPopupMenu.java, classpath/javax/swing/JProgressBar.java, classpath/javax/swing/WindowConstants.java, classpath/javax/swing/JFrame.java, classpath/javax/swing/JFileChooser.java, classpath/javax/swing/JComboBox.java, classpath/javax/swing/event/EventListenerList.java, classpath/javax/swing/ListSelectionModel.java, classpath/javax/swing/JScrollBar.java, classpath/java/text/SimpleDateFormat.java, classpath/java/text/NumberFormat.java, classpath/java/text/class-dependencies.conf, classpath/java/awt/image/ColorModel.java, classpath/java/awt/image/BufferedImage.java, classpath/java/awt/Window.java, classpath/java/awt/ContainerOrderFocusTraversalPolicy.java, classpath/java/awt/LightweightDispatcher.java, classpath/java/awt/EventDispatchThread.java, classpath/java/awt/BasicStroke.java, classpath/java/awt/ColorPaintContext.java, classpath/java/awt/Container.java, classpath/java/awt/TexturePaint.java, classpath/java/awt/Component.java, classpath/java/awt/Font.java, classpath/java/awt/GraphicsConfiguration.java, classpath/java/awt/DefaultKeyboardFocusManager.java, classpath/java/awt/print/PrinterJob.java, classpath/java/awt/im/InputContext.java, classpath/java/awt/dnd/DragGestureRecognizer.java, classpath/java/awt/Toolkit.java, classpath/java/awt/font/GraphicAttribute.java, classpath/java/awt/font/ImageGraphicAttribute.java, classpath/java/awt/font/GlyphVector.java, classpath/java/awt/font/GlyphMetrics.java, classpath/java/awt/font/ShapeGraphicAttribute.java, classpath/java/awt/Graphics2D.java, classpath/include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h, classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h, classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h, classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h, classpath/include/gnu_java_awt_peer_gtk_GtkCanvasPeer.h, classpath/include/config.h.in, classpath/include/gnu_java_awt_peer_gtk_GdkTextLayout.h, classpath/include/gnu_java_awt_peer_gtk_GtkComponentPeer.h, classpath/include/gnu_java_awt_peer_gtk_GdkFontPeer.h, classpath/include/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.h, classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h, classpath/include/gnu_java_awt_peer_gtk_GtkImage.h, classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h, classpath/include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h: Merge from GNU Classpath HEAD. From-SVN: r114510
This commit is contained in:
Thomas Fitzsimmons
Thomas Fitzsimmons
parent
6c65d7577c
commit
02440ca432
360 changed files with 34743 additions and 9337 deletions
|
|
@ -437,132 +437,92 @@ public class PlainView extends View implements TabExpander
|
|||
*/
|
||||
protected void updateDamage(DocumentEvent changes, Shape a, ViewFactory f)
|
||||
{
|
||||
// Return early and do no updates if the allocation area is null
|
||||
// (like the RI).
|
||||
if (a == null)
|
||||
return;
|
||||
|
||||
float oldMaxLineLength = maxLineLength;
|
||||
Rectangle alloc = a.getBounds();
|
||||
Element el = getElement();
|
||||
ElementChange ec = changes.getChange(el);
|
||||
|
||||
// If ec is null then no lines were added or removed, just
|
||||
// repaint the changed line
|
||||
if (ec == null)
|
||||
// This happens during initialization.
|
||||
if (metrics == null)
|
||||
{
|
||||
int line = el.getElementIndex(changes.getOffset());
|
||||
|
||||
// If characters have been removed from the current longest line
|
||||
// we have to find out which one is the longest now otherwise
|
||||
// the preferred x-axis span will not shrink.
|
||||
if (changes.getType() == DocumentEvent.EventType.REMOVE
|
||||
&& el.getElement(line) == longestLine)
|
||||
{
|
||||
maxLineLength = -1;
|
||||
if (determineMaxLineLength() != alloc.width)
|
||||
preferenceChanged(this, true, false);
|
||||
}
|
||||
|
||||
damageLineRange(line, line, a, getContainer());
|
||||
return;
|
||||
}
|
||||
|
||||
Element[] removed = ec.getChildrenRemoved();
|
||||
Element[] newElements = ec.getChildrenAdded();
|
||||
|
||||
// If no Elements were added or removed, we just want to repaint
|
||||
// the area containing the line that was modified
|
||||
if (removed == null && newElements == null)
|
||||
{
|
||||
int line = getElement().getElementIndex(changes.getOffset());
|
||||
|
||||
damageLineRange(line, line, a, getContainer());
|
||||
updateMetrics();
|
||||
preferenceChanged(null, true, true);
|
||||
return;
|
||||
}
|
||||
|
||||
// Check to see if we removed the longest line, if so we have to
|
||||
// search through all lines and find the longest one again.
|
||||
if (removed != null)
|
||||
Element element = getElement();
|
||||
|
||||
// Find longest line if it hasn't been initialized yet.
|
||||
if (longestLine == null)
|
||||
findLongestLine(0, element.getElementCount() - 1);
|
||||
|
||||
ElementChange change = changes.getChange(element);
|
||||
if (changes.getType() == DocumentEvent.EventType.INSERT)
|
||||
{
|
||||
for (int i = 0; i < removed.length; i++)
|
||||
if (removed[i].equals(longestLine))
|
||||
{
|
||||
// reset maxLineLength and search through all lines for longest one
|
||||
maxLineLength = -1;
|
||||
if (determineMaxLineLength() != alloc.width)
|
||||
preferenceChanged(this, true, removed.length != newElements.length);
|
||||
|
||||
((JTextComponent)getContainer()).repaint();
|
||||
|
||||
return;
|
||||
// Handles character/line insertion.
|
||||
|
||||
// Determine if lines have been added. In this case we repaint
|
||||
// differently.
|
||||
boolean linesAdded = true;
|
||||
if (change == null)
|
||||
linesAdded = false;
|
||||
|
||||
// Determine the start line.
|
||||
int start;
|
||||
if (linesAdded)
|
||||
start = change.getIndex();
|
||||
else
|
||||
start = element.getElementIndex(changes.getOffset());
|
||||
|
||||
// Determine the length of the updated region.
|
||||
int length = 0;
|
||||
if (linesAdded)
|
||||
length = change.getChildrenAdded().length - 1;
|
||||
|
||||
// Update the longest line and length.
|
||||
int oldMaxLength = (int) maxLineLength;
|
||||
if (longestLine.getEndOffset() < changes.getOffset()
|
||||
|| longestLine.getStartOffset() > changes.getOffset()
|
||||
+ changes.getLength())
|
||||
{
|
||||
findLongestLine(start, start + length);
|
||||
}
|
||||
else
|
||||
{
|
||||
findLongestLine(0, element.getElementCount() - 1);
|
||||
}
|
||||
|
||||
// Trigger a preference change so that the layout gets updated
|
||||
// correctly.
|
||||
preferenceChanged(null, maxLineLength != oldMaxLength, linesAdded);
|
||||
|
||||
// Damage the updated line range.
|
||||
int endLine = start;
|
||||
if (linesAdded)
|
||||
endLine = element.getElementCount() - 1;
|
||||
damageLineRange(start, endLine, a, getContainer());
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
// Handles character/lines removals.
|
||||
|
||||
// Update the longest line and length and trigger preference changed.
|
||||
int oldMaxLength = (int) maxLineLength;
|
||||
if (change != null)
|
||||
{
|
||||
// Line(s) have been removed.
|
||||
findLongestLine(0, element.getElementCount() - 1);
|
||||
preferenceChanged(null, maxLineLength != oldMaxLength, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
// No line has been removed.
|
||||
int lineNo = getElement().getElementIndex(changes.getOffset());
|
||||
Element line = getElement().getElement(lineNo);
|
||||
if (longestLine == line)
|
||||
{
|
||||
findLongestLine(0, element.getElementCount() - 1);
|
||||
preferenceChanged(null, maxLineLength != oldMaxLength, false);
|
||||
}
|
||||
damageLineRange(lineNo, lineNo, a, getContainer());
|
||||
}
|
||||
}
|
||||
|
||||
// If we've reached here, that means we haven't removed the longest line
|
||||
if (newElements == null)
|
||||
{
|
||||
// No lines were added, just repaint the container and exit
|
||||
((JTextComponent)getContainer()).repaint();
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
// Make sure we have the metrics
|
||||
updateMetrics();
|
||||
|
||||
// If we've reached here, that means we haven't removed the longest line
|
||||
// and we have added at least one line, so we have to check if added lines
|
||||
// are longer than the previous longest line
|
||||
Segment seg = getLineBuffer();
|
||||
float longestNewLength = 0;
|
||||
Element longestNewLine = null;
|
||||
|
||||
// Loop through the added lines to check their length
|
||||
for (int i = 0; i < newElements.length; i++)
|
||||
{
|
||||
Element child = newElements[i];
|
||||
int start = child.getStartOffset();
|
||||
int end = child.getEndOffset() - 1;
|
||||
try
|
||||
{
|
||||
el.getDocument().getText(start, end - start, seg);
|
||||
}
|
||||
catch (BadLocationException ex)
|
||||
{
|
||||
AssertionError ae = new AssertionError("Unexpected bad location");
|
||||
ae.initCause(ex);
|
||||
throw ae;
|
||||
}
|
||||
|
||||
if (seg == null || seg.array == null || seg.count == 0)
|
||||
continue;
|
||||
|
||||
int width = metrics.charsWidth(seg.array, seg.offset, seg.count);
|
||||
if (width > longestNewLength)
|
||||
{
|
||||
longestNewLine = child;
|
||||
longestNewLength = width;
|
||||
}
|
||||
}
|
||||
|
||||
// Check if the longest of the new lines is longer than our previous
|
||||
// longest line, and if so update our values
|
||||
if (longestNewLength > maxLineLength)
|
||||
{
|
||||
maxLineLength = longestNewLength;
|
||||
longestLine = longestNewLine;
|
||||
}
|
||||
|
||||
// Report any changes to the preferred sizes of the view
|
||||
// which may cause the underlying component to be revalidated.
|
||||
boolean widthChanged = oldMaxLineLength != maxLineLength;
|
||||
boolean heightChanged = removed.length != newElements.length;
|
||||
if (widthChanged || heightChanged)
|
||||
preferenceChanged(this, widthChanged, heightChanged);
|
||||
|
||||
// Repaint the container
|
||||
((JTextComponent)getContainer()).repaint();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -648,5 +608,54 @@ public class PlainView extends View implements TabExpander
|
|||
lineBuffer = new Segment();
|
||||
return lineBuffer;
|
||||
}
|
||||
|
||||
/**
|
||||
* Finds and updates the longest line in the view inside an interval of
|
||||
* lines.
|
||||
*
|
||||
* @param start the start of the search interval
|
||||
* @param end the end of the search interval
|
||||
*/
|
||||
private void findLongestLine(int start, int end)
|
||||
{
|
||||
for (int i = start; i <= end; i++)
|
||||
{
|
||||
int w = getLineLength(i);
|
||||
if (w > maxLineLength)
|
||||
{
|
||||
maxLineLength = w;
|
||||
longestLine = getElement().getElement(i);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Determines the length of the specified line.
|
||||
*
|
||||
* @param line the number of the line
|
||||
*
|
||||
* @return the length of the line in pixels
|
||||
*/
|
||||
private int getLineLength(int line)
|
||||
{
|
||||
Element lineEl = getElement().getElement(line);
|
||||
Segment buffer = getLineBuffer();
|
||||
try
|
||||
{
|
||||
Document doc = getDocument();
|
||||
doc.getText(lineEl.getStartOffset(),
|
||||
lineEl.getEndOffset() - lineEl.getStartOffset() - 1,
|
||||
buffer);
|
||||
}
|
||||
catch (BadLocationException ex)
|
||||
{
|
||||
AssertionError err = new AssertionError("Unexpected bad location");
|
||||
err.initCause(ex);
|
||||
throw err;
|
||||
}
|
||||
|
||||
return Utilities.getTabbedTextWidth(buffer, metrics, 0, this,
|
||||
lineEl.getStartOffset());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue