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
|
|
@ -40,14 +40,12 @@ package javax.swing.text.html;
|
|||
|
||||
import gnu.classpath.NotImplementedException;
|
||||
|
||||
import gnu.javax.swing.text.html.CharacterAttributeTranslator;
|
||||
import java.io.IOException;
|
||||
import java.net.URL;
|
||||
import java.util.HashMap;
|
||||
import java.util.Stack;
|
||||
import java.util.Vector;
|
||||
|
||||
import javax.swing.event.DocumentEvent;
|
||||
import javax.swing.event.UndoableEditEvent;
|
||||
import javax.swing.text.AbstractDocument;
|
||||
import javax.swing.text.AttributeSet;
|
||||
import javax.swing.text.BadLocationException;
|
||||
|
|
@ -130,21 +128,6 @@ public class HTMLDocument extends DefaultStyledDocument
|
|||
return styleSheet;
|
||||
}
|
||||
|
||||
/**
|
||||
* Replaces the contents of the document with the given element
|
||||
* specifications. This is called before insert if the loading is done
|
||||
* in bursts. This is the only method called if loading the document
|
||||
* entirely in one burst.
|
||||
*
|
||||
* @param data - the date that replaces the content of the document
|
||||
*/
|
||||
protected void create(DefaultStyledDocument.ElementSpec[] data)
|
||||
{
|
||||
// Once the super behaviour is properly implemented it should be sufficient
|
||||
// to simply call super.create(data).
|
||||
super.create(data);
|
||||
}
|
||||
|
||||
/**
|
||||
* This method creates a root element for the new document.
|
||||
*
|
||||
|
|
@ -215,41 +198,6 @@ public class HTMLDocument extends DefaultStyledDocument
|
|||
return new BlockElement(parent, a);
|
||||
}
|
||||
|
||||
/**
|
||||
* Inserts new elements in bulk. This is how elements get created in the
|
||||
* document. The parsing determines what structure is needed and creates the
|
||||
* specification as a set of tokens that describe the edit while leaving the
|
||||
* document free of a write-lock. This method can then be called in bursts by
|
||||
* the reader to acquire a write-lock for a shorter duration (i.e. while the
|
||||
* document is actually being altered).
|
||||
*
|
||||
* @param offset - the starting offset
|
||||
* @param data - the element data
|
||||
* @throws BadLocationException - if the given position does not
|
||||
* represent a valid location in the associated document.
|
||||
*/
|
||||
protected void insert(int offset, DefaultStyledDocument.ElementSpec[] data)
|
||||
throws BadLocationException
|
||||
{
|
||||
super.insert(offset, data);
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates document structure as a result of text insertion. This will happen
|
||||
* within a write lock. This implementation simply parses the inserted content
|
||||
* for line breaks and builds up a set of instructions for the element buffer.
|
||||
*
|
||||
* @param chng - a description of the document change
|
||||
* @param attr - the attributes
|
||||
*/
|
||||
protected void insertUpdate(AbstractDocument.DefaultDocumentEvent chng,
|
||||
AttributeSet attr)
|
||||
{
|
||||
// FIXME: Not implemented
|
||||
System.out.println("insertUpdate not implemented");
|
||||
super.insertUpdate(chng, attr);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the parser used by this HTMLDocument to insert HTML.
|
||||
*
|
||||
|
|
@ -414,6 +362,7 @@ public class HTMLDocument extends DefaultStyledDocument
|
|||
}
|
||||
|
||||
public void processHTMLFrameHyperlinkEvent(HTMLFrameHyperlinkEvent event)
|
||||
throws NotImplementedException
|
||||
{
|
||||
// TODO: Implement this properly.
|
||||
}
|
||||
|
|
@ -646,12 +595,16 @@ public class HTMLDocument extends DefaultStyledDocument
|
|||
{
|
||||
// Put the old attribute set on the stack.
|
||||
pushCharacterStyle();
|
||||
|
||||
// And create the new one by adding the attributes in <code>a</code>.
|
||||
if (a != null)
|
||||
charAttr.addAttribute(t, a.copyAttributes());
|
||||
|
||||
// Translate tag.. return if succesful.
|
||||
if(CharacterAttributeTranslator.translateTag(charAttr, t, a))
|
||||
return;
|
||||
|
||||
// Just add the attributes in <code>a</code>.
|
||||
if (a != null)
|
||||
charAttr.addAttribute(t, a.copyAttributes());
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Called when an end tag is seen for one of the types of tags associated
|
||||
* with this Action.
|
||||
|
|
@ -724,17 +677,6 @@ public class HTMLDocument extends DefaultStyledDocument
|
|||
// FIXME: Implement.
|
||||
print ("IsindexAction.start not implemented");
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when an end tag is seen for one of the types of tags associated
|
||||
* with this Action.
|
||||
*/
|
||||
public void end(HTML.Tag t)
|
||||
throws NotImplementedException
|
||||
{
|
||||
// FIXME: Implement.
|
||||
print ("IsindexAction.end not implemented");
|
||||
}
|
||||
}
|
||||
|
||||
public class ParagraphAction extends BlockAction
|
||||
|
|
@ -745,7 +687,6 @@ public class HTMLDocument extends DefaultStyledDocument
|
|||
*/
|
||||
public void start(HTML.Tag t, MutableAttributeSet a)
|
||||
{
|
||||
// FIXME: What else must be done here?
|
||||
blockOpen(t, a);
|
||||
}
|
||||
|
||||
|
|
@ -755,7 +696,6 @@ public class HTMLDocument extends DefaultStyledDocument
|
|||
*/
|
||||
public void end(HTML.Tag t)
|
||||
{
|
||||
// FIXME: What else must be done here?
|
||||
blockClose(t);
|
||||
}
|
||||
}
|
||||
|
|
@ -771,6 +711,7 @@ public class HTMLDocument extends DefaultStyledDocument
|
|||
{
|
||||
// FIXME: Implement.
|
||||
print ("PreAction.start not implemented");
|
||||
super.start(t, a);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -782,6 +723,7 @@ public class HTMLDocument extends DefaultStyledDocument
|
|||
{
|
||||
// FIXME: Implement.
|
||||
print ("PreAction.end not implemented");
|
||||
super.end(t);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -792,22 +734,9 @@ public class HTMLDocument extends DefaultStyledDocument
|
|||
* of tags associated with this Action.
|
||||
*/
|
||||
public void start(HTML.Tag t, MutableAttributeSet a)
|
||||
throws NotImplementedException
|
||||
{
|
||||
// FIXME: Implement.
|
||||
print ("SpecialAction.start not implemented");
|
||||
addSpecialElement(t, a);
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when an end tag is seen for one of the types of tags associated
|
||||
* with this Action.
|
||||
*/
|
||||
public void end(HTML.Tag t)
|
||||
throws NotImplementedException
|
||||
{
|
||||
// FIXME: Implement.
|
||||
print ("SpecialAction.end not implemented");
|
||||
}
|
||||
}
|
||||
|
||||
class AreaAction extends TagAction
|
||||
|
|
@ -1131,7 +1060,7 @@ public class HTMLDocument extends DefaultStyledDocument
|
|||
*/
|
||||
protected void pushCharacterStyle()
|
||||
{
|
||||
charAttrStack.push(charAttr);
|
||||
charAttrStack.push(charAttr.copyAttributes());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1565,8 +1494,8 @@ public class HTMLDocument extends DefaultStyledDocument
|
|||
*/
|
||||
public Element getElement(String attrId)
|
||||
{
|
||||
Element root = getDefaultRootElement();
|
||||
return getElement(root, HTML.getAttributeKey(attrId) , attrId);
|
||||
return getElement(getDefaultRootElement(), HTML.getAttributeKey(attrId),
|
||||
attrId);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1690,53 +1619,4 @@ public class HTMLDocument extends DefaultStyledDocument
|
|||
// FIXME: Not implemented fully, use InsertHTML* in HTMLEditorKit?
|
||||
System.out.println("insertAfterStart not implemented");
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the attributes associated with the paragraph containing
|
||||
* offset. If replace is false, s is merged with existing attributes. The
|
||||
* length argument determines how many characters are affected by the new
|
||||
* attributes. This is often the entire paragraph.
|
||||
*
|
||||
* @param offset -
|
||||
* the offset into the paragraph (must be at least 0)
|
||||
* @param length -
|
||||
* the number of characters affected (must be at least 0)
|
||||
* @param s -
|
||||
* the attributes
|
||||
* @param replace -
|
||||
* whether to replace existing attributes, or merge them
|
||||
*/
|
||||
public void setParagraphAttributes(int offset, int length, AttributeSet s,
|
||||
boolean replace)
|
||||
throws NotImplementedException
|
||||
{
|
||||
// FIXME: Not implemented.
|
||||
System.out.println("setParagraphAttributes not implemented");
|
||||
super.setParagraphAttributes(offset, length, s, replace);
|
||||
}
|
||||
|
||||
/**
|
||||
* This method flags a change in the document.
|
||||
*
|
||||
* @param e - the Document event
|
||||
*/
|
||||
protected void fireChangedUpdate(DocumentEvent e)
|
||||
throws NotImplementedException
|
||||
{
|
||||
// FIXME: Not implemented.
|
||||
System.out.println("fireChangedUpdate not implemented");
|
||||
super.fireChangedUpdate(e);
|
||||
}
|
||||
|
||||
/**
|
||||
* This method fires an event intended to be caught by Undo listeners. It
|
||||
* simply calls the super version inherited from DefaultStyledDocument. With
|
||||
* this method, an HTML editor could easily provide undo support.
|
||||
*
|
||||
* @param e - the UndoableEditEvent
|
||||
*/
|
||||
protected void fireUndoableEditUpdate(UndoableEditEvent e)
|
||||
{
|
||||
super.fireUndoableEditUpdate(e);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue