FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Imported Classpath 0.18.

Browse source 
* sources.am, Makefile.in: Updated.
	* Makefile.am (nat_source_files): Removed natProxy.cc.
	* java/lang/reflect/natProxy.cc: Removed.
	* gnu/classpath/jdwp/VMFrame.java,
	gnu/classpath/jdwp/VMIdManager.java,
	gnu/classpath/jdwp/VMVirtualMachine.java,
	java/lang/reflect/VMProxy.java: New files.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* scripts/makemake.tcl (verbose): Add gnu/java/awt/peer/qt to BC
	list.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/net/DefaultContentHandlerFactory.java (getContent):
	Remove ClasspathToolkit references.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/awt/xlib/XCanvasPeer.java: Add new peer methods.
	* gnu/awt/xlib/XFramePeer.java: Likewise.
	* gnu/awt/xlib/XGraphicsConfiguration.java: Likewise.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* Makefile.am (libgcjawt_la_SOURCES): Remove jawt.c.  Add
	classpath/native/jawt/jawt.c.
	* Makefile.in: Regenerate.
	* jawt.c: Remove file.
	* include/Makefile.am (tool_include__HEADERS): Remove jawt.h and
	jawt_md.h.  Add ../classpath/include/jawt.h and
	../classpath/include/jawt_md.h.
	* include/Makefile.in: Regenerate.
	* include/jawt.h: Regenerate.
	* include/jawt_md.h: Regenerate.

From-SVN: r104586
This commit is contained in:
Tom Tromey 2005-09-23 21:31:04 +00:00
parent 9b044d1951
commit 1ea63ef8be
544 changed files with 34724 additions and 14512 deletions
Download patch file Download diff file Expand all files Collapse all files

590
libjava/classpath/javax/swing/text/DefaultEditorKit.java
View file

