5757917258
2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTextAreaUI.java (create): New method. * javax/swing/text/DefaultHighlighter.java (DefaultHighlightPainter.debugRect): Removed. * javax/swing/text/StyleContext.java (DEFAULT_STYLE): New field. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicLookAndFeel.java (initComponentDefaults): Add keybindings for selection.backward and selection-forward for text components. * javax/swing/plaf/basic/BasicTextUI.java (paintSafely): Paint highlight only when something is actually selected. * javax/swing/text/DefaultCaret.java (handleHighlight): New method. (setSelectionVisible): Don't do anything when nothing changes. Handle highlight. (moveDot): Reimplemented. Handle highlight. (setDot): Set mark too. Handle highlight. (getSelectionPainter): New method. * javax/swing/text/DefaultEditorKit.java (defaultActions): Added new actions for text selection. * javax/swing/text/DefaultHighlighter.java (DefaultHighlightPainter): New inner class. (DefaultPainter): New field. (paint): Implemented. * javax/swing/text/PlainView.java (paint): Don't draw background here again. * javax/swing/text/Utilities.java (getTabbedTextWidth): Use width of ' ' instead of 'm' for tabsize. (drawTabbedText): Likewise. 2004-08-31 Graydon Hoare <graydon@redhat.com> * javax/swing/JComponent.java (resetKeyboardActions): Add null checks. 2004-08-31 Graydon Hoare <graydon@redhat.com> * javax/swing/DefaultButtonModel.java: Skip group notification when no group is set. 2004-08-31 Graydon Hoare <graydon@redhat.com> * javax/swing/JColorChooser.java: Make a couple inner classes static, for jikes. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTextUI.java (RottView.modelToView): New method. (UpdateHandler): Renamed from EventHandler. (updateHandler): Renamed from eventHandler. (modelToView): Implemented. * javax/swing/text/AbstractDocument.java (BranchElement.getElement): Return null for non-existing indeces. (BranchElement.getElementIndex): Return 0 in some corner cases. * javax/swing/text/FieldView.java (modelToView): New method. * javax/swing/text/PlainView.java (modelToView): Made public. 2004-08-31 Kim Ho <kho@redhat.com> * Makefile.am: New files. * Makefile.in: Regenerate. * gcj/Makefile.in: Regenerate. * include/Makefile.in: Regenerate. * java/awt/Color.java: Fix documentation. (RGBtoHSB): Use floats for conversions. * javax/swing/ButtonGroup.java: Run Jalopy. (setSelected): Reimplement. * javax/swing/DefaultButtonModel.java: Run Jalopy. (changeState): Let ButtonGroup know that the button is changing state. * javax/swing/JColorChooser.java: Implement. * javax/swing/JLabel.java: Run Jalopy. * javax/swing/JSpinner.java: Run Jalopy. (setValue): New method. * javax/swing/JTabbedPane.java: Run Jalopy. (removeTabAt): Call correct remove method. * javax/swing/SpinnerNumberModel.java: Run Jalopy. (getPreviousValue): Compare minimum value. * javax/swing/Timer.java: Run Jalopy. (run): Comment out println. * javax/swing/ToolTipManager.java: (mouseMoved): Get new tooltip text for location. * javax/swing/colorchooser/AbstractColorChooserPanel.java: Jalopy and Javadoc. * javax/swing/colorchooser/ColorChooserComponentFactory.java: Implement. * javax/swing/colorchooser/DefaultColorSelectionModel.java: Run Jalopy. (setSelectedColor): Fire ChangeEvent. * javax/swing/colorchooser/DefaultHSBChooserPanel.java: New file. Implement. * javax/swing/colorchooser/DefaultPreviewPanel.java: Ditto. * javax/swing/colorchooser/DefaultRGBChooserPanel.java: Ditto. * javax/swing/colorchooser/DefaultSwatchChooserPanel.java: Ditto. * javax/swing/plaf/basic/BasicArrowButton.java: (getArrow): Fix size of upward pointing button. * javax/swing/plaf/basic/BasicColorChooserUI.java: Implement. * javax/swing/plaf/basic/BasicSliderUI.java: (getWidthOfWidestLabel): Use preferred dimensions. (getHeightOfTallestLabel): Ditto. * javax/swing/plaf/basic/BasicSpinnerUI.java: Run Jalopy. (mousePressed): Disable changes to spinner if it is not enabled. * testsuite/Makefile.in: Regenerate. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTableHeaderUI.java, javax/swing/plaf/basic/BasicTableUI.java: Added copyright notice. 2004-08-31 Olga Rodimina <rodimina@redhat.com> * Makefile.am: Added new files. * Makefile.in: Regenerate. * javax/swing/ComboBoxEditor.java: Added javadocs. * javax/swing/ComboBoxModel.java: Likewise. * javax/swing/DefaultComboBoxModel.java: Implemented. * javax/swing/DefaultListCellRenderer.java: Added javadocs and ran through jalopy to fix formatting style. (getListCellRendererComponent): Use appropriate border if renderer has focus and use noFocusBorder when it doesn't. * javax/swing/JComboBox.java: Implemented. * javax/swing/JList.java: (locationToIndex): New Method. Implemented. (indexToLocation): New Method. * javax/swing/JPopupMenu.java: (visible): New field. (isVisible): Changed to use new field above. (setVisible): Likewise. * javax/swing/MutableComboBoxModel.java: Added javadocs. * javax/swing/plaf/basic/BasicArrowButton.java: (shadow): Changed default color to Color.gray. * javax/swing/plaf/basic/BasicComboBoxUI.java: New File. UI delegate for JComboBox. * javax/swing/plaf/basic/BasicComboPopup.java: New File. Popup menu containing list of JComboBox's items. * javax/swing/plaf/basic/BasicComboBoxEditor.java: New File. * javax/swing/plaf/basic/BasicComboBoxRenderer.java: New File. * javax/swing/plaf/basic/BasicComboBoxUI.java: New File. * javax/swing/plaf/basic/BasicComboPopup.java: New File. * javax/swing/plaf/basic/BasicPopupMenuUI.java: (popupMenuWillBecomeVisible): Set selected path to the first element only if it is of type MenuElement. Also fix formatting style. * javax/swing/plaf/basic/ComboPopup.java: Added javadocs and missing methods signatures. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/text/AbstractDocument.java (createBranchElement): Use new constructor of BranchElement. (createLeafElement): Renamed arguments. (getRootElements): Implemented. (BranchElement.start): Removed. (BranchElement.end): Likewise. (BranchElement.BranchElement): Fixed arguments. (BranchElement.getEndOffset): Reimplemented. (BranchElement.getStartOffset): Likewis. * javax/swing/text/DefaultCaret.java (paint): Draw simple vertical line as caret instead of a rectangle. * javax/swing/text/JTextComponent.java (setText): Use doc directly. * javax/swing/text/PlainView.java (nextTabStop): Implemented. * javax/swing/text/Utilities.java (drawTabbedText): nextTabStop() returns an absolute x position. (getTabbedTextWidth): Likewise. 2004-08-31 Graydon Hoare <graydon@redhat.com> * java/awt/Component.java (isFocusTraversable): Predicate on isLightweight() (setFocusable): Set isFocusTraversableOverridden. (requestFocus): Predicate peer dispatch on !isLightweight() (requestFocusInWindow): Likewise. (dispatchEventImpl): Coordinate with KeyboardFocusManager. * java/awt/Container.java (dispatchEventImpl): Predicate on event mask. (LightweightDispatcher): Remove focus machinery. * java/awt/DefaultFocusTraversalPolicy.java (accept): Expand predicate to include isFocusable(). * java/awt/DefaultKeyboardFocusManager.java: Globally change c.dispatchEvent(e) to redispatchEvent(c,e) * java/awt/KeyboardFocusManager.java (redispatchEvent): Synchronize on event to prevent feedback. * javax/swing/AbstractButton.java (ButtonFocusListener): Remove class. (init): Set focusPainted, focusable. * javax/swing/ActionMap.java (get): Check parent for null. * javax/swing/InputMap.java (get): Likewise. * javax/swing/JComponent.java (inputMap_whenFocused): New InputMap. (inputMap_whenAncestorOfFocused): Likewise. (inputMap_whenInFocusedWindow): Likewise. (getActionForKeyStroke): Rewrite. (getConditionForKeystroke): Likewise. (ActionListenerProxy): New private class. (setInputMap): Implement. (getInputMap): Likewise. (setActionMap): Likewise. (getActionMap): Likewise. (processComponentKeyEvent): New empty method. (processKeyEvent): Implement. (processKeyBinding): Likewise. (resetKeyboardActions): Rewrite. * javax/swing/KeyStroke.java: Rewrite. * javax/swing/SwingUtilities.java (notifyAction): Implement. (replaceUIActionMap): Likewise. (replaceUIInputMap): Likewise. * javax/swing/plaf/basic/BasicButtonListener.java (focusGained): Implement. (focusLost): Repaint if focusPainted(). (installKeyboardActions): Install pressed / released actions. (uninstallKeyboardActions): Implement. * javax/swing/plaf/basic/BasicButtonUI.java (focusColor): New field. (installDefaults): Load focus color, install input map. (installKeyboardActions): Implement. (uninstallKeyboardActions): Likewise. (paintFocus): Rewrite. * javax/swing/plaf/basic/BasicLookAndFeel.java (Button.focus): New default, midPurple. * javax/swing/plaf/basic/BasicTextUI.java (kit): Make static. (installUI): Get doc from kit, load defaults. (getKeymapName): Implement. (createKeymap): Likewise. (installKeyboardActions): Likewise. (getInputMap): Likewise. (getActionMap): Likewise. (createActionMap): Likewise. * javax/swing/text/AbstractDocument.java (getStartPosition): Implement. (getEndPosition): Likewise. * javax/swing/text/DefaultEditorKit.java (CopyAction): New class. (CutAction): Likewise. (DefaultKeyTypedAction): Likewise. (InsertBreakAction): Likewise. (InsertContentAction): Likewise. (InsertTabAction): Likewise. (PasteAction): Likewise. (defaultActions): New static table. (createCaret): Implement. (getActions): Likewise. * javax/swing/text/JTextComponent.java (KeymapWrapper): New private class. (KeymapActionMap): Likewise. (DefaultKeymap): New class. (keymaps): New static table. (keymap): New field. (getKeymap): Implement. (removeKeymap): Likewise. (addKeymap): Likewise. (setKeymap): Likewise. (loadKeymap): Likewise. (getActions): Likewise. (margin): New field. (JTextComponent): Build and install default keymap. * javax/swing/text/TextAction.java (textAction): Call super properly. (getTextComponent): Implement. * javax/swing/text/Utilities.java (drawTabbedText): Adjust position by ascent. 2004-08-31 David Jee <djee@redhat.com> PR AWT/17156 * gnu/java/awt/peer/gtk/GtkMenuItemPeer.java (setEnabled): Make it a native method. * java/awt/DefaultKeyboardFocusManager.java (postProcessKeyEvent): Only post event if the menu item is active. * java/awt/MenuItem.java: Private field 'enabled' should be true by default. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c (setEnabled): New function. 2004-08-31 David Jee <djee@redhat.com> PR AWT/17059 * gnu/java/awt/peer/gtk/GtkMenuBarPeer.java (nativeSetHelpMenu): New native method declaration. (addHelpMenu): Call nativeSetHelpMenu(). (addMenu): Remove. * java/awt/MenuBar.java (setHelpMenu): Call addNotify() on the new help menu. (add): Call addNotify() on the new menu. (addNotify): Set the help menu if one exists. * java/awt/peer/MenuBarPeer.java (addMenu): Remove. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c (nativeSetHelpMenu): New method. 2004-08-31 Graydon Hoare <graydon@redhat.com> * Makefile.am: Add new files. * Makefile.in: Regenerate. * javax/swing/Box.java: Fix setting of layout in ctor. * javax/swing/JScrollPane.java: Scroll headers as well. * javax/swing/JTable.java: Reimplement. * javax/swing/JViewPort.java: Only add non-null children. * javax/swing/ScrollPaneLayout.java: Correct header calculations. * javax/swing/Timer.java: Fix stopping null waker. * javax/swing/plaf/basic/BasicTableHeaderUI.java: New file. * javax/swing/plaf/basic/BasicTableUI.java: New file. * javax/swing/table/DefaultTableCellRenderer.java: Configure. * javax/swing/table/DefaultTableColumnModel.java: Flesh out. * javax/swing/table/DefaultTableModel.java: Clean up. * javax/swing/table/JTableHeader.java: Implement. 2004-08-31 Mark Wielaard <mark@klomp.org> * javax/swing/JSpinner.java (getChangeListeners): Remove double semi-colon. 2004-08-31 Mark Wielaard <mark@klomp.org> * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c: Declare variables at top of functions/block. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c: Likewise. 2004-08-31 Mark Wielaard <mark@klomp.org> * java/lang/Rectangle.java (intersects): Check r.width and r.height first. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/text/PlainView.java (selectedColor): New field. (unselectedColor): Likewise. (font): Likewise. (updateMetrics): New method. (lineToRect): Likewise. (modelToView): Likewise. (drawSelectedText): Use color from JTextComponent ad draw with Utilities class. (drawUnselectedText): Likewise. (paint): Initialize helper fields. * javax/swing/text/View.java (getChildAllocation): New method. (getViewIndex): Likewise. (getToolTipText): Likewise. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/text/Utilities.java (drawTabbedText): Reimplemented. (getTabbedTextWidth): Likewise. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTextUI.java (installDefaults): Install caret and highlighter. (modelToView): Use Bias.Forward when calling sibling. * javax/swing/text/AbstractDocument.java (ElementEdit): Implements DocumentEvent.ElementChange. (ElementEdit.ElementEdit): New method. (ElementEdit.getChildrenAdded): Likewise. (ElementEdit.getChildrenRemoved): Likewise. (ElementEdit.getElement): Likewise. (ElementEdit.getIndex): Likewise. * javax/swing/text/DefaultCaret.java (color): Removed. (textComponent): Renamed from parent, made private. (selectionVisible): Renamed from vis_sel, made private. (blinkRate): Renamed from blink, made private. (magicCaretPosition): Renamed from magic, made private. (visible): Renamed from vis, made private. (dot): Made private. (mark): Likewise. (deinstall): Remove as MouseMotionListener. (install): Initialize textComponent first. Add as MouseMotionListener. (paint): Reimplemented. * javax/swing/text/JTextComponent.java (setCaret): Deinstall old caret, install new one and fire property change after setting property. (setHighlighter): Deinstall old highlighter, install new one and fire property change after setting property. (setCaretColor): Fire property change after setting property. (setDisabledTextColor): Likewise. (setSelectedTextColor): Likewise. (setSelectionColor): Likewise. (modelToView): New method. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/text/AbstractDocument.java (getText): Simplified. * javax/swing/text/Segment.java (current): New field. (current): Reimplemented. (first): Likewise. (getIndex): Likewise. (last): Likewise. (next): Likewise. (previous): Likewise. (setIndex): Likewise. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicButtonUI.java (defaultTextIconGap): Made protected. (defaultTextShiftOffset): Likewise. (textShiftOffset): New field. (clearTextShiftOffset): New method. (getTextShiftOffset): Likewise. (setTextShiftOffset): Likewise. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTextUI.java (installUI): Add eventHandler as property listener. (uninstallUI): remove eventHandler as propert listener. (installDefaults): Added comment. (installListeners): Likewise. (installKeyboardActions): Likewise. (uninstallDefaults): Likewise. (uninstallListeners): Likewise. (uninstallKeyboardActions): Likewise. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/text/AbstractDocument.java: Fixed some typos in comments. (insertString): Reimplemented. (remove): Likewise. (replace): New method. (children): Dont use fully qualified class name. (DefaultDocumentEvent.offset): Renamed from off. (DefaultDocumentEvent.length): Renamed from len. (DefaultDocumentEvent.type): New field. (DefaultDocumentEvent.DefaultDocumentEvent): New constructor. (DefaultDocumentEvent.getType): Implemented. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTextUI.java (RootView.textComponent): Removed. (RootView.RootView): Don't initialize textComponent. (RootView.getViewFactory): New method. (EventHandler): New inner class. (rootView): Initialize at instance creation. (eventHandler): New field. (installUI): Don't create view hierarchy directly, call modelChanged() instead. (modelChanged): New method. * javax/swing/text/JTextComponent.java (setDocument): Fire property change event. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTextUI.java (RootView.paint): Removed debug output. (paintSafely): Draw highlighter before text. (paintBackground): Use background color of text component. * javax/swing/plaf/basic/BasicToggleButtonUI.java: Reformatted. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicToolBarUI.java (BasicToolBarUI): Fixed arguments for constructor. (createUI): Fixed creation of object. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/DefaultListSelectionModel.java (fireValueChanged): Renamed from fireSelectionValueChanged, made protected. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/text/TabSet.java (TabSet): Implements java.io.Serializable. * javax/swing/text/TabStop.java (TabStop): Implements java.io.Serializable. (TabStop): Made public. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/JComponent.java (setUI): Fire PropertyChange. * javax/swing/JLabel.java (text): Renamed from labelText. (horizontalAlignment): New default vlaue. (icon): Renamed from activeIcon. (displayedMnemonic): Renamed from mnemonicKey, added default value. (displayedMnemonicIndex): Renamed from underlineChar. (setDisplayedMnemonic): Reimplemented. * javax/swing/JRadioButton.java (JRadioButton): New constructors. * javax/swing/JTextField.java (JTextField): Throw exception if colums < 0, initialitialz this.columns directly and initialize document with text conditionally. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicFormattedTextFieldUI.java, javax/swing/plaf/basic/BasicPasswordFieldUI.java, javax/swing/plaf/basic/BasicTextAreaUI.java: New files. * javax/swing/text/FieldView.java (paint): Just call super method for now. * Makefile.am: Added new files. * Makefile.in: Regenerated. 2004-08-31 Ka-Hing Cheung <kahing@javabsp.org> * javax/swing/AbstractSpinnerModel.java, javax/swing/JSpinner.java, javax/swing/SpinnerNumberModel.java, javax/swing/plaf/basic/BasicSpinnerUI.java: New files. * javax/swing/plaf/basic/BasicLookAndFeel.java (initClassDefaults): Added defaults for BasicSpinnerUI. 2004-08-31 Michael Koch <konqueror@gmx.de> * Makefile.am: Added new files. * Makefile.in: Regenerated. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/TransferHandler.java, javax/swing/plaf/basic/ComboPopup.java: New files * Makefile.am: Added javax/swing/TransferHandler.java and javax/swing/plaf/basic/ComboPopup.java * Makefile.in: Regenerated. 2004-08-31 Roman Kennke <roman@ontographics.com> * javax/swing/text/Utilities.java: New file. 2004-08-31 Michael Koch <konqueror@gmx.de> * Makefile.am: Added javax/swing/text/Utilities.java. * Makefile.in: Regenerated. 2004-08-31 Graydon Hoare <graydon@redhat.com> * javax/swing/text/SimpleAttributeSet.java: New file. * javax/swing/text/StyleConstants.java: New file. * javax/swing/text/StyleContext.java: New file. * javax/swing/text/TabSet.java: New file. * javax/swing/text/TabStop.java: New file. * javax/swing/text/AbstactDocument.java: (AbstractElement): Implement attribute support. * javax/swing/text/AttributeSet.java (NameAttribute): New static field. (ResolveAttribute): New static field. * Makefile.am: Update for new files. * Makefile.in: Regenerate. 2004-08-31 Craig Black <craig.black@aonix.com> * gnu/java/awt/peer/gtk/GdkGraphics.java (drawImage): Add support for scaling pixmaps. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (copyAndScalePixmap): New native method. 2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com> PR AWT/16121 * jni/gtk-peer/gthread-jni.c: Include stdio.h. Eliminate type-punning compiler warnings using unions. (throw): Replace bzero with memset. 2004-08-31 Andreas Tobler <a.tobler@schweiz.ch> Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c: Move NSA_PB macros to gtkpeer.h. Include gtkpeer.h. * jni/gtk-peer/gtkpeer.h: Move NSA_PB macros here. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (nativeSetIconImageFromDecoder): Use NSA_GET_PB_PTR macro. 2004-08-31 Mark Wielaard <mark@klomp.org> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c: #include gdk.h, not gtk.h. #include jni.h, native_state.h, string.h and stdlib.h, not gtkpeer.h. (*vm): New static variable. (areaPreparedID): Make static. (areaUpdatedID): Likewise. (area_prepared): Get and use JNIEnv through stored JavaVM *vm. (area_prepared): Likewise. (area_updated): Likewise. (closed): Likewise. (initStaticState): Initialize *vm javaVM. (pumpBytes): Use given env, not global gdk_env. 2004-08-31 Mark Wielaard <mark@klomp.org> * java/awt/geom/CubicCurve2D.java (solveCubic): Removed duplicate comments. 2004-08-31 Sven de Marothy <sven@physto.se> * java/awt/geom/CubicCurve2D.java: Reindent. (contains): Implemented. (intersects): Implemented. * java/awt/geom/QuadCurve2D.java: Likewise. * java/awt/geom/GeneralPath.java: Reindent and document. Fully (re)implemented using separate xpoints and ypoints float[] coords. * java/awt/geom/RoundRectangle2D.java: Several bugfixes (Bug #6007). 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/JMenuItem.java (getMenuDragMouseListeners): New method. (getMenuKeyListeners): Likewise. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractButton.java (model): Made protected. (actionListener): Likewise. (changeListener): Likewise. (itemListener): Likewise. (multiClickThreshhold): New field. (getActionListeners): New method. (getChangeListeners): Likewise. (getItemListeners): Likewise. (fireItemStateChanged): Simplified implementation. (fireActionPerformed): Likewise. (fireStateChanged): Likewise. (getMultiClickThreshhold): New method. (setMultiClickThreshhold): Likewise. 2004-08-31 Tom Tromey <tromey@redhat.com> * java/awt/image/Kernel.java (clone): Use super.clone(). 2004-08-31 David Jee <djee@redhat.com> PR AWT/16682 * gnu/java/awt/peer/gtk/GtkFramePeer.java (nativeSetIconImage): Rename to nativeSetIconImageFromDecoder. (nativeSetIconImageFromData): New native method declaration. (setIconImage): Handle images not produced from GdkPixbufDecoder. * gnu/java/awt/peer/gtk/GtkImage.java (getPixelCache): New method. (getColorModel): New method. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (nativeSetIconImage): Rename to nativeSetIconImageFromDecoder. (free_pixbuf_data): New helper function. (nativeSetIconImageFromData): New function. 2004-08-31 Graydon Hoare <graydon@redhat.com> PR SWING/16576 * javax/swing/JLayeredPane.java (setLayer): Permit changing layer after addition. (setPosition): Permit over-length positions. (layerToRange): Compare intValue()s. * javax/swing/Box.java (createHorizontalBox): Implement. (createRigidArea): Likewise. (createVerticalBox): Likewise. 2004-08-31 Kim Ho <kho@redhat.com> * java/awt/Component.java: (processMouseEvent): Consume event after listeners process it. (processMouseMotionEvent): ditto. (processMouseWheelEvent): ditto. * java/awt/Container.java: (acquireComponentForMouseEvent): Do not dispatch to events that have been removed from the Container. (handleEvent): Consume the MouseEvents. * javax/swing/RepaintManager.java: (paintDirtyRegions): Do not add to list of damaged areas if the component has no root. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicMenuItemUI.java: Clean ip imports. 2004-08-31 Mark Wielaard <mark@klomp.org> * gnu/java/awt/peer/gtk/GtkToolkit.java (getFontPeer): Don't return null when a MissingResourceException is thrown. Should never happen. 2004-08-31 Mark Wielaard <mark@klomp.org> * java/awt/EventQueue.java (postEvent): Throw NullPointerException when argument is null. 2004-08-31 Mark Wielaard <mark@klomp.org> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilter): Define hid at start of function. (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter): Likewise. 2004-08-31 Mark Wielaard <mark@klomp.org> * gnu/java/awt/EmbeddedWindow.java: Reindent. * javax/swing/JButton.java: Reindent. * javax/swing/JCheckBox.java: Reindent. 2004-08-31 Mark Wielaard <mark@klomp.org> * Makefile.am (gtk_c_source_files): Added jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c. (gtk_awt_peer_sources): Added gnu/java/awt/peer/gtk/GThreadMutex.java and gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java. * Makefile.in: Regenerated. 2004-08-31 Archie Cobbs <archie@dellroad.org> * jni/gtk-peer/gthread-jni.c: don't #include nonexistent files 2004-08-31 Steven Augart <augart@watson.ibm.com> * jni/gtk-peer/gthread-jni.c (c-font-lock-extra-types): Added jfieldID, jmethodID. 2004-08-31 Mark Wielaard <mark@klomp.org> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit): Initialize gdk_env before calling any gdk or gtk function. * gnu/java/awt/peer/gtk/GtkMainThread.java (gtkInitCalled): New field. (GtkMainThread): Call wait() in while loop waiting for gtkInitCalled. (run): Set gtkInitCalled. 2004-08-31 Steven Augart <augart@watson.ibm.com> * gnu/java/awt/peer/gtk/GtkMainThread.java (run): Pass the value of the gnu.classpath.awt.gtk.portable.native.sync system property to C. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit): New argument, portableNativeSync. Delegate PORTABLE_NATIVE_SYNC work to init_glib_threads. (init_glib_threads): New function. 2004-08-31 Mark Wielaard <mark@klomp.org> * jni/gtk-peer/gthread-jni.c: Define MIN_, MAX_ and NORM_ PRIORITY when not already defined in header file. 2004-08-31 Mark Wielaard <mark@klomp.org> * jni/gtk-peer/gthread-jni.c (setup_cache): Call ExceptionOccurred, not ExceptionCheck, when we don't have JNI 1.2. 2004-08-31 Steven Augart <augart@watson.ibm.com> * gnu/native/jni/gtk-peer/gthread-jni.c: Indentation fixes. Implemented missing functions for GTK2. Added error handling. Renamed static functions out of the g_ namespace. Added TRACE_API_CALLS, EXPLAIN_TROUBLE, EXPLAIN_BROKEN, EXPLAIN_BADLY_BROKEN, and DELETE_LOCAL_REFS options. Rewrote global-reference code. Eliminated cascading errors. (mutex_trylock_jni_impl) Fully implemented. (cond_timed_wait_jni_impl) Went from millisecond to microsecond resolution. (setup_cache) New function. (mutex_cond_wait_jni_impl, mutex_cond_timed_wait_jni_impl) Fixed bug where they were not unlocking the GMutex associated with the condition variable during the wait on that condition variable. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c, native/jni/gtk-peer/gthread-jni.c, native/jni/gtk-peer/gthread-jni.h (g_thread_jni_functions): Renamed to ... (portable_native_sync_jni_functions): this name. (gdk_vm): Renamed to... (the_vm): this name. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (gdk_vm): Removed duplicate definition. (gtkInit): Removed stray message to stdout. (gtkInit): Use g_malloc and g_free instead of malloc and free. (gtkInit): Fix a const assignment bug. (gtkInit): Simplified code. * gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java, native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c, native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h, gnu/java/awt/peer/gtk/GThreadMutex.java: New files. 2004-08-31 Mark Wielaard <mark@klomp.org> * javax/swing/Box.java: Put FIXME comment above class declaration. * javax/swing/JButton.java: Remove illegal L&F HTML from comments. * javax/swing/JCheckBox.java: Likewise. * javax/swing/JDialog.java: Likewise. * javax/swing/JRadioButton.java: Likewise. * javax/swing/JToggleButton.java: Likewise. * javax/swing/UIManager.java: Likewise. * javax/swing/border/TitledBorder.java: Likewise. * javax/swing/plaf/basic/BasicLabelUI.java: Likewise. * javax/swing/plaf/basic/BasicLookAndFeel.java: Likewise. * javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java: Likewise. * javax/swing/plaf/basic/BasicProgressBarUI.java: Likewise. * javax/swing/plaf/basic/BasicScrollBarUI.java: Likewise. * javax/swing/plaf/basic/BasicSeparatorUI.java: Likewise. * javax/swing/text/JTextComponent.java: Likewise. 2004-08-31 David Jee <djee@redhat.com> PR AWT/16682 * gnu/java/awt/peer/gtk/GtkFramePeer.java (setIconImage): Add a FIXME for unhandled cases. 2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com> PR AWT/16040 * gnu/awt/LightweightRedirector.java: Call getModifiersEx, not getModifiers. Replace old button masks with new ones. * gnu/awt/xlib/XEventLoop.java: Likewise. * gnu/java/awt/peer/gtk/GtkButtonPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkComponentPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Likewise. * gnu/java/awt/peer/gtk/GtkListPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkTextFieldPeer.java: Likewise. * java/awt/AWTKeyStroke.java: Remove old modifier masks. * java/awt/Component.java: Replace old modifier masks with new ones. * java/awt/Container.java: Call getModifiersEx, not getModifiers. * java/awt/DefaultKeyboardFocusManager.java: Likewise. Remove old modifier masks. * javax/swing/JMenuItem.java: Replace old button masks with new ones. * javax/swing/KeyStroke.java: Call getModifiersEx, not getModifiers. * javax/swing/SwingUtilities.java: Likewise. * javax/swing/plaf/basic/BasicButtonListener.java: Likewise. * javax/swing/plaf/basic/BasicInternalFrameUI.java: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c: Replace old mask macros with new ones. * jni/gtk-peer/gtkpeer.h: Replace old button and modifier mask macros with new ones representing new masks. 2004-08-31 Craig Black <craig.black@aonix.com> * gnu/java/awt/peer/gtk/GdkGraphics.java (drawRoundRect): Implemented. (fillRoundRect): Implemented. * gnu/java/awt/peer/gtk/GdkGraphics2D.java (drawRoundRect): Reimplemented to match GdkGraphics. (fillRoundRect): Reimplemented to match GdkGraphics. 2004-08-31 Mark Wielaard <mark@klomp.org> * Makefile.in: Regenerated. 2004-08-31 Michael Koch <konqueror@gmx.de> * gnu/java/awt/EmbeddedWindow.java (addNotify): Use AccessController to allow execution of privileged code. 2004-08-31 Michael Koch <konqueror@gmx.de> * gnu/java/awt/EmbeddedWindow.java (static): Removed. (addNotify): Set peer via reflection. (setWindowPeer): Removed. * gnu/java/awt/natEmbeddedWindow.cc: Removed. * Makefile.am (nat_source_files): Removed gnu/java/awt/natEmbeddedWindow.cc. 2004-08-31 Bryce McKinlay <mckinlay@redhat.com> * Makefile.am: Add gnu/java/security/action/GetPropertyAction.java and gnu/java/security/action/SetAccessibleAction.java. 2004-08-31 Bryce McKinlay <mckinlay@redhat.com> * gnu/java/security/action/GetPropertyAction.java (setParameters): Renamed from 'setName'. New 2-argument form with default value. (run): Pass default 'value' parameter to System.getProperty(). * gnu/java/security/action/SetAccessibleAction.java: Fix javadoc typos. 2004-08-31 Bryce McKinlay <mckinlay@redhat.com> * gnu/java/security/action/GetPropertyAction.java: New class. * gnu/java/security/action/SetAccessibleAction.java: New class. 2004-08-31 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkFramePeer.java (setIconImage): Check if image is null. 2004-08-31 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkFramePeer.java (create): Set the icon image. (nativeSetIconImage): New native method declaration. (setIconImage): Implement. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (nativeSetIconImage): New function. 2004-08-31 Dalibor Topic <robilad@kaffe.org> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (filenameFilterCallback): Declare local variable accepted before use. 2004-08-31 Dalibor Topic <robilad@kaffe.org> * gnu/java/awt/ComponentDataBlitOp.java: Cleaned up imports. 2004-08-31 Tom Tromey <tromey@redhat.com> * gnu/java/awt/peer/GLightweightPeer.java, gnu/java/awt/peer/gtk/GdkGraphics2D.java, gnu/java/awt/peer/gtk/GtkComponentPeer.java, javax/swing/JScrollPane.java: Removed redundant imports. 2004-08-31 David Jee <djee@redhat.com> * java/awt/DefaultKeyboardFocusManager.java (postProcessKeyEvent): Only activate MenuShortcuts on KEY_PRESSED event. Fix shift modifier checking. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c (accel_attach): Remove. (setupAccelGroup): Remove calls to accel_attach. 2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkArg.java: Remove file. * gnu/java/awt/peer/gtk/GtkArgList.java: Remove file. * Makefile.am (gtk_awt_peer_sources): Remove GtkArg.java and GtkArgList.java. (gtk_c_files): Use CAIRO_CFLAGS and PANGOFT2_CFLAGS, not _LIBS. * Makefile.in: Regenerate. * gnu/java/awt/peer/gtk/GtkButtonPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c (create(String)): New method. (create): Call new create method. (getArgs): Remove method. * gnu/java/awt/peer/gtk/GtkCheckboxPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c (nativeCreate): Rename to create. (gtkSetLabel): Rename to gtkButtonSetLabel. (gtkToggleButtonSetActive): New method. (create): Call gtkToggleButtonSetActive and gtkButtonSetLabel. (setState): Replace set call with gtkToggleButtonSetActive. (setLabel): Replace gtkSetLabel call with gtkButtonSetLabel. (getArgs): Remove method. * gnu/java/awt/peer/gtk/GtkComponentPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (gtkWidgetSetSensitive): New method. (gtkWidgetSetParent): Likewise. (GtkComponentPeer): Call setParent, setComponentBounds and setVisibleAndEnabled. (setParent): New method. (setComponentBounds): New method. (setVisibleAndEnabled): New method. (setEnabled): Call gtkWidgetSetSensitive. (getArgs): Remove method. Remove all set methods. * gnu/java/awt/peer/gtk/GtkDialogPeer.java (create): Call gtkWindowSetModal, setTitle and setResizable. (getArgs): Remove method. * gnu/java/awt/peer/gtk/GtkFileDialogPeer.java (setComponentBounds): New method. * gnu/java/awt/peer/gtk/GtkFramePeer.java (setResizable): Replace set call with gtkWindowSetResizable. (getArgs): Remove method. (create): Call setTitle and setResizable. * gnu/java/awt/peer/gtk/GtkWindowPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (gtkWindowSetTitle): New method. (gtkWindowSetResizable): New method. (gtkWindowSetModal): New method. (setParent): New method. (setVisibleAndEnabled): New method. (getArgs): Remove method. (setTitle): Call gtkWindowSetTitle. (setResizable): Call gtkWindowSetResizable. * jni/gtk-peer/gtkpeer.h [DEBUG_LOCKING]: New define to turn on and off locking instrumentation. 2004-08-31 Kim Ho <kho@redhat.com> * Makefile.am: Add new file. * Makefile.in: Regenerate. * gcj/Makefile.in: Regenerate * include/Makefile.in: * java/awt/Container.java: (acquireComponentForMouseEvent): Respect the event mask when looking for candidate. * javax/swing/JComponent.java: Remove toolTip field. (createToolTip): Create a tooltip on demand. (setToolTipText): Register with the ToolTipManager. (getToolTipText(MouseEvent)): Return getToolTipText(). * javax/swing/JToolTip.java: Implement. * javax/swing/Timer.java: Jalopy. (restart): Call stop, then start. (stop): Interrupt the timer rather than wait for the timer to come to a stop naturally. * javax/swing/ToolTipManager.java: Implement. * javax/swing/plaf/basic/BasicLookAndFeel.java: Change ToolTip.background color. * javax/swing/plaf/basic/BasicToolTipUI.java: Implement. * testsuite/Makefile.in: Regenerate 2004-08-31 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/DirectColorModel.java (DirectColorModel): Fix constructor param comments. 2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com> * java/awt/Component.java: Document AWT 1.0 event handler methods. 2004-08-31 Roman Kennke <roman@ontographics.com> * javax/swing/Box.java: (createGlue): Implemented (createHorizontalGlue): Implemented (createHorizontalStrut): Implemented (createVerticalGlue): Implemented (createVerticalStrut): Implemented 2004-08-31 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkChoicePeer.java (GtkChoicePeer): Do not automatically select first item. (getHistory): Remove. (nativeGetSelected): New method. (nativeRemoveAll): New method. (add): Use nativeGetSelected() instead of getHistory(). (remove): Likewise. (removeAll): Call nativeRemoveAll(). * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c (create): Migrate to GtkComboBox. (append): Likewise. (nativeAdd): Likewise. (nativeRemove): Likewise. (select): Likewise. (nativeRemoveAll): New method. (nativeGetSelected): New method. (selection_changed): New method. (getHistory): Remove. (item_activate): Remove. (item_removed): Remove. (connect_choice_item_selectable_hook): Remove. 2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkTextFieldPeer.java (create): Use tf variable in setEditable call. * gnu/java/awt/peer/gtk/GtkTextFieldPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c (gtkWidgetSetBackground): New method. (gtkWidgetSetForeground): Likewise. (create): Set peer's editable state based on awtComponent's. * java/awt/Button.java (Button()): Use empty string rather than null in no-label constructor. 2004-08-31 Roman Kennke <roman@ontographics.com> * javax/swing/BoxLayout.java: Reimplement. 2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics.java, gnu_java_awt_peer_gtk_GdkGraphics.c (initState(GtkComponentPeer)): Don't return array of colour values. (GdkGraphics(int,int)): Set default font to size 12. (GdkGraphics(GtkComponentPeer)): Set graphics colour to component's foreground colour. * gnu/java/awt/peer/gtk/GdkGraphics2D.java, gnu_java_awt_peer_gtk_GdkGraphics2D.c (initState(GtkComponentPeer)): Don't return array of colour values. (GdkGraphics2D(GtkComponentPeer)): Set foreground and background colours to component's colours. (current_colors_of_widget): Remove function. * gnu/java/awt/peer/gtk/GtkOffScreenImage.java (getGraphics): Return a new graphics object. * java/awt/Font.java (toString): Fix format. * java/awt/Graphics.java (toString): Likewise. 2004-08-31 Craig Black <craig.black@aonix.com> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c (addTearOff): New function. * gnu/java/awt/peer/gtk/GtkMenuPeer.java (addTearOff): New native method. (init): Call addTearOff() when menu.isTearOff(). 2004-08-31 Bryce McKinlay <mckinlay@redhat.com> * gnu/java/awt/ClasspathToolkit.java (createImageProducer): New. Default implementation. * gnu/java/awt/peer/gtk/GtkToolkit.java (createImageProducer): New. Implement using GdkPixbufDecoder. 2004-08-31 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java (GtkComponentPeer): Use gtkWidgetGetPreferredDimensions() for setting the size of GtkFileDialogPeers. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (gtkWidgetGetPreferredDimensions): For widgets extending GtkWindow, use their default sizes rather than their natural requisitions. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/JFormattedTextField.java (JFormattedTextField): Implemented. * javax/swing/text/DefaultEditorKit.java (BeepAction): New inner class. * javax/swing/text/Segment.java (partialReturn): New field. (setPartialReturn): New method. (isPartialReturn): Likewise. * javax/swing/text/View.java (createFragment): Fixed typo. (getStartOffset): New method. (getEndOffset): Likewise. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/table/DefaultTableColumnModel.java (serialVersionUID): Made private. (listenerList): Initialize. (changeEvent): Initialize. * javax/swing/table/JTableHeader.java (JTableHeader): New constructors. (createDefaultColumnModel): New method. * javax/swing/table/TableColumn.java (setHeaderRenderer): Simplified code. (setCellRenderer): Likewise. (setWidth): Likewise. From-SVN: r86956
1337 lines
33 KiB
Java
1337 lines
33 KiB
Java
/* JTextComponent.java --
|
|
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
package javax.swing.text;
|
|
|
|
import java.awt.AWTEvent;
|
|
import java.awt.Color;
|
|
import java.awt.Component;
|
|
import java.awt.Dimension;
|
|
import java.awt.Image;
|
|
import java.awt.Insets;
|
|
import java.awt.Point;
|
|
import java.awt.Rectangle;
|
|
import java.awt.event.InputMethodListener;
|
|
import java.awt.event.KeyEvent;
|
|
|
|
import java.util.Enumeration;
|
|
import java.util.Hashtable;
|
|
|
|
import javax.accessibility.Accessible;
|
|
import javax.accessibility.AccessibleContext;
|
|
import javax.accessibility.AccessibleRole;
|
|
import javax.accessibility.AccessibleStateSet;
|
|
import javax.accessibility.AccessibleText;
|
|
import javax.swing.Action;
|
|
import javax.swing.ActionMap;
|
|
import javax.swing.Icon;
|
|
import javax.swing.InputMap;
|
|
import javax.swing.JComponent;
|
|
import javax.swing.JViewport;
|
|
import javax.swing.KeyStroke;
|
|
import javax.swing.Scrollable;
|
|
import javax.swing.UIManager;
|
|
import javax.swing.event.CaretEvent;
|
|
import javax.swing.event.CaretListener;
|
|
import javax.swing.event.DocumentEvent;
|
|
import javax.swing.event.DocumentListener;
|
|
import javax.swing.plaf.ActionMapUIResource;
|
|
import javax.swing.plaf.InputMapUIResource;
|
|
import javax.swing.plaf.TextUI;
|
|
|
|
|
|
public abstract class JTextComponent extends JComponent
|
|
implements Scrollable, Accessible
|
|
{
|
|
/**
|
|
* AccessibleJTextComponent
|
|
*/
|
|
public class AccessibleJTextComponent extends AccessibleJComponent
|
|
implements AccessibleText, CaretListener, DocumentListener
|
|
{
|
|
private static final long serialVersionUID = 7664188944091413696L;
|
|
|
|
/**
|
|
* Constructor AccessibleJTextComponent
|
|
* @param component TODO
|
|
*/
|
|
public AccessibleJTextComponent()
|
|
{
|
|
}
|
|
|
|
/**
|
|
* getCaretPosition
|
|
* @return int
|
|
*/
|
|
public int getCaretPosition()
|
|
{
|
|
return 0; // TODO
|
|
}
|
|
|
|
/**
|
|
* getSelectedText
|
|
* @return String
|
|
*/
|
|
public String getSelectedText()
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
/**
|
|
* getSelectionStart
|
|
* @return int
|
|
*/
|
|
public int getSelectionStart()
|
|
{
|
|
return 0; // TODO
|
|
}
|
|
|
|
/**
|
|
* getSelectionEnd
|
|
* @return int
|
|
*/
|
|
public int getSelectionEnd()
|
|
{
|
|
return 0; // TODO
|
|
}
|
|
|
|
/**
|
|
* caretUpdate
|
|
* @param value0 TODO
|
|
*/
|
|
public void caretUpdate(CaretEvent value0)
|
|
{
|
|
// TODO
|
|
}
|
|
|
|
/**
|
|
* getAccessibleStateSet
|
|
* @return AccessibleStateSet
|
|
*/
|
|
public AccessibleStateSet getAccessibleStateSet()
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
/**
|
|
* getAccessibleRole
|
|
* @return AccessibleRole
|
|
*/
|
|
public AccessibleRole getAccessibleRole()
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
/**
|
|
* getAccessibleText
|
|
* @return AccessibleText
|
|
*/
|
|
public AccessibleText getAccessibleText()
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
/**
|
|
* insertUpdate
|
|
* @param value0 TODO
|
|
*/
|
|
public void insertUpdate(DocumentEvent value0)
|
|
{
|
|
// TODO
|
|
}
|
|
|
|
/**
|
|
* removeUpdate
|
|
* @param value0 TODO
|
|
*/
|
|
public void removeUpdate(DocumentEvent value0)
|
|
{
|
|
// TODO
|
|
}
|
|
|
|
/**
|
|
* changedUpdate
|
|
* @param value0 TODO
|
|
*/
|
|
public void changedUpdate(DocumentEvent value0)
|
|
{
|
|
// TODO
|
|
}
|
|
|
|
/**
|
|
* getIndexAtPoint
|
|
* @param value0 TODO
|
|
* @return int
|
|
*/
|
|
public int getIndexAtPoint(Point value0)
|
|
{
|
|
return 0; // TODO
|
|
}
|
|
|
|
/**
|
|
* getRootEditorRect
|
|
* @return Rectangle
|
|
*/
|
|
Rectangle getRootEditorRect()
|
|
{
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* getCharacterBounds
|
|
* @param value0 TODO
|
|
* @return Rectangle
|
|
*/
|
|
public Rectangle getCharacterBounds(int value0)
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
/**
|
|
* getCharCount
|
|
* @return int
|
|
*/
|
|
public int getCharCount()
|
|
{
|
|
return 0; // TODO
|
|
}
|
|
|
|
/**
|
|
* getCharacterAttribute
|
|
* @param value0 TODO
|
|
* @return AttributeSet
|
|
*/
|
|
public AttributeSet getCharacterAttribute(int value0)
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
/**
|
|
* getAtIndex
|
|
* @param value0 TODO
|
|
* @param value1 TODO
|
|
* @return String
|
|
*/
|
|
public String getAtIndex(int value0, int value1)
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
/**
|
|
* getAfterIndex
|
|
* @param value0 TODO
|
|
* @param value1 TODO
|
|
* @return String
|
|
*/
|
|
public String getAfterIndex(int value0, int value1)
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
/**
|
|
* getBeforeIndex
|
|
* @param value0 TODO
|
|
* @param value1 TODO
|
|
* @return String
|
|
*/
|
|
public String getBeforeIndex(int value0, int value1)
|
|
{
|
|
return null; // TODO
|
|
}
|
|
}
|
|
|
|
public static class KeyBinding
|
|
{
|
|
public KeyStroke key;
|
|
public String actionName;
|
|
|
|
/**
|
|
* Creates a new <code>KeyBinding</code> instance.
|
|
*
|
|
* @param key a <code>KeyStroke</code> value
|
|
* @param actionName a <code>String</code> value
|
|
*/
|
|
public KeyBinding(KeyStroke key, String actionName)
|
|
{
|
|
this.key = key;
|
|
this.actionName = actionName;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* According to <a
|
|
* href="http://java.sun.com/products/jfc/tsc/special_report/kestrel/keybindings.html">this
|
|
* report</a>, a pair of private classes wraps a {@link
|
|
* javax.swing.text.Keymap} in the new {@link InputMap} / {@link
|
|
* ActionMap} interfaces, such that old Keymap-using code can make use of
|
|
* the new framework.</p>
|
|
*
|
|
* <p>A little bit of experimentation with these classes reveals the following
|
|
* structure:
|
|
*
|
|
* <ul>
|
|
*
|
|
* <li>KeymapWrapper extends {@link InputMap} and holds a reference to
|
|
* the underlying {@link Keymap}.</li>
|
|
*
|
|
* <li>KeymapWrapper maps {@link KeyStroke} objects to {@link Action}
|
|
* objects, by delegation to the underlying {@link Keymap}.</li>
|
|
*
|
|
* <li>KeymapActionMap extends {@link ActionMap} also holds a reference to
|
|
* the underlying {@link Keymap} but only appears to use it for listing
|
|
* its keys. </li>
|
|
*
|
|
* <li>KeymapActionMap maps all {@link Action} objects to
|
|
* <em>themselves</em>, whether they exist in the underlying {@link
|
|
* Keymap} or not, and passes other objects to the parent {@link
|
|
* ActionMap} for resolving.
|
|
*
|
|
* </ul>
|
|
*/
|
|
|
|
private class KeymapWrapper extends InputMap
|
|
{
|
|
Keymap map;
|
|
|
|
public KeymapWrapper(Keymap k)
|
|
{
|
|
map = k;
|
|
}
|
|
|
|
public int size()
|
|
{
|
|
return map.getBoundKeyStrokes().length + super.size();
|
|
}
|
|
|
|
public Object get(KeyStroke ks)
|
|
{
|
|
Action mapped = null;
|
|
Keymap m = map;
|
|
while(mapped == null && m != null)
|
|
{
|
|
mapped = m.getAction(ks);
|
|
if (mapped == null && ks.getKeyEventType() == KeyEvent.KEY_TYPED)
|
|
mapped = m.getDefaultAction();
|
|
if (mapped == null)
|
|
m = m.getResolveParent();
|
|
}
|
|
|
|
if (mapped == null)
|
|
return super.get(ks);
|
|
else
|
|
return mapped;
|
|
}
|
|
|
|
public KeyStroke[] keys()
|
|
{
|
|
KeyStroke[] superKeys = super.keys();
|
|
KeyStroke[] mapKeys = map.getBoundKeyStrokes();
|
|
KeyStroke[] bothKeys = new KeyStroke[superKeys.length + mapKeys.length];
|
|
for (int i = 0; i < superKeys.length; ++i)
|
|
bothKeys[i] = superKeys[i];
|
|
for (int i = 0; i < mapKeys.length; ++i)
|
|
bothKeys[i + superKeys.length] = mapKeys[i];
|
|
return bothKeys;
|
|
}
|
|
|
|
public KeyStroke[] allKeys()
|
|
{
|
|
KeyStroke[] superKeys = super.allKeys();
|
|
KeyStroke[] mapKeys = map.getBoundKeyStrokes();
|
|
KeyStroke[] bothKeys = new KeyStroke[superKeys.length + mapKeys.length];
|
|
for (int i = 0; i < superKeys.length; ++i)
|
|
bothKeys[i] = superKeys[i];
|
|
for (int i = 0; i < mapKeys.length; ++i)
|
|
bothKeys[i + superKeys.length] = mapKeys[i];
|
|
return bothKeys;
|
|
}
|
|
}
|
|
|
|
private class KeymapActionMap extends ActionMap
|
|
{
|
|
Keymap map;
|
|
|
|
public KeymapActionMap(Keymap k)
|
|
{
|
|
map = k;
|
|
}
|
|
|
|
public Action get(Object cmd)
|
|
{
|
|
if (cmd instanceof Action)
|
|
return (Action) cmd;
|
|
else
|
|
return super.get(cmd);
|
|
}
|
|
|
|
public int size()
|
|
{
|
|
return map.getBoundKeyStrokes().length + super.size();
|
|
}
|
|
|
|
public Object[] keys()
|
|
{
|
|
Object[] superKeys = super.keys();
|
|
Object[] mapKeys = map.getBoundKeyStrokes();
|
|
Object[] bothKeys = new Object[superKeys.length + mapKeys.length];
|
|
for (int i = 0; i < superKeys.length; ++i)
|
|
bothKeys[i] = superKeys[i];
|
|
for (int i = 0; i < mapKeys.length; ++i)
|
|
bothKeys[i + superKeys.length] = mapKeys[i];
|
|
return bothKeys;
|
|
}
|
|
|
|
public Object[] allKeys()
|
|
{
|
|
Object[] superKeys = super.allKeys();
|
|
Object[] mapKeys = map.getBoundKeyStrokes();
|
|
Object[] bothKeys = new Object[superKeys.length + mapKeys.length];
|
|
for (int i = 0; i < superKeys.length; ++i)
|
|
bothKeys[i] = superKeys[i];
|
|
for (int i = 0; i < mapKeys.length; ++i)
|
|
bothKeys[i + superKeys.length] = mapKeys[i];
|
|
return bothKeys;
|
|
}
|
|
|
|
}
|
|
|
|
static class DefaultKeymap implements Keymap
|
|
{
|
|
String name;
|
|
Keymap parent;
|
|
Hashtable map;
|
|
Action defaultAction;
|
|
|
|
public DefaultKeymap(String name)
|
|
{
|
|
this.name = name;
|
|
this.map = new Hashtable();
|
|
}
|
|
|
|
public void addActionForKeyStroke(KeyStroke key, Action a)
|
|
{
|
|
map.put(key, a);
|
|
}
|
|
|
|
/**
|
|
* Looks up a KeyStroke either in the current map or the parent Keymap;
|
|
* does <em>not</em> return the default action if lookup fails.
|
|
*
|
|
* @param key The KeyStroke to look up an Action for.
|
|
*
|
|
* @return The mapping for <code>key</code>, or <code>null</code>
|
|
* if no mapping exists in this Keymap or any of its parents.
|
|
*/
|
|
public Action getAction(KeyStroke key)
|
|
{
|
|
if (map.containsKey(key))
|
|
return (Action) map.get(key);
|
|
else if (parent != null)
|
|
return parent.getAction(key);
|
|
else
|
|
return null;
|
|
}
|
|
|
|
public Action[] getBoundActions()
|
|
{
|
|
Action [] ret = new Action[map.size()];
|
|
Enumeration e = map.elements();
|
|
int i = 0;
|
|
while (e.hasMoreElements())
|
|
{
|
|
ret[i++] = (Action) e.nextElement();
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
public KeyStroke[] getBoundKeyStrokes()
|
|
{
|
|
KeyStroke [] ret = new KeyStroke[map.size()];
|
|
Enumeration e = map.keys();
|
|
int i = 0;
|
|
while (e.hasMoreElements())
|
|
{
|
|
ret[i++] = (KeyStroke) e.nextElement();
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
public Action getDefaultAction()
|
|
{
|
|
return defaultAction;
|
|
}
|
|
|
|
public KeyStroke[] getKeyStrokesForAction(Action a)
|
|
{
|
|
int i = 0;
|
|
Enumeration e = map.keys();
|
|
while (e.hasMoreElements())
|
|
{
|
|
if (map.get(e.nextElement()).equals(a))
|
|
++i;
|
|
}
|
|
KeyStroke [] ret = new KeyStroke[i];
|
|
i = 0;
|
|
e = map.keys();
|
|
while (e.hasMoreElements())
|
|
{
|
|
KeyStroke k = (KeyStroke) e.nextElement();
|
|
if (map.get(k).equals(a))
|
|
ret[i++] = k;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
public String getName()
|
|
{
|
|
return name;
|
|
}
|
|
|
|
public Keymap getResolveParent()
|
|
{
|
|
return parent;
|
|
}
|
|
|
|
public boolean isLocallyDefined(KeyStroke key)
|
|
{
|
|
return map.containsKey(key);
|
|
}
|
|
|
|
public void removeBindings()
|
|
{
|
|
map.clear();
|
|
}
|
|
|
|
public void removeKeyStrokeBinding(KeyStroke key)
|
|
{
|
|
map.remove(key);
|
|
}
|
|
|
|
public void setDefaultAction(Action a)
|
|
{
|
|
defaultAction = a;
|
|
}
|
|
|
|
public void setResolveParent(Keymap p)
|
|
{
|
|
parent = p;
|
|
}
|
|
|
|
}
|
|
|
|
private static final long serialVersionUID = -8796518220218978795L;
|
|
|
|
public static final String DEFAULT_KEYMAP = "default";
|
|
public static final String FOCUS_ACCELERATOR_KEY = "focusAcceleratorKey";
|
|
|
|
private static Hashtable keymaps = new Hashtable();
|
|
private Keymap keymap;
|
|
|
|
/**
|
|
* Get a Keymap from the global keymap table, by name.
|
|
*
|
|
* @param n The name of the Keymap to look up
|
|
*
|
|
* @return A Keymap associated with the provided name, or
|
|
* <code>null</code> if no such Keymap exists
|
|
*
|
|
* @see #addKeymap()
|
|
* @see #removeKeymap()
|
|
* @see #keymaps
|
|
*/
|
|
public static Keymap getKeymap(String n)
|
|
{
|
|
return (Keymap) keymaps.get(n);
|
|
}
|
|
|
|
/**
|
|
* Remove a Keymap from the global Keymap table, by name.
|
|
*
|
|
* @param n The name of the Keymap to remove
|
|
*
|
|
* @return The keymap removed from the global table
|
|
*
|
|
* @see #addKeymap()
|
|
* @see #getKeymap()
|
|
* @see #keymaps
|
|
*/
|
|
public static Keymap removeKeymap(String n)
|
|
{
|
|
Keymap km = (Keymap) keymaps.get(n);
|
|
keymaps.remove(n);
|
|
return km;
|
|
}
|
|
|
|
/**
|
|
* Create a new Keymap with a specific name and parent, and add the new
|
|
* Keymap to the global keymap table. The name may be <code>null</code>,
|
|
* in which case the new Keymap will <em>not</em> be added to the global
|
|
* Keymap table. The parent may also be <code>null</code>, which is
|
|
* harmless.
|
|
*
|
|
* @param n The name of the new Keymap, or <code>null</code>
|
|
* @param parent The parent of the new Keymap, or <code>null</code>
|
|
*
|
|
* @return The newly created Keymap
|
|
*
|
|
* @see #removeKeymap()
|
|
* @see #getKeymap()
|
|
* @see #keymaps
|
|
*/
|
|
public static Keymap addKeymap(String n, Keymap parent)
|
|
{
|
|
Keymap k = new DefaultKeymap(n);
|
|
k.setResolveParent(parent);
|
|
if (n != null)
|
|
keymaps.put(n, k);
|
|
return k;
|
|
}
|
|
|
|
/**
|
|
* Get the current Keymap of this component.
|
|
*
|
|
* @return The component's current Keymap
|
|
*
|
|
* @see #setKeymap()
|
|
* @see #keymap
|
|
*/
|
|
Keymap getKeymap()
|
|
{
|
|
return keymap;
|
|
}
|
|
|
|
/**
|
|
* Set the current Keymap of this component, installing appropriate
|
|
* {@link KeymapWrapper} and {@link KeymapActionMap} objects in the
|
|
* {@link InputMap} and {@link ActionMap} parent chains, respectively,
|
|
* and fire a property change event with name <code>"keymap"</code>.
|
|
*
|
|
* @see #getKeymap()
|
|
* @see #keymap
|
|
*/
|
|
public void setKeymap(Keymap k)
|
|
{
|
|
|
|
// phase 1: replace the KeymapWrapper entry in the InputMap chain.
|
|
// the goal here is to always maintain the following ordering:
|
|
//
|
|
// [InputMap]? -> [KeymapWrapper]? -> [InputMapUIResource]*
|
|
//
|
|
// that is to say, component-specific InputMaps need to remain children
|
|
// of Keymaps, and Keymaps need to remain children of UI-installed
|
|
// InputMaps (and the order of each group needs to be preserved, of
|
|
// course).
|
|
|
|
KeymapWrapper kw = (k == null ? null : new KeymapWrapper(k));
|
|
InputMap childInputMap = getInputMap(JComponent.WHEN_FOCUSED);
|
|
if (childInputMap == null)
|
|
setInputMap(JComponent.WHEN_FOCUSED, kw);
|
|
else
|
|
{
|
|
while (childInputMap.getParent() != null
|
|
&& !(childInputMap.getParent() instanceof KeymapWrapper)
|
|
&& !(childInputMap.getParent() instanceof InputMapUIResource))
|
|
childInputMap = childInputMap.getParent();
|
|
|
|
// option 1: there is nobody to replace at the end of the chain
|
|
if (childInputMap.getParent() == null)
|
|
childInputMap.setParent(kw);
|
|
|
|
// option 2: there is already a KeymapWrapper in the chain which
|
|
// needs replacing (possibly with its own parents, possibly without)
|
|
else if (childInputMap.getParent() instanceof KeymapWrapper)
|
|
{
|
|
if (kw == null)
|
|
childInputMap.setParent(childInputMap.getParent().getParent());
|
|
else
|
|
{
|
|
kw.setParent(childInputMap.getParent().getParent());
|
|
childInputMap.setParent(kw);
|
|
}
|
|
}
|
|
|
|
// option 3: there is an InputMapUIResource in the chain, which marks
|
|
// the place where we need to stop and insert ourselves
|
|
else if (childInputMap.getParent() instanceof InputMapUIResource)
|
|
{
|
|
if (kw != null)
|
|
{
|
|
kw.setParent(childInputMap.getParent());
|
|
childInputMap.setParent(kw);
|
|
}
|
|
}
|
|
}
|
|
|
|
// phase 2: replace the KeymapActionMap entry in the ActionMap chain
|
|
|
|
KeymapActionMap kam = (k == null ? null : new KeymapActionMap(k));
|
|
ActionMap childActionMap = getActionMap();
|
|
if (childActionMap == null)
|
|
setActionMap(kam);
|
|
else
|
|
{
|
|
while (childActionMap.getParent() != null
|
|
&& !(childActionMap.getParent() instanceof KeymapActionMap)
|
|
&& !(childActionMap.getParent() instanceof ActionMapUIResource))
|
|
childActionMap = childActionMap.getParent();
|
|
|
|
// option 1: there is nobody to replace at the end of the chain
|
|
if (childActionMap.getParent() == null)
|
|
childActionMap.setParent(kam);
|
|
|
|
// option 2: there is already a KeymapActionMap in the chain which
|
|
// needs replacing (possibly with its own parents, possibly without)
|
|
else if (childActionMap.getParent() instanceof KeymapActionMap)
|
|
{
|
|
if (kam == null)
|
|
childActionMap.setParent(childActionMap.getParent().getParent());
|
|
else
|
|
{
|
|
kam.setParent(childActionMap.getParent().getParent());
|
|
childActionMap.setParent(kam);
|
|
}
|
|
}
|
|
|
|
// option 3: there is an ActionMapUIResource in the chain, which marks
|
|
// the place where we need to stop and insert ourselves
|
|
else if (childActionMap.getParent() instanceof ActionMapUIResource)
|
|
{
|
|
if (kam != null)
|
|
{
|
|
kam.setParent(childActionMap.getParent());
|
|
childActionMap.setParent(kam);
|
|
}
|
|
}
|
|
}
|
|
|
|
// phase 3: update the explicit keymap field
|
|
|
|
Keymap old = keymap;
|
|
keymap = k;
|
|
firePropertyChange("keymap", old, k);
|
|
}
|
|
|
|
/**
|
|
* Resolves a set of bindings against a set of actions and inserts the
|
|
* results into a {@link Keymap}. Specifically, for each provided binding
|
|
* <code>b</code>, if there exists a provided action <code>a</code> such
|
|
* that <code>a.getValue(Action.NAME) == b.ActionName</code> then an
|
|
* entry is added to the Keymap mapping <code>b</code> to
|
|
* </code>a</code>.
|
|
*
|
|
* @param map The Keymap to add new mappings to
|
|
* @param bindings The set of bindings to add to the Keymap
|
|
* @param actions The set of actions to resolve binding names against
|
|
*
|
|
* @see Action#NAME
|
|
* @see Action#getValue()
|
|
* @see KeyBinding#ActionName
|
|
*/
|
|
public static void loadKeymap(Keymap map,
|
|
JTextComponent.KeyBinding[] bindings,
|
|
Action[] actions)
|
|
{
|
|
Hashtable acts = new Hashtable(actions.length);
|
|
for (int i = 0; i < actions.length; ++i)
|
|
acts.put(actions[i].getValue(Action.NAME), actions[i]);
|
|
for (int i = 0; i < bindings.length; ++i)
|
|
if (acts.containsKey(bindings[i].actionName))
|
|
map.addActionForKeyStroke(bindings[i].key, (Action) acts.get(bindings[i].actionName));
|
|
}
|
|
|
|
/**
|
|
* Returns the set of available Actions this component's associated
|
|
* editor can run. Equivalent to calling
|
|
* <code>getUI().getEditorKit().getActions()</code>. This set of Actions
|
|
* is a reasonable value to provide as a parameter to {@link
|
|
* #loadKeymap()}, when resolving a set of {@link #KeyBinding} objects
|
|
* against this component.
|
|
*
|
|
* @return The set of available Actions on this component's {@link EditorKit}
|
|
*
|
|
* @see TextUI#getEditorKit()
|
|
* @see EditorKit#getActions()
|
|
*/
|
|
public Action[] getActions()
|
|
{
|
|
return getUI().getEditorKit(this).getActions();
|
|
}
|
|
|
|
private Document doc;
|
|
private Caret caret;
|
|
private Highlighter highlighter;
|
|
private Color caretColor;
|
|
private Color disabledTextColor;
|
|
private Color selectedTextColor;
|
|
private Color selectionColor;
|
|
private boolean editable;
|
|
private Insets margin;
|
|
|
|
/**
|
|
* Creates a new <code>JTextComponent</code> instance.
|
|
*/
|
|
public JTextComponent()
|
|
{
|
|
Keymap defkeymap = getKeymap(DEFAULT_KEYMAP);
|
|
boolean creatingKeymap = false;
|
|
if (defkeymap == null)
|
|
{
|
|
defkeymap = addKeymap(DEFAULT_KEYMAP, null);
|
|
defkeymap.setDefaultAction(new DefaultEditorKit.DefaultKeyTypedAction());
|
|
creatingKeymap = true;
|
|
}
|
|
|
|
setFocusable(true);
|
|
enableEvents(AWTEvent.KEY_EVENT_MASK);
|
|
updateUI();
|
|
|
|
// need to do this after updateUI()
|
|
if (creatingKeymap)
|
|
loadKeymap(defkeymap,
|
|
new KeyBinding[] {
|
|
new KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, 0),
|
|
DefaultEditorKit.backwardAction),
|
|
new KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, 0),
|
|
DefaultEditorKit.forwardAction),
|
|
new KeyBinding(KeyStroke.getKeyStroke("typed \b"),
|
|
DefaultEditorKit.deletePrevCharAction),
|
|
new KeyBinding(KeyStroke.getKeyStroke("typed \u007f"),
|
|
DefaultEditorKit.deleteNextCharAction)
|
|
},
|
|
getActions());
|
|
}
|
|
|
|
public void setDocument(Document newDoc)
|
|
{
|
|
Document oldDoc = doc;
|
|
doc = newDoc;
|
|
firePropertyChange("document", oldDoc, newDoc);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
|
|
public Document getDocument()
|
|
{
|
|
return doc;
|
|
}
|
|
|
|
/**
|
|
* Get the <code>AccessibleContext<code> of this object.
|
|
*
|
|
* @return an <code>AccessibleContext</code> object
|
|
*/
|
|
public AccessibleContext getAccessibleContext()
|
|
{
|
|
return null;
|
|
}
|
|
|
|
public void setMargin(Insets m)
|
|
{
|
|
margin = m;
|
|
}
|
|
|
|
public Insets getMargin()
|
|
{
|
|
return margin;
|
|
}
|
|
|
|
public void setText(String text)
|
|
{
|
|
try
|
|
{
|
|
doc.remove(0, doc.getLength());
|
|
doc.insertString(0, text, null);
|
|
}
|
|
catch (BadLocationException e)
|
|
{
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Retrieves the current text in this text document.
|
|
*
|
|
* @return the text
|
|
*
|
|
* @exception NullPointerException if the underlaying document is null
|
|
*/
|
|
public String getText()
|
|
{
|
|
if (doc == null)
|
|
return null;
|
|
|
|
try
|
|
{
|
|
return doc.getText(0, doc.getLength());
|
|
}
|
|
catch (BadLocationException e)
|
|
{
|
|
// This should never happen.
|
|
return "";
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Retrieves a part of the current text in this document.
|
|
*
|
|
* @param offset the postion of the first character
|
|
* @param length the length of the text to retrieve
|
|
*
|
|
* @return the text
|
|
*
|
|
* @exception BadLocationException if arguments do not hold pre-conditions
|
|
*/
|
|
public String getText(int offset, int length)
|
|
throws BadLocationException
|
|
{
|
|
return getDocument().getText(offset, length);
|
|
}
|
|
|
|
/**
|
|
* Returns a string that specifies the name of the Look and Feel class
|
|
* that renders this component.
|
|
*
|
|
* @return the string "TextComponentUI"
|
|
*/
|
|
public String getUIClassID()
|
|
{
|
|
return "TextComponentUI";
|
|
}
|
|
|
|
/**
|
|
* Returns a string representation of this JTextComponent.
|
|
*/
|
|
protected String paramString()
|
|
{
|
|
return "JTextComponent";
|
|
}
|
|
|
|
/**
|
|
* This method returns the label's UI delegate.
|
|
*
|
|
* @return The label's UI delegate.
|
|
*/
|
|
public TextUI getUI()
|
|
{
|
|
return (TextUI) ui;
|
|
}
|
|
|
|
/**
|
|
* This method sets the label's UI delegate.
|
|
*
|
|
* @param ui The label's UI delegate.
|
|
*/
|
|
public void setUI(TextUI newUI)
|
|
{
|
|
super.setUI(newUI);
|
|
}
|
|
|
|
/**
|
|
* This method resets the label's UI delegate to the default UI for the
|
|
* current look and feel.
|
|
*/
|
|
public void updateUI()
|
|
{
|
|
setUI((TextUI) UIManager.getUI(this));
|
|
}
|
|
|
|
public Dimension getPreferredScrollableViewportSize()
|
|
{
|
|
return null;
|
|
}
|
|
|
|
public int getScrollableUnitIncrement(Rectangle visible, int orientation,
|
|
int direction)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
public int getScrollableBlockIncrement(Rectangle visible, int orientation,
|
|
int direction)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* Checks whether this text component it editable.
|
|
*
|
|
* @return true if editable, false otherwise
|
|
*/
|
|
public boolean isEditable()
|
|
{
|
|
return editable;
|
|
}
|
|
|
|
/**
|
|
* Enables/disabled this text component's editability.
|
|
*
|
|
* @param editable true to make it editable, false otherwise.
|
|
*/
|
|
public void setEditable(boolean editable)
|
|
{
|
|
firePropertyChange("editable", this.editable, editable);
|
|
this.editable = editable;
|
|
}
|
|
|
|
/**
|
|
* The <code>Caret</code> object used in this text component.
|
|
*
|
|
* @return the caret object
|
|
*/
|
|
public Caret getCaret()
|
|
{
|
|
return caret;
|
|
}
|
|
|
|
/**
|
|
* Sets a new <code>Caret</code> for this text component.
|
|
*
|
|
* @param newCaret the new <code>Caret</code> to set
|
|
*/
|
|
public void setCaret(Caret newCaret)
|
|
{
|
|
if (caret != null)
|
|
caret.deinstall(this);
|
|
|
|
Caret oldCaret = caret;
|
|
caret = newCaret;
|
|
|
|
if (caret != null)
|
|
caret.install(this);
|
|
|
|
firePropertyChange("caret", oldCaret, newCaret);
|
|
}
|
|
|
|
public Color getCaretColor()
|
|
{
|
|
return caretColor;
|
|
}
|
|
|
|
public void setCaretColor(Color newColor)
|
|
{
|
|
Color oldCaretColor = caretColor;
|
|
caretColor = newColor;
|
|
firePropertyChange("caretColor", oldCaretColor, newColor);
|
|
}
|
|
|
|
public Color getDisabledTextColor()
|
|
{
|
|
return disabledTextColor;
|
|
}
|
|
|
|
public void setDisabledTextColor(Color newColor)
|
|
{
|
|
Color oldColor = disabledTextColor;
|
|
disabledTextColor = newColor;
|
|
firePropertyChange("disabledTextColor", oldColor, newColor);
|
|
}
|
|
|
|
public Color getSelectedTextColor()
|
|
{
|
|
return selectedTextColor;
|
|
}
|
|
|
|
public void setSelectedTextColor(Color newColor)
|
|
{
|
|
Color oldColor = selectedTextColor;
|
|
selectedTextColor = newColor;
|
|
firePropertyChange("selectedTextColor", oldColor, newColor);
|
|
}
|
|
|
|
public Color getSelectionColor()
|
|
{
|
|
return selectionColor;
|
|
}
|
|
|
|
public void setSelectionColor(Color newColor)
|
|
{
|
|
Color oldColor = selectionColor;
|
|
selectionColor = newColor;
|
|
firePropertyChange("selectionColor", oldColor, newColor);
|
|
}
|
|
|
|
/**
|
|
* Retrisves the current caret position.
|
|
*
|
|
* @return the current position
|
|
*/
|
|
public int getCaretPosition()
|
|
{
|
|
return caret.getDot();
|
|
}
|
|
|
|
/**
|
|
* Sets the caret to a new position.
|
|
*
|
|
* @param position the new position
|
|
*/
|
|
public void setCaretPosition(int position)
|
|
{
|
|
if (doc == null)
|
|
return;
|
|
|
|
if (position < 0 || position > doc.getLength())
|
|
throw new IllegalArgumentException();
|
|
|
|
caret.setDot(position);
|
|
}
|
|
|
|
/**
|
|
* Moves the caret to a given position. This selects the text between
|
|
* the old and the new position of the caret.
|
|
*/
|
|
public void moveCaretPosition(int position)
|
|
{
|
|
if (doc == null)
|
|
return;
|
|
|
|
if (position < 0 || position > doc.getLength())
|
|
throw new IllegalArgumentException();
|
|
|
|
caret.moveDot(position);
|
|
}
|
|
|
|
public Highlighter getHighlighter()
|
|
{
|
|
return highlighter;
|
|
}
|
|
|
|
public void setHighlighter(Highlighter newHighlighter)
|
|
{
|
|
if (highlighter != null)
|
|
highlighter.deinstall(this);
|
|
|
|
Highlighter oldHighlighter = highlighter;
|
|
highlighter = newHighlighter;
|
|
|
|
if (highlighter != null)
|
|
highlighter.install(this);
|
|
|
|
firePropertyChange("highlighter", oldHighlighter, newHighlighter);
|
|
}
|
|
|
|
/**
|
|
* Returns the start postion of the currently selected text.
|
|
*
|
|
* @return the start postion
|
|
*/
|
|
public int getSelectionStart()
|
|
{
|
|
return Math.min(caret.getDot(), caret.getMark());
|
|
}
|
|
|
|
/**
|
|
* Selects the text from the given postion to the selection end position.
|
|
*
|
|
* @param end the start positon of the selected text.
|
|
*/
|
|
public void setSelectionStart(int start)
|
|
{
|
|
select(start, getSelectionEnd());
|
|
}
|
|
|
|
/**
|
|
* Returns the end postion of the currently selected text.
|
|
*
|
|
* @return the end postion
|
|
*/
|
|
public int getSelectionEnd()
|
|
{
|
|
return Math.max(caret.getDot(), caret.getMark());
|
|
}
|
|
|
|
/**
|
|
* Selects the text from the selection start postion to the given position.
|
|
*
|
|
* @param end the end positon of the selected text.
|
|
*/
|
|
public void setSelectionEnd(int end)
|
|
{
|
|
select(getSelectionStart(), end);
|
|
}
|
|
|
|
/**
|
|
* Selects a part of the content of the text component.
|
|
*
|
|
* @param start the start position of the selected text
|
|
* @param ent the end position of the selected text
|
|
*/
|
|
public void select(int start, int end)
|
|
{
|
|
int length = doc.getLength();
|
|
|
|
start = Math.max(start, 0);
|
|
start = Math.min(start, length);
|
|
|
|
end = Math.max(end, 0);
|
|
end = Math.min(end, length);
|
|
|
|
setCaretPosition(start);
|
|
moveCaretPosition(end);
|
|
}
|
|
|
|
/**
|
|
* Selects the whole content of the text component.
|
|
*/
|
|
public void selectAll()
|
|
{
|
|
select(0, doc.getLength());
|
|
}
|
|
|
|
public synchronized void replaceSelection(String content)
|
|
{
|
|
int dot = caret.getDot();
|
|
int mark = caret.getMark();
|
|
|
|
// If content is empty delete selection.
|
|
if (content == null)
|
|
{
|
|
caret.setDot(dot);
|
|
return;
|
|
}
|
|
|
|
try
|
|
{
|
|
// Remove selected text.
|
|
if (dot != mark)
|
|
doc.remove(Math.min(dot, mark), Math.max(dot, mark));
|
|
|
|
// Insert new text.
|
|
doc.insertString(Math.min(dot, mark), content, null);
|
|
}
|
|
catch (BadLocationException e)
|
|
{
|
|
// This should never happen.
|
|
System.out.println("Michael: JTextComponent.replaceSelection: Error");
|
|
}
|
|
}
|
|
|
|
public boolean getScrollableTracksViewportHeight()
|
|
{
|
|
if (getParent() instanceof JViewport)
|
|
return ((JViewport) getParent()).getHeight() > getPreferredSize().height;
|
|
|
|
return false;
|
|
}
|
|
|
|
public boolean getScrollableTracksViewportWidth()
|
|
{
|
|
if (getParent() instanceof JViewport)
|
|
return ((JViewport) getParent()).getWidth() > getPreferredSize().width;
|
|
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Adds a <code>CaretListener</code> object to this text component.
|
|
*
|
|
* @param listener the listener to add
|
|
*/
|
|
public void addCaretListener(CaretListener listener)
|
|
{
|
|
listenerList.add(CaretListener.class, listener);
|
|
}
|
|
|
|
/**
|
|
* Removed a <code>CaretListener</code> object from this text component.
|
|
*
|
|
* @param listener the listener to remove
|
|
*/
|
|
public void removeCaretListener(CaretListener listener)
|
|
{
|
|
listenerList.remove(CaretListener.class, listener);
|
|
}
|
|
|
|
/**
|
|
* Returns all added <code>CaretListener</code> objects.
|
|
*
|
|
* @return an array of listeners
|
|
*/
|
|
public CaretListener[] getCaretListeners()
|
|
{
|
|
return (CaretListener[]) getListeners(CaretListener.class);
|
|
}
|
|
|
|
/**
|
|
* Notifies all registered <code>CaretListener</code> objects that the caret
|
|
* was updated.
|
|
*
|
|
* @param event the event to send
|
|
*/
|
|
protected void fireCaretUpdate(CaretEvent event)
|
|
{
|
|
CaretListener[] listeners = getCaretListeners();
|
|
|
|
for (int index = 0; index < listeners.length; ++index)
|
|
listeners[index].caretUpdate(event);
|
|
}
|
|
|
|
/**
|
|
* Adds an <code>InputListener</code> object to this text component.
|
|
*
|
|
* @param listener the listener to add
|
|
*/
|
|
public void addInputMethodListener(InputMethodListener listener)
|
|
{
|
|
listenerList.add(InputMethodListener.class, listener);
|
|
}
|
|
|
|
/**
|
|
* Removes an <code>InputListener</code> object from this text component.
|
|
*
|
|
* @param listener the listener to remove
|
|
*/
|
|
public void removeInputMethodListener(InputMethodListener listener)
|
|
{
|
|
listenerList.remove(InputMethodListener.class, listener);
|
|
}
|
|
|
|
/**
|
|
* Returns all added <code>InputMethodListener</code> objects.
|
|
*
|
|
* @return an array of listeners
|
|
*/
|
|
public InputMethodListener[] getInputMethodListeners()
|
|
{
|
|
return (InputMethodListener[]) getListeners(InputMethodListener.class);
|
|
}
|
|
|
|
public Rectangle modelToView(int position) throws BadLocationException
|
|
{
|
|
return getUI().modelToView(this, position);
|
|
}
|
|
}
|