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
1018 lines
35 KiB
Java
1018 lines
35 KiB
Java
/* SwingUtilities.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;
|
|
|
|
import java.applet.Applet;
|
|
import java.awt.Component;
|
|
import java.awt.ComponentOrientation;
|
|
import java.awt.Container;
|
|
import java.awt.Font;
|
|
import java.awt.FontMetrics;
|
|
import java.awt.Frame;
|
|
import java.awt.Graphics;
|
|
import java.awt.Insets;
|
|
import java.awt.Point;
|
|
import java.awt.Rectangle;
|
|
import java.awt.Shape;
|
|
import java.awt.Toolkit;
|
|
import java.awt.Window;
|
|
import java.awt.event.ActionEvent;
|
|
import java.awt.event.InputEvent;
|
|
import java.awt.event.KeyEvent;
|
|
import java.awt.event.MouseEvent;
|
|
import java.lang.reflect.InvocationTargetException;
|
|
import javax.swing.plaf.ActionMapUIResource;
|
|
import javax.swing.plaf.InputMapUIResource;
|
|
|
|
|
|
/**
|
|
* This class contains a number of static utility functions which are
|
|
* useful when drawing swing components, dispatching events, or calculating
|
|
* regions which need painting.
|
|
*
|
|
* @author Graydon Hoare (graydon@redhat.com)
|
|
*/
|
|
public class SwingUtilities implements SwingConstants
|
|
{
|
|
/**
|
|
* This frame should be used as parent for JWindow or JDialog
|
|
* that doesn't an owner
|
|
*/
|
|
private static OwnerFrame ownerFrame;
|
|
|
|
/**
|
|
* Calculates the portion of the base rectangle which is inside the
|
|
* insets.
|
|
*
|
|
* @param base The rectangle to apply the insets to
|
|
* @param insets The insets to apply to the base rectangle
|
|
* @param ret A rectangle to use for storing the return value, or
|
|
* <code>null</code>
|
|
*
|
|
* @return The calculated area inside the base rectangle and its insets,
|
|
* either stored in ret or a new Rectangle if ret is <code>null</code>
|
|
*
|
|
* @see #calculateInnerArea
|
|
*/
|
|
public static Rectangle calculateInsetArea(Rectangle base, Insets insets,
|
|
Rectangle ret)
|
|
{
|
|
if (ret == null)
|
|
ret = new Rectangle();
|
|
ret.setBounds(base.x + insets.left, base.y + insets.top,
|
|
base.width - (insets.left + insets.right),
|
|
base.height - (insets.top + insets.bottom));
|
|
return ret;
|
|
}
|
|
|
|
/**
|
|
* Calculates the portion of the component's bounds which is inside the
|
|
* component's border insets. This area is usually the area a component
|
|
* should confine its painting to. The coordinates are returned in terms
|
|
* of the <em>component's</em> coordinate system, where (0,0) is the
|
|
* upper left corner of the component's bounds.
|
|
*
|
|
* @param c The component to measure the bounds of
|
|
* @param r A Rectangle to store the return value in, or
|
|
* <code>null</code>
|
|
*
|
|
* @return The calculated area inside the component and its border
|
|
* insets
|
|
*
|
|
* @see #calculateInsetArea
|
|
*/
|
|
public static Rectangle calculateInnerArea(JComponent c, Rectangle r)
|
|
{
|
|
Rectangle b = getLocalBounds(c);
|
|
return calculateInsetArea(b, c.getInsets(), r);
|
|
}
|
|
|
|
/**
|
|
* Calculates the bounds of a component in the component's own coordinate
|
|
* space. The result has the same height and width as the component's
|
|
* bounds, but its location is set to (0,0).
|
|
*
|
|
* @param aComponent The component to measure
|
|
*
|
|
* @return The component's bounds in its local coordinate space
|
|
*/
|
|
public static Rectangle getLocalBounds(Component aComponent)
|
|
{
|
|
Rectangle bounds = aComponent.getBounds();
|
|
return new Rectangle(0, 0, bounds.width, bounds.height);
|
|
}
|
|
|
|
/**
|
|
* Returns the font metrics object for a given font. The metrics can be
|
|
* used to calculate crude bounding boxes and positioning information,
|
|
* for laying out components with textual elements.
|
|
*
|
|
* @param font The font to get metrics for
|
|
*
|
|
* @return The font's metrics
|
|
*
|
|
* @see java.awt.font.GlyphMetrics
|
|
*/
|
|
public static FontMetrics getFontMetrics(Font font)
|
|
{
|
|
return Toolkit.getDefaultToolkit().getFontMetrics(font);
|
|
}
|
|
|
|
/**
|
|
* If <code>comp</code> is a RootPaneContainer, return its JRootPane.
|
|
* Otherwise call <code>getAncestorOfClass(JRootPane.class, a)</code>.
|
|
*
|
|
* @param comp The component to get the JRootPane of
|
|
*
|
|
* @return a suitable JRootPane for <code>comp</code>, or <code>null</code>
|
|
*
|
|
* @see javax.swing.RootPaneContainer#getRootPane
|
|
* @see #getAncestorOfClass
|
|
*/
|
|
public static JRootPane getRootPane(Component comp)
|
|
{
|
|
if (comp instanceof RootPaneContainer)
|
|
return ((RootPaneContainer)comp).getRootPane();
|
|
else
|
|
return (JRootPane) getAncestorOfClass(JRootPane.class, comp);
|
|
}
|
|
|
|
/**
|
|
* Returns the least ancestor of <code>comp</code> which has the
|
|
* specified name.
|
|
*
|
|
* @param name The name to search for
|
|
* @param comp The component to search the ancestors of
|
|
*
|
|
* @return The nearest ancestor of <code>comp</code> with the given
|
|
* name, or <code>null</code> if no such ancestor exists
|
|
*
|
|
* @see java.awt.Component#getName
|
|
* @see #getAncestorOfClass
|
|
*/
|
|
public static Container getAncestorNamed(String name, Component comp)
|
|
{
|
|
while (comp != null && (comp.getName() != name))
|
|
comp = comp.getParent();
|
|
return (Container) comp;
|
|
}
|
|
|
|
/**
|
|
* Returns the least ancestor of <code>comp</code> which is an instance
|
|
* of the specified class.
|
|
*
|
|
* @param c The class to search for
|
|
* @param comp The component to search the ancestors of
|
|
*
|
|
* @return The nearest ancestor of <code>comp</code> which is an instance
|
|
* of the given class, or <code>null</code> if no such ancestor exists
|
|
*
|
|
* @see #getAncestorOfClass
|
|
* @see #windowForComponent
|
|
*/
|
|
public static Container getAncestorOfClass(Class c, Component comp)
|
|
{
|
|
while (comp != null && (! c.isInstance(comp)))
|
|
comp = comp.getParent();
|
|
return (Container) comp;
|
|
}
|
|
|
|
/**
|
|
* Equivalent to calling <code>getAncestorOfClass(Window, comp)</code>.
|
|
*
|
|
* @param comp The component to search for an ancestor window
|
|
*
|
|
* @return An ancestral window, or <code>null</code> if none exists
|
|
*/
|
|
public static Window windowForComponent(Component comp)
|
|
{
|
|
return (Window) getAncestorOfClass(Window.class, comp);
|
|
}
|
|
|
|
/**
|
|
* Returns the "root" of the component tree containint <code>comp</code>
|
|
* The root is defined as either the <em>least</em> ancestor of
|
|
* <code>comp</code> which is a {@link Window}, or the <em>greatest</em>
|
|
* ancestor of <code>comp</code> which is a {@link Applet} if no {@link
|
|
* Window} ancestors are found.
|
|
*
|
|
* @param comp The component to search for a root
|
|
*
|
|
* @return The root of the component's tree, or <code>null</code>
|
|
*/
|
|
public static Component getRoot(Component comp)
|
|
{
|
|
Applet app = null;
|
|
Window win = null;
|
|
|
|
while (comp != null)
|
|
{
|
|
if (win == null && comp instanceof Window)
|
|
win = (Window) comp;
|
|
else if (comp instanceof Applet)
|
|
app = (Applet) comp;
|
|
comp = comp.getParent();
|
|
}
|
|
|
|
if (win != null)
|
|
return win;
|
|
else
|
|
return app;
|
|
}
|
|
|
|
/**
|
|
* Return true if a descends from b, in other words if b is an
|
|
* ancestor of a.
|
|
*
|
|
* @param a The child to search the ancestry of
|
|
* @param b The potential ancestor to search for
|
|
*
|
|
* @return true if a is a descendent of b, false otherwise
|
|
*/
|
|
public static boolean isDescendingFrom(Component a, Component b)
|
|
{
|
|
while (true)
|
|
{
|
|
if (a == null || b == null)
|
|
return false;
|
|
if (a == b)
|
|
return true;
|
|
a = a.getParent();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the deepest descendent of parent which is both visible and
|
|
* contains the point <code>(x,y)</code>. Returns parent when either
|
|
* parent is not a container, or has no children which contain
|
|
* <code>(x,y)</code>. Returns <code>null</code> when either
|
|
* <code>(x,y)</code> is outside the bounds of parent, or parent is
|
|
* <code>null</code>.
|
|
*
|
|
* @param parent The component to search the descendents of
|
|
* @param x Horizontal coordinate to search for
|
|
* @param y Vertical coordinate to search for
|
|
*
|
|
* @return A component containing <code>(x,y)</code>, or
|
|
* <code>null</code>
|
|
*
|
|
* @see java.awt.Container#findComponentAt
|
|
*/
|
|
public static Component getDeepestComponentAt(Component parent, int x, int y)
|
|
{
|
|
if (parent == null || (! parent.contains(x, y)))
|
|
return null;
|
|
|
|
if (! (parent instanceof Container))
|
|
return parent;
|
|
|
|
Container c = (Container) parent;
|
|
return c.findComponentAt(x, y);
|
|
}
|
|
|
|
/**
|
|
* Converts a point from a component's local coordinate space to "screen"
|
|
* coordinates (such as the coordinate space mouse events are delivered
|
|
* in). This operation is equivalent to translating the point by the
|
|
* location of the component (which is the origin of its coordinate
|
|
* space).
|
|
*
|
|
* @param p The point to convert
|
|
* @param c The component which the point is expressed in terms of
|
|
*
|
|
* @see convertPointFromScreen
|
|
*/
|
|
public static void convertPointToScreen(Point p, Component c)
|
|
{
|
|
Point c0 = c.getLocationOnScreen();
|
|
p.translate(c0.x, c0.y);
|
|
}
|
|
|
|
/**
|
|
* Converts a point from "screen" coordinates (such as the coordinate
|
|
* space mouse events are delivered in) to a component's local coordinate
|
|
* space. This operation is equivalent to translating the point by the
|
|
* negation of the component's location (which is the origin of its
|
|
* coordinate space).
|
|
*
|
|
* @param p The point to convert
|
|
* @param c The component which the point should be expressed in terms of
|
|
*/
|
|
public static void convertPointFromScreen(Point p, Component c)
|
|
{
|
|
Point c0 = c.getLocationOnScreen();
|
|
p.translate(-c0.x, -c0.y);
|
|
}
|
|
|
|
/**
|
|
* Converts a point <code>(x,y)</code> from the coordinate space of one
|
|
* component to another. This is equivalent to converting the point from
|
|
* <code>source</code> space to screen space, then back from screen space
|
|
* to <code>destination</code> space. If exactly one of the two
|
|
* Components is <code>null</code>, it is taken to refer to the root
|
|
* ancestor of the other component. If both are <code>null</code>, no
|
|
* transformation is done.
|
|
*
|
|
* @param source The component which the point is expressed in terms of
|
|
* @param x Horizontal coordinate of point to transform
|
|
* @param y Vertical coordinate of point to transform
|
|
* @param destination The component which the return value will be
|
|
* expressed in terms of
|
|
*
|
|
* @return The point <code>(x,y)</code> converted from the coordinate space of the
|
|
* source component to the coordinate space of the destination component
|
|
*
|
|
* @see #convertPointToScreen
|
|
* @see #convertPointFromScreen
|
|
* @see #convertRectangle
|
|
* @see #getRoot
|
|
*/
|
|
public static Point convertPoint(Component source, int x, int y,
|
|
Component destination)
|
|
{
|
|
Point pt = new Point(x, y);
|
|
|
|
if (source == null && destination == null)
|
|
return pt;
|
|
|
|
if (source == null)
|
|
source = getRoot(destination);
|
|
|
|
if (destination == null)
|
|
destination = getRoot(source);
|
|
|
|
convertPointToScreen(pt, source);
|
|
convertPointFromScreen(pt, destination);
|
|
|
|
return pt;
|
|
}
|
|
|
|
public static Point convertPoint(Component source, Point aPoint, Component destination)
|
|
{
|
|
return convertPoint(source, aPoint.x, aPoint.y, destination);
|
|
}
|
|
|
|
/**
|
|
* Converts a rectangle from the coordinate space of one component to
|
|
* another. This is equivalent to converting the rectangle from
|
|
* <code>source</code> space to screen space, then back from screen space
|
|
* to <code>destination</code> space. If exactly one of the two
|
|
* Components is <code>null</code>, it is taken to refer to the root
|
|
* ancestor of the other component. If both are <code>null</code>, no
|
|
* transformation is done.
|
|
*
|
|
* @param source The component which the rectangle is expressed in terms of
|
|
* @param rect The rectangle to convert
|
|
* @param destination The component which the return value will be
|
|
* expressed in terms of
|
|
*
|
|
* @return A new rectangle, equal in size to the input rectangle, but
|
|
* with its position converted from the coordinate space of the source
|
|
* component to the coordinate space of the destination component
|
|
*
|
|
* @see #convertPointToScreen
|
|
* @see #convertPointFromScreen
|
|
* @see #convertPoint
|
|
* @see #getRoot
|
|
*/
|
|
public static Rectangle convertRectangle(Component source,
|
|
Rectangle rect,
|
|
Component destination)
|
|
{
|
|
Point pt = convertPoint(source, rect.x, rect.y, destination);
|
|
return new Rectangle(pt.x, pt.y, rect.width, rect.height);
|
|
}
|
|
|
|
/**
|
|
* Convert a mouse event which refrers to one component to another. This
|
|
* includes changing the mouse event's coordinate space, as well as the
|
|
* source property of the event. If <code>source</code> is
|
|
* <code>null</code>, it is taken to refer to <code>destination</code>'s
|
|
* root component. If <code>destination</code> is <code>null</code>, the
|
|
* new event will remain expressed in <code>source</code>'s coordinate
|
|
* system.
|
|
*
|
|
* @param source The component the mouse event currently refers to
|
|
* @param sourceEvent The mouse event to convert
|
|
* @param destination The component the new mouse event should refer to
|
|
*
|
|
* @return A new mouse event expressed in terms of the destination
|
|
* component's coordinate space, and with the destination component as
|
|
* its source
|
|
*
|
|
* @see #convertPoint
|
|
*/
|
|
public static MouseEvent convertMouseEvent(Component source,
|
|
MouseEvent sourceEvent,
|
|
Component destination)
|
|
{
|
|
Point newpt = convertPoint(source, sourceEvent.getX(), sourceEvent.getY(),
|
|
destination);
|
|
|
|
return new MouseEvent(destination, sourceEvent.getID(),
|
|
sourceEvent.getWhen(), sourceEvent.getModifiersEx(),
|
|
newpt.x, newpt.y, sourceEvent.getClickCount(),
|
|
sourceEvent.isPopupTrigger(), sourceEvent.getButton());
|
|
}
|
|
|
|
/**
|
|
* Recursively walk the component tree under <code>comp</code> calling
|
|
* <code>updateUI</code> on each {@link JComponent} found. This causes
|
|
* the entire tree to re-initialize its UI delegates.
|
|
*
|
|
* @param comp The component to walk the children of, calling <code>updateUI</code>
|
|
*/
|
|
public static void updateComponentTreeUI(Component comp)
|
|
{
|
|
if (comp == null)
|
|
return;
|
|
|
|
if (comp instanceof Container)
|
|
{
|
|
Component[] children = ((Container)comp).getComponents();
|
|
for (int i = 0; i < children.length; ++i)
|
|
updateComponentTreeUI(children[i]);
|
|
}
|
|
|
|
if (comp instanceof JComponent)
|
|
((JComponent)comp).updateUI();
|
|
}
|
|
|
|
|
|
/**
|
|
* <p>Layout a "compound label" consisting of a text string and an icon
|
|
* which is to be placed near the rendered text. Once the text and icon
|
|
* are laid out, the text rectangle and icon rectangle parameters are
|
|
* altered to store the calculated positions.</p>
|
|
*
|
|
* <p>The size of the text is calculated from the provided font metrics
|
|
* object. This object should be the metrics of the font you intend to
|
|
* paint the label with.</p>
|
|
*
|
|
* <p>The position values control where the text is placed relative to
|
|
* the icon. The horizontal position value should be one of the constants
|
|
* <code>LEADING</code>, <code>TRAILING</code>, <code>LEFT</code>,
|
|
* <code>RIGHT</code> or <code>CENTER</code>. The vertical position value
|
|
* should be one fo the constants <code>TOP</code>, <code>BOTTOM</code>
|
|
* or <code>CENTER</code>.</p>
|
|
*
|
|
* <p>The text-icon gap value controls the number of pixels between the
|
|
* icon and the text.</p>
|
|
*
|
|
* <p>The alignment values control where the text and icon are placed, as
|
|
* a combined unit, within the view rectangle. The horizontal alignment
|
|
* value should be one of the constants <code>LEADING</code>,
|
|
* <code>TRAILING</code>, <code>LEFT</code>, <code>RIGHT</code> or
|
|
* <code>CENTER</code>. The vertical alignment valus should be one of the
|
|
* constants <code>TOP</code>, <code>BOTTOM</code> or
|
|
* <code>CENTER</code>.</p>
|
|
*
|
|
* <p>If the <code>LEADING</code> or <code>TRAILING</code> constants are
|
|
* given for horizontal alignment or horizontal text position, they are
|
|
* interpreted relative to the provided component's orientation property,
|
|
* a constant in the {@link java.awt.ComponentOrientation} class. For
|
|
* example, if the component's orientation is <code>LEFT_TO_RIGHT</code>,
|
|
* then the <code>LEADING</code> value is a synonym for <code>LEFT</code>
|
|
* and the <code>TRAILING</code> value is a synonym for
|
|
* <code>RIGHT</code></p>
|
|
*
|
|
* <p>If the text and icon are equal to or larger than the view
|
|
* rectangle, the horizontal and vertical alignment values have no
|
|
* affect.</p>
|
|
*
|
|
* @param c A component used for its orientation value
|
|
* @param fm The font metrics used to measure the text
|
|
* @param text The text to place in the compound label
|
|
* @param icon The icon to place next to the text
|
|
* @param verticalAlignment The vertical alignment of the label relative
|
|
* to its component
|
|
* @param horizontalAlignment The horizontal alignment of the label
|
|
* relative to its component
|
|
* @param verticalTextPosition The vertical position of the label's text
|
|
* relative to its icon
|
|
* @param horizontalTextPosition The horizontal position of the label's
|
|
* text relative to its icon
|
|
* @param viewR The view rectangle, specifying the area which layout is
|
|
* constrained to
|
|
* @param iconR A rectangle which is modified to hold the laid-out
|
|
* position of the icon
|
|
* @param textR A rectangle which is modified to hold the laid-out
|
|
* position of the text
|
|
* @param textIconGap The distance between text and icon
|
|
*
|
|
* @return The string of characters, possibly truncated with an elipsis,
|
|
* which is laid out in this label
|
|
*/
|
|
|
|
public static String layoutCompoundLabel(JComponent c,
|
|
FontMetrics fm,
|
|
String text,
|
|
Icon icon,
|
|
int verticalAlignment,
|
|
int horizontalAlignment,
|
|
int verticalTextPosition,
|
|
int horizontalTextPosition,
|
|
Rectangle viewR,
|
|
Rectangle iconR,
|
|
Rectangle textR,
|
|
int textIconGap)
|
|
{
|
|
|
|
// Fix up the orientation-based horizontal positions.
|
|
|
|
if (horizontalTextPosition == LEADING)
|
|
{
|
|
if (c.getComponentOrientation() == ComponentOrientation.RIGHT_TO_LEFT)
|
|
horizontalTextPosition = RIGHT;
|
|
else
|
|
horizontalTextPosition = LEFT;
|
|
}
|
|
else if (horizontalTextPosition == TRAILING)
|
|
{
|
|
if (c.getComponentOrientation() == ComponentOrientation.RIGHT_TO_LEFT)
|
|
horizontalTextPosition = LEFT;
|
|
else
|
|
horizontalTextPosition = RIGHT;
|
|
}
|
|
|
|
// Fix up the orientation-based alignments.
|
|
|
|
if (horizontalAlignment == LEADING)
|
|
{
|
|
if (c.getComponentOrientation() == ComponentOrientation.RIGHT_TO_LEFT)
|
|
horizontalAlignment = RIGHT;
|
|
else
|
|
horizontalAlignment = LEFT;
|
|
}
|
|
else if (horizontalAlignment == TRAILING)
|
|
{
|
|
if (c.getComponentOrientation() == ComponentOrientation.RIGHT_TO_LEFT)
|
|
horizontalAlignment = LEFT;
|
|
else
|
|
horizontalAlignment = RIGHT;
|
|
}
|
|
|
|
return layoutCompoundLabel(fm, text, icon,
|
|
verticalAlignment,
|
|
horizontalAlignment,
|
|
verticalTextPosition,
|
|
horizontalTextPosition,
|
|
viewR, iconR, textR, textIconGap);
|
|
}
|
|
|
|
/**
|
|
* <p>Layout a "compound label" consisting of a text string and an icon
|
|
* which is to be placed near the rendered text. Once the text and icon
|
|
* are laid out, the text rectangle and icon rectangle parameters are
|
|
* altered to store the calculated positions.</p>
|
|
*
|
|
* <p>The size of the text is calculated from the provided font metrics
|
|
* object. This object should be the metrics of the font you intend to
|
|
* paint the label with.</p>
|
|
*
|
|
* <p>The position values control where the text is placed relative to
|
|
* the icon. The horizontal position value should be one of the constants
|
|
* <code>LEFT</code>, <code>RIGHT</code> or <code>CENTER</code>. The
|
|
* vertical position value should be one fo the constants
|
|
* <code>TOP</code>, <code>BOTTOM</code> or <code>CENTER</code>.</p>
|
|
*
|
|
* <p>The text-icon gap value controls the number of pixels between the
|
|
* icon and the text.</p>
|
|
*
|
|
* <p>The alignment values control where the text and icon are placed, as
|
|
* a combined unit, within the view rectangle. The horizontal alignment
|
|
* value should be one of the constants <code>LEFT</code>, <code>RIGHT</code> or
|
|
* <code>CENTER</code>. The vertical alignment valus should be one of the
|
|
* constants <code>TOP</code>, <code>BOTTOM</code> or
|
|
* <code>CENTER</code>.</p>
|
|
*
|
|
* <p>If the text and icon are equal to or larger than the view
|
|
* rectangle, the horizontal and vertical alignment values have no
|
|
* affect.</p>
|
|
*
|
|
* <p>Note that this method does <em>not</em> know how to deal with
|
|
* horizontal alignments or positions given as <code>LEADING</code> or
|
|
* <code>TRAILING</code> values. Use the other overloaded variant of this
|
|
* method if you wish to use such values.
|
|
*
|
|
* @param fm The font metrics used to measure the text
|
|
* @param text The text to place in the compound label
|
|
* @param icon The icon to place next to the text
|
|
* @param verticalAlignment The vertical alignment of the label relative
|
|
* to its component
|
|
* @param horizontalAlignment The horizontal alignment of the label
|
|
* relative to its component
|
|
* @param verticalTextPosition The vertical position of the label's text
|
|
* relative to its icon
|
|
* @param horizontalTextPosition The horizontal position of the label's
|
|
* text relative to its icon
|
|
* @param viewR The view rectangle, specifying the area which layout is
|
|
* constrained to
|
|
* @param iconR A rectangle which is modified to hold the laid-out
|
|
* position of the icon
|
|
* @param textR A rectangle which is modified to hold the laid-out
|
|
* position of the text
|
|
* @param textIconGap The distance between text and icon
|
|
*
|
|
* @return The string of characters, possibly truncated with an elipsis,
|
|
* which is laid out in this label
|
|
*/
|
|
|
|
public static String layoutCompoundLabel(FontMetrics fm,
|
|
String text,
|
|
Icon icon,
|
|
int verticalAlignment,
|
|
int horizontalAlignment,
|
|
int verticalTextPosition,
|
|
int horizontalTextPosition,
|
|
Rectangle viewR,
|
|
Rectangle iconR,
|
|
Rectangle textR,
|
|
int textIconGap)
|
|
{
|
|
|
|
// Work out basic height and width.
|
|
|
|
if (icon == null)
|
|
{
|
|
textIconGap = 0;
|
|
iconR.width = 0;
|
|
iconR.height = 0;
|
|
}
|
|
else
|
|
{
|
|
iconR.width = icon.getIconWidth();
|
|
iconR.height = icon.getIconHeight();
|
|
}
|
|
if (text == null)
|
|
{
|
|
textIconGap = 0;
|
|
textR.width = 0;
|
|
textR.height = 0;
|
|
}
|
|
else
|
|
{
|
|
textR.width = fm.stringWidth(text);
|
|
textR.height = fm.getHeight();
|
|
}
|
|
|
|
// Work out the position of text and icon, assuming the top-left coord
|
|
// starts at (0,0). We will fix that up momentarily, after these
|
|
// "position" decisions are made and we look at alignment.
|
|
|
|
switch (horizontalTextPosition)
|
|
{
|
|
case LEFT:
|
|
textR.x = 0;
|
|
iconR.x = textR.width + textIconGap;
|
|
break;
|
|
case RIGHT:
|
|
iconR.x = 0;
|
|
textR.x = iconR.width + textIconGap;
|
|
break;
|
|
case CENTER:
|
|
int centerLine = Math.max(textR.width, iconR.width) / 2;
|
|
textR.x = centerLine - textR.width/2;
|
|
iconR.x = centerLine - iconR.width/2;
|
|
break;
|
|
}
|
|
|
|
switch (verticalTextPosition)
|
|
{
|
|
case TOP:
|
|
textR.y = 0;
|
|
iconR.y = (horizontalTextPosition == CENTER
|
|
? textR.height + textIconGap : 0);
|
|
break;
|
|
case BOTTOM:
|
|
iconR.y = 0;
|
|
textR.y = (horizontalTextPosition == CENTER
|
|
? iconR.height + textIconGap
|
|
: iconR.height - textR.height);
|
|
break;
|
|
case CENTER:
|
|
int centerLine = Math.max(textR.height, iconR.height) / 2;
|
|
textR.y = centerLine - textR.height/2;
|
|
iconR.y = centerLine - iconR.height/2;
|
|
break;
|
|
}
|
|
// The two rectangles are laid out correctly now, but only assuming
|
|
// that their upper left corner is at (0,0). If we have any alignment other
|
|
// than TOP and LEFT, we need to adjust them.
|
|
|
|
Rectangle u = textR.union(iconR);
|
|
int horizontalAdjustment = viewR.x;
|
|
int verticalAdjustment = viewR.y;
|
|
switch (verticalAlignment)
|
|
{
|
|
case TOP:
|
|
break;
|
|
case BOTTOM:
|
|
verticalAdjustment += (viewR.height - u.height);
|
|
break;
|
|
case CENTER:
|
|
verticalAdjustment += ((viewR.height/2) - (u.height/2));
|
|
break;
|
|
}
|
|
switch (horizontalAlignment)
|
|
{
|
|
case LEFT:
|
|
break;
|
|
case RIGHT:
|
|
horizontalAdjustment += (viewR.width - u.width);
|
|
break;
|
|
case CENTER:
|
|
horizontalAdjustment += ((viewR.width/2) - (u.width/2));
|
|
break;
|
|
}
|
|
|
|
iconR.x += horizontalAdjustment;
|
|
iconR.y += verticalAdjustment;
|
|
|
|
textR.x += horizontalAdjustment;
|
|
textR.y += verticalAdjustment;
|
|
|
|
return text;
|
|
}
|
|
|
|
/**
|
|
* Calls {@link java.awt.EventQueue.invokeLater} with the
|
|
* specified {@link Runnable}.
|
|
*/
|
|
public static void invokeLater(Runnable doRun)
|
|
{
|
|
java.awt.EventQueue.invokeLater(doRun);
|
|
}
|
|
|
|
/**
|
|
* Calls {@link java.awt.EventQueue.invokeAndWait} with the
|
|
* specified {@link Runnable}.
|
|
*/
|
|
public static void invokeAndWait(Runnable doRun)
|
|
throws InterruptedException,
|
|
InvocationTargetException
|
|
{
|
|
java.awt.EventQueue.invokeAndWait(doRun);
|
|
}
|
|
|
|
/**
|
|
* Calls {@link java.awt.EventQueue.isEventDispatchThread}.
|
|
*/
|
|
public static boolean isEventDispatchThread()
|
|
{
|
|
return java.awt.EventQueue.isDispatchThread();
|
|
}
|
|
|
|
/**
|
|
* This method paints the given component at the given position and size.
|
|
* The component will be reparented to the container given.
|
|
*
|
|
* @param g The Graphics object to draw with.
|
|
* @param c The Component to draw
|
|
* @param p The Container to reparent to.
|
|
* @param x The x coordinate to draw at.
|
|
* @param y The y coordinate to draw at.
|
|
* @param w The width of the drawing area.
|
|
* @param h The height of the drawing area.
|
|
*/
|
|
public static void paintComponent(Graphics g, Component c, Container p,
|
|
int x, int y, int w, int h)
|
|
{
|
|
Container parent = c.getParent();
|
|
if (parent != null)
|
|
parent.remove(c);
|
|
if (p != null)
|
|
p.add(c);
|
|
|
|
Shape savedClip = g.getClip();
|
|
|
|
g.setClip(x, y, w, h);
|
|
g.translate(x, y);
|
|
|
|
c.paint(g);
|
|
|
|
g.translate(-x, -y);
|
|
g.setClip(savedClip);
|
|
}
|
|
|
|
/**
|
|
* This method paints the given component in the given rectangle.
|
|
* The component will be reparented to the container given.
|
|
*
|
|
* @param g The Graphics object to draw with.
|
|
* @param c The Component to draw
|
|
* @param p The Container to reparent to.
|
|
* @param r The rectangle that describes the drawing area.
|
|
*/
|
|
public static void paintComponent(Graphics g, Component c,
|
|
Container p, Rectangle r)
|
|
{
|
|
paintComponent(g, c, p, r.x, r.y, r.width, r.height);
|
|
}
|
|
|
|
/**
|
|
* This method returns the common Frame owner used in JDialogs or
|
|
* JWindow when no owner is provided.
|
|
*
|
|
* @return The common Frame
|
|
*/
|
|
static Frame getOwnerFrame()
|
|
{
|
|
if (ownerFrame == null)
|
|
ownerFrame = new OwnerFrame();
|
|
return ownerFrame;
|
|
}
|
|
|
|
/**
|
|
* Checks if left mouse button was clicked.
|
|
*
|
|
* @param event the event to check
|
|
*
|
|
* @return true if left mouse was clicked, false otherwise.
|
|
*/
|
|
public static boolean isLeftMouseButton(MouseEvent event)
|
|
{
|
|
return ((event.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK)
|
|
== InputEvent.BUTTON1_DOWN_MASK);
|
|
}
|
|
|
|
/**
|
|
* Checks if middle mouse button was clicked.
|
|
*
|
|
* @param event the event to check
|
|
*
|
|
* @return true if middle mouse was clicked, false otherwise.
|
|
*/
|
|
public static boolean isMiddleMouseButton(MouseEvent event)
|
|
{
|
|
return ((event.getModifiersEx() & InputEvent.BUTTON2_DOWN_MASK)
|
|
== InputEvent.BUTTON2_DOWN_MASK);
|
|
}
|
|
|
|
/**
|
|
* Checks if right mouse button was clicked.
|
|
*
|
|
* @param event the event to check
|
|
*
|
|
* @return true if right mouse was clicked, false otherwise.
|
|
*/
|
|
public static boolean isRightMouseButton(MouseEvent event)
|
|
{
|
|
return ((event.getModifiersEx() & InputEvent.BUTTON3_DOWN_MASK)
|
|
== InputEvent.BUTTON3_DOWN_MASK);
|
|
}
|
|
|
|
/**
|
|
* This frame should be used when constructing a Window/JDialog without
|
|
* a parent. In this case, we are forced to use this frame as a window's
|
|
* parent, because we simply cannot pass null instead of parent to Window
|
|
* constructor, since doing it will result in NullPointerException.
|
|
*/
|
|
private static class OwnerFrame extends Frame
|
|
{
|
|
public void setVisible(boolean b)
|
|
{
|
|
// Do nothing here.
|
|
}
|
|
|
|
public boolean isShowing()
|
|
{
|
|
return true;
|
|
}
|
|
}
|
|
|
|
public static boolean notifyAction(Action action,
|
|
KeyStroke ks,
|
|
KeyEvent event,
|
|
Object sender,
|
|
int modifiers)
|
|
{
|
|
if (action != null && action.isEnabled())
|
|
{
|
|
String name = (String) action.getValue(Action.ACTION_COMMAND_KEY);
|
|
if (name == null
|
|
&& event.getKeyChar() != KeyEvent.CHAR_UNDEFINED)
|
|
name = new String(new char[] {event.getKeyChar()});
|
|
action.actionPerformed(new ActionEvent(sender,
|
|
ActionEvent.ACTION_PERFORMED,
|
|
name, modifiers));
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* <p>Change the shared, UI-managed {@link ActionMap} for a given
|
|
* component. ActionMaps are arranged in a hierarchy, in order to
|
|
* encourage sharing of common actions between components. The hierarchy
|
|
* unfortunately places UI-managed ActionMaps at the <em>end</em> of the
|
|
* parent-pointer chain, as illustrated:</p>
|
|
*
|
|
* <pre>
|
|
* [{@link javax.swing.JComponent#getActionMap()}]
|
|
* --> [{@link javax.swing.ActionMap}]
|
|
* parent --> [{@link javax.swing.text.KeymapActionMap}]
|
|
* parent --> [{@link javax.swing.plaf.ActionMapUIResource}]
|
|
* </pre>
|
|
*
|
|
* <p>Our goal with this method is to replace the first ActionMap along
|
|
* this chain which is an instance of {@link ActionMapUIResource}, since
|
|
* these are the ActionMaps which are supposed to be shared between
|
|
* components.</p>
|
|
*
|
|
* <p>If the provided ActionMap is <code>null</code>, we interpret the
|
|
* call as a request to remove the UI-managed ActionMap from the
|
|
* component's ActionMap parent chain.</p>
|
|
*/
|
|
public static void replaceUIActionMap(JComponent component,
|
|
ActionMap uiActionMap)
|
|
{
|
|
ActionMap child = component.getActionMap();
|
|
if (child == null)
|
|
component.setActionMap(uiActionMap);
|
|
else
|
|
{
|
|
while(child.getParent() != null
|
|
&& !(child.getParent() instanceof ActionMapUIResource))
|
|
child = child.getParent();
|
|
if (child != null)
|
|
child.setParent(uiActionMap);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* <p>Change the shared, UI-managed {@link InputMap} for a given
|
|
* component. InputMaps are arranged in a hierarchy, in order to
|
|
* encourage sharing of common input mappings between components. The
|
|
* hierarchy unfortunately places UI-managed InputMaps at the
|
|
* <em>end</em> of the parent-pointer chain, as illustrated:</p>
|
|
*
|
|
* <pre>
|
|
* [{@link javax.swing.JComponent#getInputMap()}]
|
|
* --> [{@link javax.swing.InputMap}]
|
|
* parent --> [{@link javax.swing.text.KeymapWrapper}]
|
|
* parent --> [{@link javax.swing.plaf.InputMapUIResource}]
|
|
* </pre>
|
|
*
|
|
* <p>Our goal with this method is to replace the first InputMap along
|
|
* this chain which is an instance of {@link InputMapUIResource}, since
|
|
* these are the InputMaps which are supposed to be shared between
|
|
* components.</p>
|
|
*
|
|
* <p>If the provided InputMap is <code>null</code>, we interpret the
|
|
* call as a request to remove the UI-managed InputMap from the
|
|
* component's InputMap parent chain.</p>
|
|
*/
|
|
public static void replaceUIInputMap(JComponent component,
|
|
int condition,
|
|
InputMap uiInputMap)
|
|
{
|
|
InputMap child = component.getInputMap(condition);
|
|
if (child == null)
|
|
component.setInputMap(condition, uiInputMap);
|
|
else
|
|
{
|
|
while(child.getParent() != null
|
|
&& !(child.getParent() instanceof InputMapUIResource))
|
|
child = child.getParent();
|
|
if (child != null)
|
|
child.setParent(uiInputMap);
|
|
}
|
|
}
|
|
}
|