@ -51,44 +51,135 @@ import java.io.Writer;
import javax.swing.Action;
/**
* The default implementation of {@link EditorKit}. This <code>EditorKit</code>
* a plain text <code>Document</code> and several commands that together
* make up a basic editor, like cut / copy + paste.
*
* @author original author unknown
* @author Roman Kennke (roman@kennke.org)
*/
public class DefaultEditorKit extends EditorKit
{
/**
* Creates a beep on the PC speaker.
*
* @see Toolkit#beep()
*/
public static class BeepAction
extends TextAction
{
/**
* Creates a new <code>BeepAction</code>.
*/
public BeepAction()
{
super(beepAction);
}
/**
* Performs the <code>Action</code>.
*
* @param event the action event describing the user action
*/
public void actionPerformed(ActionEvent event)
{
Toolkit.getDefaultToolkit().beep();
}
}
/**
* Copies the selected content into the system clipboard.
*
* @see Toolkit#getSystemClipboard()
* @see CutAction
* @see PasteAction
*/
public static class CopyAction
extends TextAction
{
/**
* Create a new <code>CopyAction</code>.
*/
public CopyAction()
{
super(copyAction);
}
/**
* Performs the <code>Action</code>.
*
* @param event the action event describing the user action
*/
public void actionPerformed(ActionEvent event)
{
// FIXME: Implement me. Tookit.getSystemClipboard should be used
// for that.
}
}
/**
* Copies the selected content into the system clipboard and deletes the
* selection.
*
* @see Toolkit#getSystemClipboard()
* @see CopyAction
* @see PasteAction
*/
public static class CutAction
extends TextAction
{
/**
* Create a new <code>CutAction</code>.
*/
public CutAction()
{
super(cutAction);
}
/**
* Performs the <code>Action</code>.
*
* @param event the action event describing the user action
*/
public void actionPerformed(ActionEvent event)
{
// FIXME: Implement me. Tookit.getSystemClipboard should be used
// for that.
}
}
/**
* Copies content from the system clipboard into the editor.
*
* @see Toolkit#getSystemClipboard()
* @see CopyAction
* @see CutAction
*/
public static class PasteAction
extends TextAction
{
/**
* Create a new <code>PasteAction</code>.
*/
public PasteAction()
{
super(pasteAction);
}
/**
* Performs the <code>Action</code>.
*
* @param event the action event describing the user action
*/
public void actionPerformed(ActionEvent event)
{
// FIXME: Implement me. Tookit.getSystemClipboard should be used
// for that.
}
}
@ -99,17 +190,26 @@ public class DefaultEditorKit extends EditorKit
* the control characters and characters with the ALT-modifier.
*
* If an event does not get filtered, it is inserted into the document
* of the text component. If there is some text selected in the text component,
* this text will be replaced.
* of the text component. If there is some text selected in the text
* component, this text will be replaced.
*/
public static class DefaultKeyTypedAction
extends TextAction
{
/**
* Creates a new <code>DefaultKeyTypedAction</code>.
*/
public DefaultKeyTypedAction()
{
super(defaultKeyTypedAction);
}
/**
* Performs the <code>Action</code>.
*
* @param event the action event describing the user action
*/
public void actionPerformed(ActionEvent event)
{
// first we filter the following events:
@ -124,9 +224,11 @@ public class DefaultEditorKit extends EditorKit
{
try
{
t.getDocument().insertString(t.getCaret().getDot(), event.getActionCommand(), null);
t.getDocument().insertString(t.getCaret().getDot(),
event.getActionCommand(), null);
t.getCaret().setDot(Math.min(t.getCaret().getDot() + 1,
t.getDocument().getEndPosition().getOffset()));
t.getDocument().getEndPosition()
.getOffset()));
}
catch (BadLocationException be)
{
@ -144,11 +246,20 @@ public class DefaultEditorKit extends EditorKit
public static class InsertBreakAction
extends TextAction
{
/**
* Creates a new <code>InsertBreakAction</code>.
*/
public InsertBreakAction()
{
super(insertBreakAction);
}
/**
* Performs the <code>Action</code>.
*
* @param event the action event describing the user action
*/
public void actionPerformed(ActionEvent event)
{
JTextComponent t = getTextComponent(event);
@ -156,101 +267,446 @@ public class DefaultEditorKit extends EditorKit
}
}
/**
* Places content into the associated editor. If there currently is a
* selection, this selection is replaced.
*/
// FIXME: Figure out what this Action is supposed to do. Obviously text
// that is entered by the user is inserted through DefaultKeyTypedAction.
public static class InsertContentAction
extends TextAction
{
/**
* Creates a new <code>InsertContentAction</code>.
*/
public InsertContentAction()
{
super(insertContentAction);
}
/**
* Performs the <code>Action</code>.
*
* @param event the action event describing the user action
*/
public void actionPerformed(ActionEvent event)
{
}
}
/**
* Inserts a TAB character into the text editor.
*/
public static class InsertTabAction
extends TextAction
{
/**
* Creates a new <code>TabAction</code>.
*/
public InsertTabAction()
{
super(insertTabAction);
}
/**
* Performs the <code>Action</code>.
*
* @param event the action event describing the user action
*/
public void actionPerformed(ActionEvent event)
{
// FIXME: Implement this.
}
}
public static class PasteAction
extends TextAction
{
public PasteAction()
{
super(pasteAction);
}
public void actionPerformed(ActionEvent event)
{
}
}
/**
* The serial version of DefaultEditorKit.
*/
private static final long serialVersionUID = 9017245433028523428L;
/**
* The name of the <code>Action</code> that moves the caret one character
* backwards.
*
* @see #getActions()
*/
public static final String backwardAction = "caret-backward";
/**
* The name of the <code>Action</code> that creates a beep in the speaker.
*
* @see #getActions()
*/
public static final String beepAction = "beep";
/**
* The name of the <code>Action</code> that moves the caret to the beginning
* of the <code>Document</code>.
*
* @see #getActions()
*/
public static final String beginAction = "caret-begin";
/**
* The name of the <code>Action</code> that moves the caret to the beginning
* of the current line.
*
* @see #getActions()
*/
public static final String beginLineAction = "caret-begin-line";
/**
* The name of the <code>Action</code> that moves the caret to the beginning
* of the current paragraph.
*
* @see #getActions()
*/
public static final String beginParagraphAction = "caret-begin-paragraph";
/**
* The name of the <code>Action</code> that moves the caret to the beginning
* of the current word.
*
* @see #getActions()
*/
public static final String beginWordAction = "caret-begin-word";
/**
* The name of the <code>Action</code> that copies the selected content
* into the system clipboard.
*
* @see #getActions()
*/
public static final String copyAction = "copy-to-clipboard";
/**
* The name of the <code>Action</code> that copies the selected content
* into the system clipboard and removes the selection.
*
* @see #getActions()
*/
public static final String cutAction = "cut-to-clipboard";
/**
* The name of the <code>Action</code> that is performed by default if
* a key is typed and there is no keymap entry.
*
* @see #getActions()
*/
public static final String defaultKeyTypedAction = "default-typed";
/**
* The name of the <code>Action</code> that deletes the character that
* follows the current caret position.
*
* @see #getActions()
*/
public static final String deleteNextCharAction = "delete-next";
/**
* The name of the <code>Action</code> that deletes the character that
* precedes the current caret position.
*
* @see #getActions()
*/
public static final String deletePrevCharAction = "delete-previous";
/**
* The name of the <code>Action</code> that moves the caret one line down.
*
* @see #getActions()
*/
public static final String downAction = "caret-down";
/**
* The name of the <code>Action</code> that moves the caret to the end
* of the <code>Document</code>.
*
* @see #getActions()
*/
public static final String endAction = "caret-end";
/**
* The name of the <code>Action</code> that moves the caret to the end
* of the current line.
*
* @see #getActions()
*/
public static final String endLineAction = "caret-end-line";
/**
* When a document is read and an CRLF is encountered, then we add a property
* with this name and a value of &quot;\r\n&quot;.
*/
public static final String EndOfLineStringProperty = "__EndOfLine__";
/**
* The name of the <code>Action</code> that moves the caret to the end
* of the current paragraph.
*
* @see #getActions()
*/
public static final String endParagraphAction = "caret-end-paragraph";
/**
* The name of the <code>Action</code> that moves the caret to the end
* of the current word.
*
* @see #getActions()
*/
public static final String endWordAction = "caret-end-word";
/**
* The name of the <code>Action</code> that moves the caret one character
* forward.
*
* @see #getActions()
*/
public static final String forwardAction = "caret-forward";
/**
* The name of the <code>Action</code> that inserts a line break.
*
* @see #getActions()
*/
public static final String insertBreakAction = "insert-break";
/**
* The name of the <code>Action</code> that inserts some content.
*
* @see #getActions()
*/
public static final String insertContentAction = "insert-content";
/**
* The name of the <code>Action</code> that inserts a TAB.
*
* @see #getActions()
*/
public static final String insertTabAction = "insert-tab";
/**
* The name of the <code>Action</code> that moves the caret to the beginning
* of the next word.
*
* @see #getActions()
*/
public static final String nextWordAction = "caret-next-word";
/**
* The name of the <code>Action</code> that moves the caret one page down.
*
* @see #getActions()
*/
public static final String pageDownAction = "page-down";
/**
* The name of the <code>Action</code> that moves the caret one page up.
*
* @see #getActions()
*/
public static final String pageUpAction = "page-up";
/**
* The name of the <code>Action</code> that copies content from the system
* clipboard into the document.
*
* @see #getActions()
*/
public static final String pasteAction = "paste-from-clipboard";
/**
* The name of the <code>Action</code> that moves the caret to the beginning
* of the previous word.
*
* @see #getActions()
*/
public static final String previousWordAction = "caret-previous-word";
/**
* The name of the <code>Action</code> that sets the editor in read only
* mode.
*
* @see #getActions()
*/
public static final String readOnlyAction = "set-read-only";
/**
* The name of the <code>Action</code> that selects the whole document.
*
* @see #getActions()
*/
public static final String selectAllAction = "select-all";
/**
* The name of the <code>Action</code> that moves the caret one character
* backwards, possibly extending the current selection.
*
* @see #getActions()
*/
public static final String selectionBackwardAction = "selection-backward";
/**
* The name of the <code>Action</code> that moves the caret to the beginning
* of the document, possibly extending the current selection.
*
* @see #getActions()
*/
public static final String selectionBeginAction = "selection-begin";
/**
* The name of the <code>Action</code> that moves the caret to the beginning
* of the current line, possibly extending the current selection.
*
* @see #getActions()
*/
public static final String selectionBeginLineAction = "selection-begin-line";
/**
* The name of the <code>Action</code> that moves the caret to the beginning
* of the current paragraph, possibly extending the current selection.
*
* @see #getActions()
*/
public static final String selectionBeginParagraphAction =
"selection-begin-paragraph";
/**
* The name of the <code>Action</code> that moves the caret to the beginning
* of the current word, possibly extending the current selection.
*
* @see #getActions()
*/
public static final String selectionBeginWordAction = "selection-begin-word";
/**
* The name of the <code>Action</code> that moves the caret one line down,
* possibly extending the current selection.
*
* @see #getActions()
*/
public static final String selectionDownAction = "selection-down";
/**
* The name of the <code>Action</code> that moves the caret to the end
* of the document, possibly extending the current selection.
*
* @see #getActions()
*/
public static final String selectionEndAction = "selection-end";
/**
* The name of the <code>Action</code> that moves the caret to the end
* of the current line, possibly extending the current selection.
*
* @see #getActions()
*/
public static final String selectionEndLineAction = "selection-end-line";
/**
* The name of the <code>Action</code> that moves the caret to the end
* of the current paragraph, possibly extending the current selection.
*
* @see #getActions()
*/
public static final String selectionEndParagraphAction =
"selection-end-paragraph";
/**
* The name of the <code>Action</code> that moves the caret to the end
* of the current word, possibly extending the current selection.
*
* @see #getActions()
*/
public static final String selectionEndWordAction = "selection-end-word";
/**
* The name of the <code>Action</code> that moves the caret one character
* forwards, possibly extending the current selection.
*
* @see #getActions()
*/
public static final String selectionForwardAction = "selection-forward";
/**
* The name of the <code>Action</code> that moves the caret to the beginning
* of the next word, possibly extending the current selection.
*
* @see #getActions()
*/
public static final String selectionNextWordAction = "selection-next-word";
/**
* The name of the <code>Action</code> that moves the caret to the beginning
* of the previous word, possibly extending the current selection.
*
* @see #getActions()
*/
public static final String selectionPreviousWordAction =
"selection-previous-word";
/**
* The name of the <code>Action</code> that moves the caret one line up,
* possibly extending the current selection.
*
* @see #getActions()
*/
public static final String selectionUpAction = "selection-up";
/**
* The name of the <code>Action</code> that selects the line around the
* caret.
*
* @see #getActions()
*/
public static final String selectLineAction = "select-line";
/**
* The name of the <code>Action</code> that selects the paragraph around the
* caret.
*
* @see #getActions()
*/
public static final String selectParagraphAction = "select-paragraph";
/**
* The name of the <code>Action</code> that selects the word around the
* caret.
*
* @see #getActions()
*/
public static final String selectWordAction = "select-word";
/**
* The name of the <code>Action</code> that moves the caret one line up.
*
* @see #getActions()
*/
public static final String upAction = "caret-up";
/**
* The name of the <code>Action</code> that sets the editor in read-write
* mode.
*
* @see #getActions()
*/
public static final String writableAction = "set-writable";
/**
* Creates a new <code>DefaultEditorKit</code>.
*/
public DefaultEditorKit()
{
}
/**
* The <code>Action</code>s that are supported by the
* <code>DefaultEditorKit</code>.
*/
// TODO: All these inner classes look ugly. Maybe work out a better way
// to handle this.
private static Action[] defaultActions =
new Action[] {
new BeepAction(),
@ -356,37 +812,98 @@ public class DefaultEditorKit extends EditorKit
},
};
/**
* Creates the <code>Caret</code> for this <code>EditorKit</code>. This
* returns a {@link DefaultCaret} in this case.
*
* @return the <code>Caret</code> for this <code>EditorKit</code>
*/
public Caret createCaret()
{
return new DefaultCaret();
}
/**
* Creates the default {@link Document} that this <code>EditorKit</code>
* supports. This is a {@link PlainDocument} in this case.
*
* @return the default {@link Document} that this <code>EditorKit</code>
* supports
*/
public Document createDefaultDocument()
{
return new PlainDocument();
}
/**
* Returns the <code>Action</code>s supported by this <code>EditorKit</code>.
*
* @return the <code>Action</code>s supported by this <code>EditorKit</code>
*/
public Action[] getActions()
{
return defaultActions;
}
/**
* Returns the content type that this <code>EditorKit</code> supports.
* The <code>DefaultEditorKit</code> supports the content type
* <code>text/plain</code>.
*
* @return the content type that this <code>EditorKit</code> supports
*/
public String getContentType()
{
return "text/plain";
}
/**
* Returns a {@link ViewFactory} that is able to create {@link View}s for
* the <code>Element</code>s that are used in this <code>EditorKit</code>'s
* model. This returns null which lets the UI of the text component supply
* <code>View</code>s.
*
* @return a {@link ViewFactory} that is able to create {@link View}s for
* the <code>Element</code>s that are used in this
* <code>EditorKit</code>'s model
*/
public ViewFactory getViewFactory()
{
return null;
}
/**
* Reads a document of the supported content type from an {@link InputStream}
* into the actual {@link Document} object.
*
* @param in the stream from which to read the document
* @param document the document model into which the content is read
* @param offset the offset inside to document where the content is inserted
*
* @throws BadLocationException if <code>offset</code> is an invalid location
* inside <code>document</code>
* @throws IOException if something goes wrong while reading from
* <code>in</code>
*/
public void read(InputStream in, Document document, int offset)
throws BadLocationException, IOException
{
read(new InputStreamReader(in), document, offset);
}
/**
* Reads a document of the supported content type from a {@link Reader}
* into the actual {@link Document} object.
*
* @param in the reader from which to read the document
* @param document the document model into which the content is read
* @param offset the offset inside to document where the content is inserted
*
* @throws BadLocationException if <code>offset</code> is an invalid location
* inside <code>document</code>
* @throws IOException if something goes wrong while reading from
* <code>in</code>
*/
public void read(Reader in, Document document, int offset)
throws BadLocationException, IOException
{
@ -405,14 +922,47 @@ public class DefaultEditorKit extends EditorKit
SimpleAttributeSet.EMPTY);
}
/**
* Writes the <code>Document</code> (or a fragment of the
* <code>Document</code>) to an {@link OutputStream} in the
* supported content type format.
*
* @param out the stream to write to
* @param document the document that should be written out
* @param offset the beginning offset from where to write
* @param len the length of the fragment to write
*
* @throws BadLocationException if <code>offset</code> or
* <code>offset + len</code>is an invalid location inside
* <code>document</code>
* @throws IOException if something goes wrong while writing to
* <code>out</code>
*/
public void write(OutputStream out, Document document, int offset, int len)
throws BadLocationException, IOException
{
write(new OutputStreamWriter(out), document, offset, len);
}
/**
* Writes the <code>Document</code> (or a fragment of the
* <code>Document</code>) to a {@link Writer} in the
* supported content type format.
*
* @param out the writer to write to
* @param document the document that should be written out
* @param offset the beginning offset from where to write
* @param len the length of the fragment to write
*
* @throws BadLocationException if <code>offset</code> or
* <code>offset + len</code>is an invalid location inside
* <code>document</code>
* @throws IOException if something goes wrong while writing to
* <code>out</code>
*/
public void write(Writer out, Document document, int offset, int len)
throws BadLocationException, IOException
{
// TODO: Implement this properly.
}
}