4dfcdad172
2004-06-17 Michael Koch <konqueror@gmx.de> * javax/swing/JToolBar.java (name): Removed. (JToolBar): Use Component.setName(String) instead of doing it all alone. * javax/swing/Timer.java (queueEvent): Added missing modifier. 2004-06-17 Olga Rodimina <rodimina@redhat.coom> * Makefile.am: Added new file. * Makefile.in: Re-generate. * javax/swing/JMenu.java: (insertSeparator): Implemented. * javax/swing/JPopupMenu.java: (JPopupMenu.Separator): Implemented. * javax/swing/MenuSelectionManager.java: (processMouseEvent): Use java.awt.Component for event source instead of javax.swing.JComponent. * javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java: New File. Implemented. 2004-06-16 David Jee <djee@redhat.com> * java/awt/GridBagLayout.java (GetLayoutInfo): Adjust cell sizes iff parent size is not zero. Make sure pos_x and pos_y are never negative. 2004-04-16 Andrew Overholt <overholt@redhat.com> * Makefile.am: Add new file. * Makefile.in: Re-generate. * javax/swing/JToolBar.java Partially implemented. * javax/swing/plaf/basic/BasicToolBarUI.java New file. Partially implemented. 2004-06-16 Graydon Hoare <graydon@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java (setComposite): Accept AlphaComposite arguments. * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java (createBufferedImage): Add new overloads. * gnu/java/awt/peer/gtk/GtkToolkit.java (createImage): Use GdkPixbufDecoder.createBufferedImage when useGraphics2D() is true. (getImage): Delegate to createImage. * javax/swing/JList.java (isSelectionEmpty): (getFirstVisibleIndex): (getLastVisibleIndex): (setSelectedValue): (ensureIndexIsVisible): New methods. * javax/swing/Timer.java: Reimplement. 2004-06-16 Michael Koch <konqueror@gmx.de> * javax/swing/text/AbstractDocument.java (AbstracElement): Made public, implements java.io.Serializable. (AttributeContext): Made public. (BranchElement): Likewise. (Content): Likewise. (DefaultDocumentEvent): Made public, extends javax.swing.undo.CompoundEdit. (ElementEdit): Made public, extends javax.swing.undo.AbstractUndoableEdit. (LeafElement): Made public. (LeafElement.LeafElement): Made public. 2004-06-16 Michael Koch <konqueror@gmx.de> * javax/swing/text/JTextComponent.java: Totally reworked. Removed many methods (that were obviously never be intended to get included hi this class. Added some methods too. 2004-06-16 Michael Koch <konqueror@gmx.de> * javax/swing/text/PlainDocument.java (serialVersionUID): New constant. (lineLimitAttribute): Likewise. (tabSizeAttribute): Likewise. (tabSize): New field. (PlainDocument): Made public. (PlainDocument): New constructor. 2004-06-16 Michael Koch <konqueror@gmx.de> * javax/swing/text/AbstractDocument.java (insertString): Throws BadLocationException. * javax/swing/text/Document.java (insertString): Likewise. * javax/swing/text/JTextComponent.java: Javadocs and comments cleaned up. 2004-06-16 Michael Koch <konqueror@gmx.de> * javax/swing/event/UndoableEditListener.java: Reformatted. * javax/swing/text/AbstractDocument.java (AbstractDocument): Implements java.io.Serializable. (doc_list): Removed. (undo_list): Removed. (AbstractElement.serialVerionUID): New field. (BranchElement.serialVerionUID): Likewise. (DefaultDocumentEvent.serialVerionUID): Likewise. (ElementEdit.serialVerionUID): Likewise. (LeafElement.serialVerionUID): Likewise. (serialVerionUID): Likewise. (BAD_LOCATION): New constant. (BidiElementName): Likewise. (ContentElementName): Likewise. (ParagraphElementName): Likewise. (SectionElementName): Likewise. (ElementNameAttribute): Likewise. (AbstractDocument): Made protected. (AbstractDocument): New construtor. (listenerList): New field. (fireChangedUpdate): Implemented. (fireInsertUpdate): Likewise. (fireRemoveUpdate): Likewise. (fireUndoableEditUpdate): Likewise. (getListeners): Likewise. (addDocumentListener): Likewise. (removeDocumentListener): Likewise. (addUndoableEditListener): Likewise. (removeUndoableEditListener): Likewise. (getDocumentListeners): New method. (getUndoableEditListeners): Likewise. (getAsynchronousLoadPriority): Made public. (getBidiRootElement): Likewise. (setAsynchronousLoadPriority): Likewise. (setDocumentProperties): Likewise. * javax/swing/text/BadLocationException.java (serialVerionUID): New field. * javax/swing/text/DefaultCaret.java (changeEvent): New field. (listenerList): Likewise. (changes): Removed. (addChangeListener): Reimplemented. (removeChangeListener): Likewise. (getListeners): New method. (getChangeListeners): Likwise. (getComponent): Likewise. * javax/swing/text/GapContent.java (GapContent): Implements java.io.Serializable. (serialVerionUID): New field. 2004-06-16 Michael Koch <konqueror@gmx.de> * javax/swing/JTree.java (treeModel): New field. (JTree): New constructors, one existing one made public. (createTreeModel): New method. (addTreeExpansionListener): Likewise. (removeTreeExpansionListener): Likewise. (getTreeExpansionListeners): Likewise. (fireTreeCollapsed): Likewise. (fireTreeExpanded): Likewise. (addTreeSelectionListener): Likewise. (removeTreeSelectionListener): Likewise. (getTreeSelectionListeners): Likewise. (fireValueChanged): Likewise. (addTreeWillExpandListener): Likewise. (removeTreeWillExpandListener): Likewise. (getTreeWillExpandListeners): Likewise. (fireTreeWillCollapse): Likewise. (fireTreeWillExpand): Likewise. 2004-06-16 Michael Koch <konqueror@gmx.de> * javax/swing/JTree.java: Reformatted. 2004-06-16 Michael Koch <konqueror@gmx.de> * javax/swing/JTextArea.java: New file. * javax/swing/JTextField.java (actions): Removed. (notifyAction): New constant. (columns): New field. (JTextField): New constructors. (createDefaultModel): New method. (addActionListener): Reimplmemented. (removeActionListener): Reimplemented. (getActionListeners): New method. (fireActionPerformed): New method. (getColumns): New method. (setColumne): New method. * javax/swing/text/JTextComponent.java (AccessibleJTextComponent.serialVersionUID): New field. (serialVersionUID): Likewise. (DEFAULT_KEYMAP): Likewise. (FOCUS_ACCELERATOR_KEY): Likewise. (doc): Made private. (icon_gap): Likewise. (icon): Likewise. (align): Likewise. (JTextComponent): Some constructors removed. (getScrollableTracksViewportHeight): New method. (getScrollableTracksViewportWidth): Likewise. * Makefile.am: Added javax/swing/JTextArea.java. * Makefile.in: Regenerated. 2004-06-15 Graydon Hoare <graydon@redhat.com> * javax/swing/ImageIcon.java (ImageIcon): New constructor. * javax/swing/JFrame.java (defaultLookAndFeelDecorated): New property. * javax/swing/JViewport.java (getExtentSize): Return size rather than preferred size. (toViewCoordinates): New methods. (getViewSize): Return size rather than preferred size. (setViewSize): Note view size as set. * javax/swing/ViewportLayout.java (layoutContainer): Reimplement. * javax/swing/plaf/basic/BasicScrollBarUI.java (getPreferredSize): Don't redo layout. * javax/swing/plaf/basic/BasicViewportUI.java (paint): Translate image properly and eat exceptions. 2004-06-15 Kim Ho <kho@redhat.com> * javax/swing/JTabbedPane.java (setComponent): Remove old component and add new component. (setSelectedIndex): Don't operate on the components if they're null. Don't set index on the model if the index is the same. (insertTab): Don't add or hide the component if it's null. Repaint the container. * javax/swing/plaf/basic/BasicLookAndFeel.java Change colors for TabbedPane. * javax/swing/plaf/basic/BasicTabbedPaneUI.java (mousePressed): Re-layout and paint the component. (layoutContainer): Don't set location on the view. (ScrollingViewport::paint): Remove. 2004-06-14 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (gtkWidgetDispatchKeyEvent): Change warning message to comment. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (drawString): Wrap baseline y value in PANGO_PIXELS macro, rather than simply dividing by PANGO_SCALE. Call gdk_flush before leaving GDK critical region. (drawLine): Call gdk_flush before leaving GDK critical region. (fillRect): Likewise. (drawRect): Likewise. (copyArea): Likewise. (copyPixmap): Likewise. (clearRect): Likewise. (drawArc): Likewise. (drawPolyline): Likewise. (drawPolygon): Likewise. (fillPolygon): Likewise. (fillArc): Likewise. (drawOval): Likewise. (fillOval): Likewise. * gnu/java/awt/peer/gtk/GdkFontMetrics.java (initState): Add style parameter. (GdkFontMetrics): Add style argument to initState call. (stringWidth(String,int,int,String)): Add style parameter. (stringWidth(String)): Add style argument to stringWidth call. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c (initState): Set pango font style and weight based on AWT style parameter. Pass default GTK language to pango_context_get_metrics. Use PANGO_PIXELS macro rather than simply dividing by PANGO_SCALE. (stringWidth): Set pango font style and weight based on AWT style parameter. * java/awt/Button.java (next_button_number): New field. (paramString): Change output. (generateName): New method. (getUniqueLong): New method. 2004-06-14 Kim Ho <kho@redhat.com> * javax/swing/JTabbedPane.java: (setComponentAt): Set the component, not the enabled status. * javax/swing/plaf/basic/BasicDesktopIconUI.java (actionPerformed): Let deiconize catch exception. 2004-06-14 Olga Rodimina <rodimina@redhat.com> * javax/swing/JPopupMenu.java: (setVisible): Corrected location of a heavyweight popup menu. 2004-06-14 Olga Rodimina <rodimina@redhat.com> * javax/swing/MenuSelectionManager.java: Ran through jalopy to fix formatting style. 2004-06-14 Olga Rodimina <rodimina@redhat.com> * javax/swing/JLayeredPane.java: (remove): Revalidate and repaint layered pane after the component was removed. javax/swing/JMenu.java: (setVisible): Display popup menu at the user location, if one was set by the user. (setMenuLocation): Reimplemented. Fixed javadoc. * javax/swing/JMenuBar.java: Added javadoc. (BORDER_PAINTED_CHANGED_PROPERTY): New Property. (MODEL_CHANGED_PROPERTY): New Property. (isSelected): Implemented. (setBorderPainted): Fire PropertyChangeEvent if paintBorder property changes. (setSelected): Implemented. (setSelectionModel): Implemented. * javax/swing/JPopupMenu.java: Added Javadoc (pack): Implemented. (setVisible): Reimplemented. (show): Fixed location. (JPopupMenu.LigthWeightPopup): Reimplemented to use Container instead of JPanel. * javax/swing/MenuSelectionManager.java: Added Javadocs. (clearSelectedPath): Reimplemented to clear selectedPath in reverse order. (processMouseEvent): Reimplemented. (setSelectedPath): Fire stateChange event indicating that selected menu path has changed. (getPath): Change to use ArrayList instead of Vector. * javax/swing/plaf/basic/BasicMenuBarUI.java: (installUI): call installKeyboardActions(). (uninstallUI): call uninstallKeyboardActions(). 2004-06-13 Michael Koch <konqueror@gmx.de> * javax/swing/text/DefaultCaret.java, javax/swing/text/BadLocationException.java: Reformatted. 2004-06-12 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkTextAreaPeer.java (DEFAULT_ROWS, DEFAULT_COLS): New variables. (create): Don't allow 0 rows or 0 columns. Instead, set the values to DEFAULT_ROWS or DEFAULT_COLS. (getMinimumSize): Likewise. (getPreferredSize): Likewise. (minimumSize): Likewise. (preferredSize): Likewise. (create): Set peer's editable state. * java/awt/TextArea.java (TextArea()): Set rows and columns to zero. Update javadocs. (TextArea(String)): Likewise. (TextArea(int,int)): Fix javadocs. (TextArea(String,int,int,int)): Only throw exception if one of rows or columns is zero. Fix javadocs. 2004-06-11 Thomas Fitzsimmons <fitzsim@redhat.com> * java/awt/AWTEvent.java (toString): Handle MenuComponents in addition to Components. * java/awt/MenuItem.java (dispatchEventImpl): If the event wasn't consumed by normal processing, send it to the parent menu. * gnu/java/awt/peer/gtk/GtkImagePainter.java (setPixels(int,int,int,int,ColorModel,int[],int,int)): Remove translation. 2004-06-11 David Jee <djee@redhat.com> * java/awt/MediaTracker.java (addImage(Image,int)): Call imageUpdate() to udpate image status. (addImage(Image,int,int,int)): Likewise. 2004-06-11 Michael Koch <konqueror@gmx.de> * javax/swing/text/AbstractDocument.java, javax/swing/text/Document.java, javax/swing/text/GapContent.java, javax/swing/text/JTextComponent.java, javax/swing/text/PlainDocument.java: Reformatted. 2004-06-11 Michael Koch <konqueror@gmx.de> * javax/swing/JRootPane.java (AccessibleJRootPane.serialVersionUID): New field. (AccessibleJRootPane.AccessibleJRootPane): New constructor. (AccessibleJRootPane.getAccessibleRole): New method. (RootLayout): Implements Serializable. (RootLayout.serialVersionUID): New field. (RootLayout.RootLayout): New constructor. (setJMenuBar): Made public. (getJMenuBar): Likewise. (JRootPane): Likewise. (createContentPane): Likewise. (createGlassPane): Likewise. (createLayeredPane): Likewise. 2004-06-11 Michael Koch <konqueror@gmx.de> * javax/swing/SwingUtilities.java (isLeftMouseButton): Fixed javadoc. (isMiddleMouseButton): Likewise. (isRightMouseButton): Likewise. 2004-06-11 Michael Koch <konqueror@gmx.de> * javax/swing/JScrollPane.java (serialVersionUID): New field. (columnHeader): Made protected. (rowHeader): Likewise. (lowerLeft): Likewise. (lowerRight): Likewise. (upperLeft): Likewise. (upperRight): Likewise. (horizontalScrollBar): Likewise. (horizontalScrollBarPolicy): Likewise. (verticalScrollBar): Likewise. (verticalScrollBarPolicy): Likewise. (viewport): Likewise. 2004-06-11 Michael Koch <konqueror@gmx.de> * javax/swing/LookAndFeel.java: Fixed javadocs. 2004-06-11 Michael Koch <konqueror@gmx.de> * javax/swing/JEditorPane.java: Fixed javadocs. (JEditorPane): Removed redundant call to to this(). (fireHyperlinkUpdate): Implemented. 2004-06-10 Olga Rodimina <rodimina@redhat.com> * javax/swing/JMenu.java: Fixed file name in the file comment. 2004-06-10 Olga Rodimina <rodimina@redhat.com> * javax/swing/JMenu.java: Added javadoc. (JMenu): Added MenuChangeListener to listen to ChangeEvents occuring in menu's model. (insert): Throw IllegalArgumentException if index is less than 0 (setSelected): Reimplement. (setPopupMenuVisible): Call menu's model isEnabled() (setDelay): Throw IllegalArgumentException if given amount of delay is less than 0. (createActionComponent): Implemented. (createActionChangeListener): Implemented. (addSeparator): Implemented. (getItem): Throw IllegalArgumentException if index is less than 0. (getItemCount): Implemented. (fireMenuSelected): Changed to use menuEvent. (fireMenuDeselected): Likewise. (fireMenuCanceled): Likewise. (setAccelerator): Changed to throw an error if this method is used. (doClick): Implemented. (JMenu.ActionChangedListener): New inner class to handle PropertyChangeEvents occuring in the actions associated with menu. * javax/swing/plaf/basic/BasicMenuUI.java: Added javadoc. (BasicMenuUI): Added PropertyChangeListener to the menu. (createChangeListener): Implemented. (createMenuDragMouseListener): Likewise. (createMenuKeyListener): Likewise. (createPropertyChangeListener): Likewise. (uninstallListeners): Likewise. (BasicMenuUI.MouseInputHandler): Reimplemented. (BasicMenuUI.PropertyChangeHandler): New class. Not implemented yet. (BasicMenuUI.ChangeHandler): Likewise. (BasicMenuUI.MenuDragMouseHandler): Likewise. (BasicMenuUI.MenuKeyHandler): Likewise. 2004-06-10 David Jee <djee@redhat.com> * java/awt/MediaTracker.java (imageUpdate): Only do notifyAll() if the image is complete. 2004-06-10 Olga Rodimina <rodimina@redhat.com> * javax/swing/JApplet.java: (getJMenuBar): Made public. (setJMenuBar): Likewise. * javax/swing/JFrame.java: (getJMenuBar): Made public. (setJMenuBar): Likewise. * javax/swing/JWindow.java: (getJMenuBar): Removed. (setJMenuBar): Removed. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/JEditorPane.java (createEditorKitForContentType): Fixed visibility. (fireHyperlinkUpdate): Likewise. (getContentType): Likewise. (getEditorKit): Likewise. (getEditorKitForContentType): Likewise. (getPage): Likewise. (read): Likewise. (registerEditorKitForContentTyoe): Likewise. (replaceSelection): Likewise. (setContentType): Likewise. (setEditorKit): Likewise. (setPage): Likewise. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/Timer.java (Timer): New constructor. * javax/swing/plaf/basic/BasicProgressBarUI.java (animationTimer): Don't initialize at construction. (startAnimationTimer): Added since tag. (stopAnimationTimer): Likewise. (installUI): Use new Timer constructor. * javax/swing/plaf/basic/BasicScrollBarUI.java (installUI): Likewise. * javax/swing/plaf/basic/BasicSliderUI.java (installUI): Likewise. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/ButtonGroup.java (serialVersionUID): Made private. (buttons): Renamed from v, added javadoc. (sel): Added javadoc. (ButtonGroup): Likewise. (add): Likewise. (remove): Likewise. (getElements): Likewise. (getSelection): Likewise. (setSelected): Likewise. (isSelected): Likewise. (getButtonCount): Likewise. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/ButtonGroup.java, javax/swing/ImageIcon.java, javax/swing/JEditorPane.java, javax/swing/JRootPane.java, javax/swing/JTextField.java, javax/swing/LookAndFeel.java, javax/swing/plaf/basic/BasicTextUI.java: Reindented. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/text/Style.java: Added javadocs. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/JComponent.java (fireVetoableChange): Removed redundant cast. * javax/swing/JLabel.java (getDisabledIcon): Save icon for next call. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/KeyStroke.java (getKeyStroke(char,boolean)): Marked deprecated. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/DefaultCellEditor.java, javax/swing/GrayFilter.java, javax/swing/event/DocumentEvent.java, javax/swing/text/JTextComponent.java, javax/swing/text/MutableAttributeSet.java: Reindented. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/BorderUIResource.java: Added serialVersionUID all over. 2004-06-10 Sascha Brawer <brawer@dandelis.ch> * javax/swing/undo/UndoManager.java: Re-written from scratch. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/table/DefaultTableCellRenderer.java (noFocusBorder): Initialize directly. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicArrowButton.java (setDirection): Use method argument. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/BorderUIResource.java, javax/swing/plaf/ComponentUI.java, javax/swing/undo/CompoundEdit.java, javax/swing/undo/StateEdit.java: Fixed javadocs all over. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/DefaultButtonModel.java (ARMED): Made public final, fixed value. (ENABLED): Likewise. (PRESSED): Likewise. (ROLLOVER): Likewise. (SELECTED): Likewise. (stateMask): Initialize directly. (listenerList): Likewise. (mnemonic): Likewise. (fireStateChanged): Removed argument, use changeEvent as event. All places where this method is called are fixed too. (getActionCommant): Fixed javadoc. (setGroup): Fixed javadoc. (getGroup): New method. 2004-06-09 Olga Rodimina <rodimina@redhat.com> * javax/swing/AbstractButton.java (AbstractButton): Use init() to initialize the button. (init): New Method. Initializes AbstractButton. * javax/swing/JMenuItem.java: Documented. (JMenuItem): Reimplemented. (init): Implemented. (setEnabled): Changed to call super.setEnabled() (processMouseEvent): Reimplemented. (fireMenuKeyPressed): Implemented. (fireMenuKeyReleased): Implemented. (fireMenuKeyTyped): Implemented. (menuSelectionChanged): disarm the model if the menu item was deselected. * javax/swing/plaf/basic/BasicMenuItemUI.java:Documented. (getPath): Change to use ArrayList instead of Vector. (getPreferredSize): Renamed variable. (paintMenuItem): Paint margin area of menu item. (MouseInputHandler.mouseEntered): Set selection in MenuSelectionManager. (MouseInputHandler.mouseReleased): Check if mouse was pressed inside menu item's bounds before clearing the selection. 2004-06-09 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkTextComponentPeer.java (GtkTextComponentPeer): Set caret position to 0. * java/awt/TextComponent.java (setText): Set caret position to 0. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilter): Handle GtkScrolledWindow separately. Fix signal handler blocking. (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter): Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c (Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create): Make cursor visible. 2004-06-09 Kim Ho <kho@redhat.com> * Makefile.am: New files * Makefile.in: Regenerated * java/awt/Container.java (getComponentAt): Removed. * javax/swing/AbstractAction.java (ENABLED_PROPERTY): New property. (putValue): Fire PropertyChangeEvents. (setEnabled): ditto. (firePropertyChange): Javadoc and implement convenience method. * javax/swing/AbstractButton.java (setAction): Don't create PropertyChangeListener if new Action is null. (setIcon): Don't set icon till after comparing it. (configurePropertiesFromAction): Check mnemonic key before calling intValue(). (createActionPropertyChangeListener): Check properties rather than bulk change. * javax/swing/DefaultDesktopManager.java: Implement. * javax/swing/DesktopManager.java: Jalopy and javadoc. * javax/swing/JComponent.java (fireVetoableChange): Implement. (paintImmediately): Use root component. * javax/swing/JDesktopPane.java: Implement * javax/swing/JInternalFrame.java: Implement * javax/swing/JLabel.java (getDisabledIcon): Return grayscaled icon if no disabled icon specified. * javax/swing/JMenuBar.java (getComponentAtIndex): Use getComponent * javax/swing/JOptionPane.java (getDesktopPaneForComponent): Use SwingUtilities' getAncestorOfClass (getFrameForComponent): ditto. * javax/swing/JSplitPane.java (remove): Use getComponent. * javax/swing/SwingUtilities.java (convertPoint): Implement. * javax/swing/plaf/basic/BasicButtonUI.java (paintButtonNormal): Check opaqueness before filling background. * javax/swing/plaf/basic/BasicDesktopIconUI.java: Implement * javax/swing/plaf/basic/BasicDesktopPaneUI.java: Implement. * javax/swing/plaf/basic/BasicInternalFrameTitlePane.java: Implement. * javax/swing/plaf/basic/BasicInternalFrameUI.java: Implement. * javax/swing/plaf/basic/BasicLookAndFeel.java: Change InternalFrame and Desktop colors. 2004-06-09 David Jee <djee@redhat.com> * java/awt/Container.java (remove): Do not set component to invisible. 2004-06-09 Michael Koch <konqueror@gmx.de> * javax/swing/tree/DefaultMutableTreeNode.java (getLeafCount): Renamed enum to e. 2004-06-09 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicSplitPaneDivider.java (positionForMouseEvent): Removed redundant semicolon. (continueDrag): Use method arguments. 2004-06-09 Michael Koch <konqueror@gmx.de> * javax/swing/border/TitledBorder.java, javax/swing/filechooser/FileSystemView.java, javax/swing/plaf/basic/BasicButtonListener.java, javax/swing/plaf/basic/BasicGraphicsUtils.java, javax/swing/plaf/basic/BasicLabelUI.java, javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java, javax/swing/plaf/basic/BasicScrollBarUI.java, javax/swing/plaf/basic/BasicScrollPaneUI.java, javax/swing/plaf/basic/BasicSliderUI.java, javax/swing/plaf/basic/BasicTabbedPaneUI.java, javax/swing/plaf/basic/BasicToggleButtonUI.java, javax/swing/table/JTableHeader.java, javax/swing/text/AbstractDocument.java, javax/swing/text/DefaultCaret.java, javax/swing/text/StyledEditorKit.java, javax/swing/tree/DefaultTreeCellEditor.java: Reworked import statements. 2004-06-08 Graydon Hoare <graydon@redhat.com> * javax/swing/Box.java: Temporarily comment out code broken due to visibility bug. 2004-06-09 Michael Koch <konqueror@gmx.de> * javax/swing/ImageIcon.java (ImageIcon): Added missing constructor. 2004-06-08 Michael Koch <konqueror@gmx.de> * javax/swing/JToggleButton.java (JToggleButton): New constructor. (getAccessibleContext): Moved documentation into javadoc. (getUIClassID): Likewise. 2004-06-08 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractButton.java (getDisabledIcon): Create disabled icon if none exists yet. 2004-06-08 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicLookAndFeel.java (initClassDefaults): Added FormattedTextFieldUI. (loadResourceBundle): Renamed enum to e. 2004-06-08 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicButtonUI.java (paintIcon): Simplified. (paintText): Paint disabled button correctly. 2004-06-08 Michael Koch <konqueror@gmx.de> * javax/swing/JComponent.java (createToolTip): Use official JToolTip API. 2004-06-08 Michael Koch <konqueror@gmx.de> * javax/swing/JToolTip.java (JToolTip): No arguments in API. (setTipText): New method. 2004-06-08 Michael Koch <konqueror@gmx.de> * javax/swing/SwingUtilities.java (isLeftMouseButton): New method. (isMiddleMouseButton): New method. (isRightMouseButton): New method. 2004-06-08 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractButton.java, javax/swing/CellRendererPane.java, javax/swing/JCheckBoxMenuItem.java, javax/swing/JColorChooser.java, javax/swing/JComboBox.java, javax/swing/JComponent.java, javax/swing/JDesktopPane.java, javax/swing/JFileChooser.java, javax/swing/JMenu.java, javax/swing/JMenuItem.java, javax/swing/JOptionPane.java, javax/swing/JPasswordField.java, javax/swing/JPopupMenu.java, javax/swing/JProgressBar.java, javax/swing/JRadioButtonMenuItem.java, javax/swing/JScrollBar.java, javax/swing/JSeparator.java, javax/swing/JSlider.java, javax/swing/JSplitPane.java, javax/swing/JTabbedPane.java, javax/swing/JTextField.java, javax/swing/JToolBar.java, javax/swing/text/JTextComponent.java: Fixed all constructors of accessibility classes. 2004-06-08 Michael Koch <konqueror@gmx.de> * javax/swing/ScrollPaneLayout.java: Renamed all memeber variables all over. 2004-06-08 Michael Koch <konqueror@gmx.de> * javax/swing/Box.java (AccessibleBoxFiller): Extends AccessibleAWTComponent. (AccessibleBoxFiller.serialVersionUID): New member variable. * javax/swing/DefaultButtonModel.java (stateMask): Made protected. (listenerList): Likewise. (changeEvent): Likewise. (group): Likewise. (mnemonic): Likewise. (actionCommand): Likewise. (getListeners): New method. (getActionListeners): New method. (getItemListeners): New method. (getChangeListeners): New method. (fireItemStateChanged): Simplified. (fireActionPerformed): Simplified. (fireStateChanged): Simplified. * javax/swing/JFrame.java (JFrame): Implements WindowContants. (HIDE_ON_CLOSE): Removed. (EXIT_ON_CLOSE): Removed. (DISPOSE_ON_CLOSE): Removed. (DO_NOTHING_ON_CLOSE): Removed. (processWindowEvent): Exit with code 0. (setDefaultCloseOperation): Do security check before setting value. * javax/swing/JOptionPane.java (message): Initialize only in constructor. * javax/swing/JToolTip.java: Removed unused imports. * javax/swing/JViewport.java (serialVersionUID): New member variable. (SIMPLE_SCROLL_MODE): Made final, fixed value. (BLIT_SCROLL_MODE): Likewise. (BACKINGSTORE_SCROLL_MODE): Likewise. (scrollUnderway): Made protected. (isViewSizeSet): Likewise. * javax/swing/ListModel.java: Fixed javadoc. * javax/swing/Popup.java: Likewise. * javax/swing/RepaintManager.java (paintDirtyRegions): Don't use internal classes of java.util.AbstractMap. * javax/swing/ScrollPaneConstants.java: Reindented. * javax/swing/ScrollPaneLayout.java (viewport): Made protected. (verticalScrollBar): Made protected, renamed to vsb. (horizontalScrollBar): Made protected, renamed to hsb. (rowHeader): Made protected, renamed to rowHead. (columnHeader): Made protected, renamed to colHead. (lowerLeft): Made protected. (lowerRight): Made protected. (upperLeft): Made protected. (upperRight): Made protected. (verticalScrollBarPolicy): Made protected, renamed to vsbPolicy. (horizontalScrollBarPolicy): Made protected, renamed to hsbPolicy. 2004-06-07 Bernd Schmidt <bernds@btinternet.com> * java/awt/MediaTracker.java (imageUpdate): Only set status to LOADING if flags has SOMEBITS set. 2004-06-07 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractButton.java: Reorganized imports. * javax/swing/ActionMap.java: Likewise. * javax/swing/DefaultButtonModel.java: Likewise. * javax/swing/DefaultListModel.java: Likewise. * javax/swing/ImageIcon.java: Likewise. (serialVersionUID): New member variable. * javax/swing/JComboBox.java: Reorganized imports. * javax/swing/JComponent.java: Likewise. (ui): Made protected. (listenerList): Made protected. (TOOL_TIP_TEXT_KEY): New constant. (scrollRectToVisible): Removed redundant null check. * javax/swing/JFrame.java: Reorganized imports. * javax/swing/JInternalFrame.java: Reorganized imports. * javax/swing/JProgressBar.java: Likewise. * javax/swing/JRootPane.java: Likewise. * javax/swing/JScrollBar.java: Likewise. * javax/swing/JSeparator.java: Likewise. * javax/swing/JSlider.java: Likewise. * javax/swing/JTabbedPane.java: Likewise. * javax/swing/JTextField.java: Likewise. * javax/swing/JToolBar.java: Likewise. * javax/swing/JTree.java: Likewise. * javax/swing/JViewport.java: Likewise. * javax/swing/JWindow.java: Likewise. * javax/swing/KeyStroke.java: Likewise. * javax/swing/LookAndFeel.java: Likewise. * javax/swing/MenuSelectionManager.java: Likewise. * javax/swing/SwingUtilities.java: Likewise. * javax/swing/Timer.java: Likewise. * javax/swing/DefaultBoundedRangeModel.java: Fixed javadoc. * javax/swing/JList.java (HORIZONTAL_WRAP): Made final, fixed value. (VERTICAL): Likewise. (VERTICAL_WRAP): Likewise. 2004-06-07 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractButton.java (serialVersionUID): New member variable. (AccessibleAbstractButton.serialVersionUID): Likewise. (AbstractButton): Made public. * javax/swing/Box.java (AccessibleBox.serialVersionUID): New member variable. (Filler.serialVersionUID): Likewise. * javax/swing/DefaultListSelectionModel.java (serialVersionUID): Likewise. * javax/swing/JApplet.java (serialVersionUID): Likewise. * javax/swing/JCheckBox.java (serialVersionUID): Likewise. * javax/swing/JCheckBoxMenuItem.java (serialVersionUID): Likewise. (AccessibleJCheckBoxMenuItem.serialVersionUID): Likewise. * javax/swing/JColorChooser.java (serialVersionUID): Likewise. (AccessibleJColorChooser.serialVersionUID): Likewise. * javax/swing/JComponent.java (serialVersionUID): Made private. (AccessibleJComponent.serialVersionUID): New member variable. * javax/swing/JDesktopPane.java (serialVersionUID): Likewise. * javax/swing/JDialog.java (serialVersionUID): Likewise. * javax/swing/JFormattedTextField.java (serialVersionUID): Fixed value. * javax/swing/JFrame.java (serialVersionUID): New member variable. (getDefaultCloseOpertation): Made public. * javax/swing/JLayeredPane.java (serialVersionUID): Likewise. (LAYER_PROPERTY): Made final, fixed value. (JLayeredPane): Made public. * javax/swing/JMenu.java (AccessibleJMenu.serialVersionUID): New member variable. (WinListener.serialVersionUID): Likewise. * javax/swing/JMenuBar.java (serialVersionUID): Likewise. (getComponentAtIndex): Added @deprecated tag. * javax/swing/JMenuItem.java (serialVersionUID): New member variable. (AccessibleJMenuItem.serialVersionUID): Likewise. * javax/swing/JOptionPane.java (serialVersionUID): Likewise. (AccessibleJOptionPane.serialVersionUID): Likewise. * javax/swing/JPopupMenu.java (serialVersionUID): Likewise. (AccessibleJPopupMenu.serialVersionUID): Likewise. (getPopupMenuListeners): New method. (getComponentAtIndex): Added @deprecated tag. * javax/swing/JProgressBar.java (serialVersionUID): New member variable. (AccessibleJProgressBar.serialVersionUID): Likewise. * javax/swing/JRadioButton.java (serialVersionUID): Likewise. * javax/swing/JRadioButtonMenuItem.java (serialVersionUID): Likewise. (AccessibleJRadioButtonMenuItem.serialVersionUID): Likewise. * javax/swing/JScrollBar.java (serialVersionUID): Likewise. (AccessibleJScrollBar.serialVersionUID): Likewise. * javax/swing/JSeparator.java (serialVersionUID): Likewise. (AccessibleJSeparator.serialVersionUID): Likewise. * javax/swing/JSlider.java: Fixed javadocs. (AccessibleJSlider.serialVersionUID): New member variable. * javax/swing/JSplitPane.java: Added copyright statement. (serialVersionUID): New member variable. (AccessibleJSplitPane.serialVersionUID): Likewise. * javax/swing/JTabbedPane.java (serialVersionUID): Likewise. (AccessibleJTabbedPane.serialVersionUID): Likewise. (ModelListener.serialVersionUID): Likewise. (ModelListener.ModelListener): New constructor. (SCROLL_TAB_LAYOUT): Made public final, fixed value. (WRAP_TAB_LAYOUT): Likewise. * javax/swing/JTable.java (serialVersionUID): New member variable. * javax/swing/JToggleButton.java (serialVersionUID): Likewise. (ToggleButtonModel): Made static. (ToggleButtonModel.serialVersionUID): New member variable. * javax/swing/JToolTip.java (serialVersionUID): Likewise. * javax/swing/JTree.java (serialVersionUID): Likewise. * javax/swing/JWindow.java (serialVersionUID): Likewise. * javax/swing/Timer.java (serialVersionUID): Likewise. 2004-06-06 Michael Koch <konqueror@gmx.de> * javax/swing/SwingConstants.java (NEXT): New constant. (PREVIOUS): Likewise. * javax/swing/UIManager.java (LookAndFeel): Made public. (LookAndFeel.getClassName): Likewise. (LookAndFeel.getName): Likewise. 2004-06-02 Olga Rodimina <rodimina@redhat.com> * javax/swing/JCheckBoxMenuItem.java: Removed CVS tags. * javax/swing/JMenu.java: Likewise. * javax/swing/JMenuBar.java: Likewise. * javax/swing/JMenuItem.java: Likewise. * javax/swing/JPopupMenu.java: Likewise. * javax/swing/JRadioButtonMenuItem.java: Likewise. * javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java:Likewise. * javax/swing/plaf/basic/BasicMenuBarUI.java: Likewise. * javax/swing/plaf/basic/BasicMenuItemUI.java: Likewise. * javax/swing/plaf/basic/BasicMenuUI.java: Likewise. * javax/swing/plaf/basic/BasicPopupMenuUI.java: Likewise. * javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java: Likewise. 2004-05-31 Olga Rodimina <rodimina@redhat.com> * javax/swing/plaf/basic/BasicMenuUI.java: (MouseEntered): Do not call getPath() from MenuSelectionManager. Call getPath() from super class instead. 2004-05-31 David Jee <djee@redhat.com> * java/awt/Container.java (remove): Set component visibility to false after removing it. 2004-05-27 Thomas Fitzsimmons <fitzsim@redhat.com> * java/awt/Component.java (getForeground): Return SystemColor if parent is null. (getBackground): Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c (item_highlighted): New function. (connectSignals): Set item_highlighted as list's select function. * java/applet/Applet.java: Revert changes from 2004-04-29, 2004-03-15 and 2004-03-14. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (drawString): Divide baseline y coordinate by PANGO_SCALE, not DPI conversion factor. * gnu/java/awt/peer/gtk/GtkTextAreaPeer.java (create): Set "Dialog" as the default font. * gnu/java/awt/peer/gtk/GtkTextFieldPeer.java (create): Likewise. * java/awt/Component.java (getFont): Return "Dialog" font by default. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c: Multiply size argument to pango_font_description_set_size by the DPI conversion factor rather than by PANGO_SCALE. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (drawString): Divide baseline y coordinate by DPI conversion factor rather than by PANGO_SCALE. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c (area_prepared): Fix typo. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c (gtkSetFont): Move gtk_bin_get_child inside GDK critical region. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (dpi_conversion_factor): New global variable. (init_dpi_conversion_factor): New function to calculate and track DPI conversion factor. (dpi_changed_cb): New callback. * jni/gtk-peer/gtkpeer.h (dpi_conversion_factor): Declare. 2004-05-27 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java (getGraphics): Return a new GdkGraphics instance. * gnu/java/awt/peer/gtk/GtkContainerPeer.java (getGraphics): Call super.getGraphics(). 2004-05-26 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (setNativeBounds): Clamp width and height values to >= 0. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (find_fg_color_widget): Handle GtkOptionMenu specially. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (pre_event_handler): Only post configure events to visible top-level windows. 2004-05-26 David Jee <djee@redhat.com> * java/awt/BorderLayout.java (layoutContainer): Fix size calculations. 2004-05-26 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (window_wm_protocols_filter): Remove function. (create): Remove filter that removes WM_TAKE_FOCUS client messages. From-SVN: r83324
1398 lines
40 KiB
Java
1398 lines
40 KiB
Java
/* JOptionPane.java
|
|
Copyright (C) 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.awt.Component;
|
|
import java.awt.Dialog;
|
|
import java.awt.Frame;
|
|
import javax.accessibility.Accessible;
|
|
import javax.accessibility.AccessibleContext;
|
|
import javax.accessibility.AccessibleRole;
|
|
import javax.swing.Icon;
|
|
import javax.swing.plaf.OptionPaneUI;
|
|
|
|
|
|
/**
|
|
* This class creates different types of JDialogs and JInternalFrames that can
|
|
* ask users for input or pass on information. JOptionPane can be used by
|
|
* calling one of the show static methods or by creating an instance of
|
|
* JOptionPane and calling createDialog or createInternalFrame.
|
|
*/
|
|
public class JOptionPane extends JComponent implements Accessible
|
|
{
|
|
/**
|
|
* DOCUMENT ME!
|
|
*/
|
|
protected class AccessibleJOptionPane extends JComponent.AccessibleJComponent
|
|
{
|
|
private static final long serialVersionUID = 686071432213084821L;
|
|
|
|
/**
|
|
* Creates a new AccessibleJOptionPane object.
|
|
*/
|
|
protected AccessibleJOptionPane()
|
|
{
|
|
}
|
|
|
|
/**
|
|
* DOCUMENT ME!
|
|
*
|
|
* @return DOCUMENT ME!
|
|
*/
|
|
public AccessibleRole getAccessibleRole()
|
|
{
|
|
return null;
|
|
}
|
|
}
|
|
|
|
private static final long serialVersionUID = 5231143276678566796L;
|
|
|
|
/** The value returned when cancel option is selected. */
|
|
public static final int CANCEL_OPTION = 2;
|
|
|
|
/** The value returned when the dialog is closed without a selection. */
|
|
public static final int CLOSED_OPTION = -1;
|
|
|
|
/** An option used in confirmation dialog methods. */
|
|
public static final int DEFAULT_OPTION = -1;
|
|
|
|
/** The value returned when the no option is selected. */
|
|
public static final int NO_OPTION = 1;
|
|
|
|
/** An option used in confirmation dialog methods. */
|
|
public static final int OK_CANCEL_OPTION = 2;
|
|
|
|
/** The value returned when the ok option is selected. */
|
|
public static final int OK_OPTION = 0;
|
|
|
|
/** An option used in confirmation dialog methods. */
|
|
public static final int YES_NO_CANCEL_OPTION = 1;
|
|
|
|
/** An option used in confirmation dialog methods. */
|
|
public static final int YES_NO_OPTION = 0;
|
|
|
|
/** The value returned when the yes option is selected. */
|
|
public static final int YES_OPTION = 0;
|
|
|
|
/** Identifier for the error message type. */
|
|
public static final int ERROR_MESSAGE = 0;
|
|
|
|
/** Identifier for the information message type. */
|
|
public static final int INFORMATION_MESSAGE = 1;
|
|
|
|
/** Identifier for the plain message type. */
|
|
public static final int PLAIN_MESSAGE = -1;
|
|
|
|
/** Identifier for the question message type. */
|
|
public static final int QUESTION_MESSAGE = 3;
|
|
|
|
/** Identifier for the warning message type. */
|
|
public static final int WARNING_MESSAGE = 2;
|
|
|
|
/**
|
|
* The identifier for the propertyChangeEvent when the icon property
|
|
* changes.
|
|
*/
|
|
public static final String ICON_PROPERTY = "icon";
|
|
|
|
/**
|
|
* The identifier for the propertyChangeEvent when the initialSelectionValue
|
|
* property changes.
|
|
*/
|
|
public static final String INITIAL_SELECTION_VALUE_PROPERTY = "initialSelectionValue";
|
|
|
|
/**
|
|
* The identifier for the propertyChangeEvent when the initialValue property
|
|
* changes.
|
|
*/
|
|
public static final String INITIAL_VALUE_PROPERTY = "initialValue";
|
|
|
|
/**
|
|
* The identifier for the propertyChangeEvent when the inputValue property
|
|
* changes.
|
|
*/
|
|
public static final String INPUT_VALUE_PROPERTY = "inputValue";
|
|
|
|
/**
|
|
* The identifier for the propertyChangeEvent when the message property
|
|
* changes.
|
|
*/
|
|
public static final String MESSAGE_PROPERTY = "message";
|
|
|
|
/**
|
|
* The identifier for the propertyChangeEvent when the messageType property
|
|
* changes.
|
|
*/
|
|
public static final String MESSAGE_TYPE_PROPERTY = "messageType";
|
|
|
|
/**
|
|
* The identifier for the propertyChangeEvent when the optionType property
|
|
* changes.
|
|
*/
|
|
public static final String OPTION_TYPE_PROPERTY = "optionType";
|
|
|
|
/**
|
|
* The identifier for the propertyChangeEvent when the options property
|
|
* changes.
|
|
*/
|
|
public static final String OPTIONS_PROPERTY = "options";
|
|
|
|
/**
|
|
* The identifier for the propertyChangeEvent when the selectionValues
|
|
* property changes.
|
|
*/
|
|
public static final String SELECTION_VALUES_PROPERTY = "selectionValues";
|
|
|
|
/**
|
|
* The identifier for the propertyChangeEvent when the value property
|
|
* changes.
|
|
*/
|
|
public static final String VALUE_PROPERTY = "value";
|
|
|
|
/**
|
|
* The identifier for the propertyChangeEvent when the wantsInput property
|
|
* changes.
|
|
*/
|
|
public static final String WANTS_INPUT_PROPERTY = "wantsInput";
|
|
|
|
/** The value returned when the inputValue is uninitialized. */
|
|
public static Object UNINITIALIZED_VALUE = "uninitializedValue";
|
|
|
|
/** The icon displayed in the dialog/internal frame. */
|
|
protected Icon icon;
|
|
|
|
/** The initial selected value in the input component. */
|
|
protected Object initialSelectionValue;
|
|
|
|
/** The object that is initially selected for options. */
|
|
protected Object initialValue;
|
|
|
|
/** The value the user inputs. */
|
|
protected Object inputValue = UNINITIALIZED_VALUE;
|
|
|
|
/** The message displayed in the dialog/internal frame. */
|
|
protected Object message;
|
|
|
|
/** The type of message displayed. */
|
|
protected int messageType = PLAIN_MESSAGE;
|
|
|
|
/**
|
|
* The options (usually buttons) aligned at the bottom for the user to
|
|
* select.
|
|
*/
|
|
protected Object[] options;
|
|
|
|
/** The type of options to display. */
|
|
protected int optionType = DEFAULT_OPTION;
|
|
|
|
/** The input values the user can select. */
|
|
protected Object[] selectionValues;
|
|
|
|
/** The value returned by selecting an option. */
|
|
protected Object value = UNINITIALIZED_VALUE;
|
|
|
|
/** Whether the Dialog/InternalFrame needs input. */
|
|
protected boolean wantsInput;
|
|
|
|
/** The common frame used when no parent is provided. */
|
|
private static Frame privFrame = SwingUtilities.getOwnerFrame();
|
|
|
|
/**
|
|
* Creates a new JOptionPane object using a message of "JOptionPane
|
|
* message", using the PLAIN_MESSAGE type and DEFAULT_OPTION.
|
|
*/
|
|
public JOptionPane()
|
|
{
|
|
this("JOptionPane message", PLAIN_MESSAGE, DEFAULT_OPTION, null, null, null);
|
|
}
|
|
|
|
/**
|
|
* Creates a new JOptionPane object using the given message using the
|
|
* PLAIN_MESSAGE type and DEFAULT_OPTION.
|
|
*
|
|
* @param message The message to display.
|
|
*/
|
|
public JOptionPane(Object message)
|
|
{
|
|
this(message, PLAIN_MESSAGE, DEFAULT_OPTION, null, null, null);
|
|
}
|
|
|
|
/**
|
|
* Creates a new JOptionPane object using the given message and messageType
|
|
* and DEFAULT_OPTION.
|
|
*
|
|
* @param message The message to display.
|
|
* @param messageType The type of message.
|
|
*/
|
|
public JOptionPane(Object message, int messageType)
|
|
{
|
|
this(message, messageType, DEFAULT_OPTION, null, null, null);
|
|
}
|
|
|
|
/**
|
|
* Creates a new JOptionPane object using the given message, messageType and
|
|
* optionType.
|
|
*
|
|
* @param message The message to display.
|
|
* @param messageType The type of message.
|
|
* @param optionType The type of options.
|
|
*/
|
|
public JOptionPane(Object message, int messageType, int optionType)
|
|
{
|
|
this(message, messageType, optionType, null, null, null);
|
|
}
|
|
|
|
/**
|
|
* Creates a new JOptionPane object using the given message, messageType,
|
|
* optionType and icon.
|
|
*
|
|
* @param message The message to display.
|
|
* @param messageType The type of message.
|
|
* @param optionType The type of options.
|
|
* @param icon The icon to display.
|
|
*/
|
|
public JOptionPane(Object message, int messageType, int optionType, Icon icon)
|
|
{
|
|
this(message, messageType, optionType, icon, null, null);
|
|
}
|
|
|
|
/**
|
|
* Creates a new JOptionPane object using the given message, messageType,
|
|
* optionType, icon and options.
|
|
*
|
|
* @param message The message to display.
|
|
* @param messageType The type of message.
|
|
* @param optionType The type of options.
|
|
* @param icon The icon to display.
|
|
* @param options The options given.
|
|
*/
|
|
public JOptionPane(Object message, int messageType, int optionType,
|
|
Icon icon, Object[] options)
|
|
{
|
|
this(message, messageType, optionType, icon, options, null);
|
|
}
|
|
|
|
/**
|
|
* Creates a new JOptionPane object using the given message, messageType,
|
|
* optionType, icon, options and initialValue. The initialValue will be
|
|
* focused initially.
|
|
*
|
|
* @param message The message to display.
|
|
* @param messageType The type of message.
|
|
* @param optionType The type of options.
|
|
* @param icon The icon to display.
|
|
* @param options The options given.
|
|
* @param initialValue The component to focus on initially.
|
|
*
|
|
* @throws IllegalArgumentException If the messageType or optionType are not
|
|
* legal values.
|
|
*/
|
|
public JOptionPane(Object message, int messageType, int optionType,
|
|
Icon icon, Object[] options, Object initialValue)
|
|
{
|
|
this.message = message;
|
|
if (! validMessageType(messageType))
|
|
throw new IllegalArgumentException("Message Type not legal value.");
|
|
this.messageType = messageType;
|
|
if (! validOptionType(optionType))
|
|
throw new IllegalArgumentException("Option Type not legal value.");
|
|
this.optionType = optionType;
|
|
this.icon = icon;
|
|
this.options = options;
|
|
this.initialValue = initialValue;
|
|
|
|
setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
|
|
|
|
updateUI();
|
|
invalidate();
|
|
repaint();
|
|
}
|
|
|
|
/**
|
|
* This method creates a new JDialog that is either centered around the
|
|
* parent's frame or centered on the screen (if the parent is null). The
|
|
* JDialog will not be resizable and will be modal. Once the JDialog is
|
|
* disposed, the inputValue and value properties will be set by the
|
|
* optionPane.
|
|
*
|
|
* @param parentComponent The parent of the Dialog.
|
|
* @param title The title in the bar of the JDialog.
|
|
*
|
|
* @return A new JDialog based on the JOptionPane configuration.
|
|
*/
|
|
public JDialog createDialog(Component parentComponent, String title)
|
|
{
|
|
Frame toUse = getFrameForComponent(parentComponent);
|
|
if (toUse == null)
|
|
toUse = getRootFrame();
|
|
|
|
JDialog dialog = new JDialog(toUse, title);
|
|
inputValue = UNINITIALIZED_VALUE;
|
|
value = UNINITIALIZED_VALUE;
|
|
|
|
// FIXME: This dialog should be centered on the parent
|
|
// or at the center of the screen (if the parent is null)
|
|
// Need getGraphicsConfiguration to return non-null in
|
|
// order for that to work so we know how large the
|
|
// screen is.
|
|
dialog.getContentPane().add(this);
|
|
dialog.setModal(true);
|
|
dialog.setResizable(false);
|
|
|
|
return dialog;
|
|
}
|
|
|
|
/**
|
|
* This method creates a new JInternalFrame that is in the JDesktopPane
|
|
* which contains the parentComponent given. If no suitable JDesktopPane
|
|
* can be found from the parentComponent given, a RuntimeException will be
|
|
* thrown.
|
|
*
|
|
* @param parentComponent The parent to find a JDesktopPane from.
|
|
* @param title The title of the JInternalFrame.
|
|
*
|
|
* @return A new JInternalFrame based on the JOptionPane configuration.
|
|
*
|
|
* @throws RuntimeException If no suitable JDesktopPane is found.
|
|
*/
|
|
public JInternalFrame createInternalFrame(Component parentComponent,
|
|
String title)
|
|
throws RuntimeException
|
|
{
|
|
// FIXME: implement.
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* DOCUMENT ME!
|
|
*
|
|
* @return DOCUMENT ME!
|
|
*/
|
|
public AccessibleContext getAccessibleContext()
|
|
{
|
|
if (accessibleContext == null)
|
|
accessibleContext = new AccessibleJOptionPane();
|
|
return accessibleContext;
|
|
}
|
|
|
|
/**
|
|
* This method returns the JDesktopPane for the given parentComponent or
|
|
* null if none can be found.
|
|
*
|
|
* @param parentComponent The component to look in.
|
|
*
|
|
* @return The JDesktopPane for the given component or null if none can be
|
|
* found.
|
|
*/
|
|
public static JDesktopPane getDesktopPaneForComponent(Component parentComponent)
|
|
{
|
|
return (JDesktopPane) SwingUtilities.getAncestorOfClass(JDesktopPane.class, parentComponent);
|
|
}
|
|
|
|
/**
|
|
* This method returns the Frame for the given parentComponent or null if
|
|
* none can be found.
|
|
*
|
|
* @param parentComponent The component to look in.
|
|
*
|
|
* @return The Frame for the given component or null if none can be found.
|
|
*/
|
|
public static Frame getFrameForComponent(Component parentComponent)
|
|
{
|
|
return (Frame) SwingUtilities.getAncestorOfClass(Frame.class, parentComponent);
|
|
}
|
|
|
|
/**
|
|
* This method returns the icon displayed.
|
|
*
|
|
* @return The icon displayed.
|
|
*/
|
|
public Icon getIcon()
|
|
{
|
|
return icon;
|
|
}
|
|
|
|
/**
|
|
* This method returns the value initially selected from the list of values
|
|
* the user can input.
|
|
*
|
|
* @return The initial selection value.
|
|
*/
|
|
public Object getInitialSelectionValue()
|
|
{
|
|
return initialSelectionValue;
|
|
}
|
|
|
|
/**
|
|
* This method returns the value that is focused from the list of options.
|
|
*
|
|
* @return The initial value from options.
|
|
*/
|
|
public Object getInitialValue()
|
|
{
|
|
return initialValue;
|
|
}
|
|
|
|
/**
|
|
* This method returns the value that the user input.
|
|
*
|
|
* @return The user's input value.
|
|
*/
|
|
public Object getInputValue()
|
|
{
|
|
return inputValue;
|
|
}
|
|
|
|
/**
|
|
* This method returns the maximum characters per line. By default, this is
|
|
* Integer.MAX_VALUE.
|
|
*
|
|
* @return The maximum characters per line.
|
|
*/
|
|
public int getMaxCharactersPerLineCount()
|
|
{
|
|
return Integer.MAX_VALUE;
|
|
}
|
|
|
|
/**
|
|
* This method returns the message displayed.
|
|
*
|
|
* @return The message displayed.
|
|
*/
|
|
public Object getMessage()
|
|
{
|
|
return message;
|
|
}
|
|
|
|
/**
|
|
* This method returns the message type.
|
|
*
|
|
* @return The message type.
|
|
*/
|
|
public int getMessageType()
|
|
{
|
|
return messageType;
|
|
}
|
|
|
|
/**
|
|
* This method returns the options.
|
|
*
|
|
* @return The options.
|
|
*/
|
|
public Object[] getOptions()
|
|
{
|
|
return options;
|
|
}
|
|
|
|
/**
|
|
* This method returns the option type.
|
|
*
|
|
* @return The option type.
|
|
*/
|
|
public int getOptionType()
|
|
{
|
|
return optionType;
|
|
}
|
|
|
|
/**
|
|
* This method returns the Frame used by JOptionPane dialog's that have no
|
|
* parent.
|
|
*
|
|
* @return The Frame used by dialogs that have no parent.
|
|
*/
|
|
public static Frame getRootFrame()
|
|
{
|
|
return privFrame;
|
|
}
|
|
|
|
/**
|
|
* This method returns the selection values.
|
|
*
|
|
* @return The selection values.
|
|
*/
|
|
public Object[] getSelectionValues()
|
|
{
|
|
return selectionValues;
|
|
}
|
|
|
|
/**
|
|
* This method returns the UI used by the JOptionPane.
|
|
*
|
|
* @return The UI used by the JOptionPane.
|
|
*/
|
|
public OptionPaneUI getUI()
|
|
{
|
|
return (OptionPaneUI) ui;
|
|
}
|
|
|
|
/**
|
|
* This method returns an identifier to determine which UI class will act as
|
|
* the UI.
|
|
*
|
|
* @return The UI identifier.
|
|
*/
|
|
public String getUIClassID()
|
|
{
|
|
return "OptionPaneUI";
|
|
}
|
|
|
|
/**
|
|
* This method returns the value that the user selected out of options.
|
|
*
|
|
* @return The value that the user selected out of options.
|
|
*/
|
|
public Object getValue()
|
|
{
|
|
return value;
|
|
}
|
|
|
|
/**
|
|
* This method returns whether this JOptionPane wants input.
|
|
*
|
|
* @return Whether this JOptionPane wants input.
|
|
*/
|
|
public boolean getWantsInput()
|
|
{
|
|
return wantsInput;
|
|
}
|
|
|
|
/**
|
|
* This method returns a String that describes this JOptionPane.
|
|
*
|
|
* @return A String that describes this JOptionPane.
|
|
*/
|
|
protected String paramString()
|
|
{
|
|
return "JOptionPane";
|
|
}
|
|
|
|
/**
|
|
* This method requests focus for the initial value.
|
|
*/
|
|
public void selectInitialValue()
|
|
{
|
|
if (ui != null)
|
|
((OptionPaneUI) ui).selectInitialValue(this);
|
|
}
|
|
|
|
/**
|
|
* This method changes the icon property.
|
|
*
|
|
* @param newIcon The new icon to use.
|
|
*/
|
|
public void setIcon(Icon newIcon)
|
|
{
|
|
if (icon != newIcon)
|
|
{
|
|
Icon old = icon;
|
|
icon = newIcon;
|
|
firePropertyChange(ICON_PROPERTY, old, icon);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method changes the initial selection property.
|
|
*
|
|
* @param newValue The new initial selection.
|
|
*/
|
|
public void setInitialSelectionValue(Object newValue)
|
|
{
|
|
if (initialSelectionValue != newValue)
|
|
{
|
|
Object old = initialSelectionValue;
|
|
initialSelectionValue = newValue;
|
|
firePropertyChange(INITIAL_SELECTION_VALUE_PROPERTY, old,
|
|
initialSelectionValue);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method changes the initial value property.
|
|
*
|
|
* @param newValue The new initial value.
|
|
*/
|
|
public void setInitialValue(Object newValue)
|
|
{
|
|
if (initialValue != newValue)
|
|
{
|
|
Object old = initialValue;
|
|
initialValue = newValue;
|
|
firePropertyChange(INITIAL_VALUE_PROPERTY, old, initialValue);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method changes the inputValue property.
|
|
*
|
|
* @param newValue The new inputValue.
|
|
*/
|
|
public void setInputValue(Object newValue)
|
|
{
|
|
if (inputValue != newValue)
|
|
{
|
|
Object old = inputValue;
|
|
inputValue = newValue;
|
|
firePropertyChange(INPUT_VALUE_PROPERTY, old, inputValue);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method changes the message property.
|
|
*
|
|
* @param newMessage The new message.
|
|
*/
|
|
public void setMessage(Object newMessage)
|
|
{
|
|
if (message != newMessage)
|
|
{
|
|
Object old = message;
|
|
message = newMessage;
|
|
firePropertyChange(MESSAGE_PROPERTY, old, message);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method changes the messageType property.
|
|
*
|
|
* @param newType The new messageType.
|
|
*
|
|
* @throws IllegalArgumentException If the messageType is not valid.
|
|
*/
|
|
public void setMessageType(int newType)
|
|
{
|
|
if (! validMessageType(newType))
|
|
throw new IllegalArgumentException("Message Type not legal value.");
|
|
if (newType != messageType)
|
|
{
|
|
int old = messageType;
|
|
messageType = newType;
|
|
firePropertyChange(MESSAGE_TYPE_PROPERTY, old, messageType);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method changes the options property.
|
|
*
|
|
* @param newOptions The new options.
|
|
*/
|
|
public void setOptions(Object[] newOptions)
|
|
{
|
|
if (options != newOptions)
|
|
{
|
|
Object[] old = options;
|
|
options = newOptions;
|
|
firePropertyChange(OPTIONS_PROPERTY, old, options);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method changes the optionType property.
|
|
*
|
|
* @param newType The new optionType.
|
|
*
|
|
* @throws IllegalArgumentException If the optionType is not valid.
|
|
*/
|
|
public void setOptionType(int newType)
|
|
{
|
|
if (! validOptionType(newType))
|
|
throw new IllegalArgumentException("Option Type not legal value.");
|
|
if (newType != optionType)
|
|
{
|
|
int old = optionType;
|
|
optionType = newType;
|
|
firePropertyChange(OPTION_TYPE_PROPERTY, old, optionType);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method changes the Frame used for JOptionPane dialogs that have no
|
|
* parent.
|
|
*
|
|
* @param newRootFrame The Frame to use for dialogs that have no parent.
|
|
*/
|
|
public static void setRootFrame(Frame newRootFrame)
|
|
{
|
|
privFrame = newRootFrame;
|
|
}
|
|
|
|
/**
|
|
* This method changes the selectionValues property.
|
|
*
|
|
* @param newValues The new selectionValues.
|
|
*/
|
|
public void setSelectionValues(Object[] newValues)
|
|
{
|
|
if (newValues != selectionValues)
|
|
{
|
|
if (newValues != null)
|
|
wantsInput = true;
|
|
Object[] old = selectionValues;
|
|
selectionValues = newValues;
|
|
firePropertyChange(SELECTION_VALUES_PROPERTY, old, selectionValues);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method sets the UI used with the JOptionPane.
|
|
*
|
|
* @param ui The UI used with the JOptionPane.
|
|
*/
|
|
public void setUI(OptionPaneUI ui)
|
|
{
|
|
super.setUI(ui);
|
|
}
|
|
|
|
/**
|
|
* This method sets the value has been selected out of options.
|
|
*
|
|
* @param newValue The value that has been selected out of options.
|
|
*/
|
|
public void setValue(Object newValue)
|
|
{
|
|
if (value != newValue)
|
|
{
|
|
Object old = value;
|
|
value = newValue;
|
|
firePropertyChange(VALUE_PROPERTY, old, value);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method changes the wantsInput property.
|
|
*
|
|
* @param newValue Whether this JOptionPane requires input.
|
|
*/
|
|
public void setWantsInput(boolean newValue)
|
|
{
|
|
if (wantsInput != newValue)
|
|
{
|
|
boolean old = wantsInput;
|
|
wantsInput = newValue;
|
|
firePropertyChange(WANTS_INPUT_PROPERTY, old, wantsInput);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method shows a confirmation dialog with the title "Select an Option"
|
|
* and displays the given message. The parent frame will be the same as the
|
|
* parent frame of the given parentComponent. This method returns the
|
|
* option chosen by the user.
|
|
*
|
|
* @param parentComponent The parentComponent to find a frame in.
|
|
* @param message The message to display.
|
|
*
|
|
* @return The option that was selected.
|
|
*/
|
|
public static int showConfirmDialog(Component parentComponent, Object message)
|
|
{
|
|
JOptionPane pane = new JOptionPane(message);
|
|
JDialog dialog = pane.createDialog(parentComponent, "Select an Option");
|
|
dialog.pack();
|
|
dialog.show();
|
|
|
|
return ((Integer) pane.getValue()).intValue();
|
|
}
|
|
|
|
/**
|
|
* This method shows a confirmation dialog with the given message,
|
|
* optionType and title. The frame that owns the dialog will be the same
|
|
* frame that holds the given parentComponent. This method returns the
|
|
* option that was chosen.
|
|
*
|
|
* @param parentComponent The component to find a frame in.
|
|
* @param message The message displayed.
|
|
* @param title The title of the dialog.
|
|
* @param optionType The optionType.
|
|
*
|
|
* @return The option that was chosen.
|
|
*/
|
|
public static int showConfirmDialog(Component parentComponent,
|
|
Object message, String title,
|
|
int optionType)
|
|
{
|
|
JOptionPane pane = new JOptionPane(message, PLAIN_MESSAGE, optionType);
|
|
JDialog dialog = pane.createDialog(parentComponent, title);
|
|
dialog.pack();
|
|
dialog.show();
|
|
|
|
return ((Integer) pane.getValue()).intValue();
|
|
}
|
|
|
|
/**
|
|
* This method shows a confirmation dialog with the given message, title,
|
|
* messageType and optionType. The frame owner will be the same frame as
|
|
* the one that holds the given parentComponent. This method returns the
|
|
* option selected by the user.
|
|
*
|
|
* @param parentComponent The component to find a frame in.
|
|
* @param message The message displayed.
|
|
* @param title The title of the dialog.
|
|
* @param optionType The optionType.
|
|
* @param messageType The messageType.
|
|
*
|
|
* @return The selected option.
|
|
*/
|
|
public static int showConfirmDialog(Component parentComponent,
|
|
Object message, String title,
|
|
int optionType, int messageType)
|
|
{
|
|
JOptionPane pane = new JOptionPane(message, messageType, optionType);
|
|
JDialog dialog = pane.createDialog(parentComponent, title);
|
|
dialog.pack();
|
|
dialog.show();
|
|
|
|
return ((Integer) pane.getValue()).intValue();
|
|
}
|
|
|
|
/**
|
|
* This method shows a confirmation dialog with the given message, title,
|
|
* optionType, messageType and icon. The frame owner will be the same as
|
|
* the one that holds the given parentComponent. This method returns the
|
|
* option selected by the user.
|
|
*
|
|
* @param parentComponent The component to find a frame in.
|
|
* @param message The message displayed.
|
|
* @param title The title of the dialog.
|
|
* @param optionType The optionType.
|
|
* @param messageType The messsageType.
|
|
* @param icon The icon displayed.
|
|
*
|
|
* @return The selected option.
|
|
*/
|
|
public static int showConfirmDialog(Component parentComponent,
|
|
Object message, String title,
|
|
int optionType, int messageType,
|
|
Icon icon)
|
|
{
|
|
JOptionPane pane = new JOptionPane(message, messageType, optionType, icon);
|
|
JDialog dialog = pane.createDialog(parentComponent, title);
|
|
dialog.pack();
|
|
dialog.show();
|
|
|
|
return ((Integer) pane.getValue()).intValue();
|
|
}
|
|
|
|
/**
|
|
* This method will show a QUESTION_MESSAGE input dialog with the given
|
|
* message. No selectionValues is set so the Look and Feel will usually
|
|
* give the user a TextField to fill out. The frame owner will be the same
|
|
* frame that holds the given parentComponent. This method will return the
|
|
* value entered by the user.
|
|
*
|
|
* @param parentComponent The component to find a frame in.
|
|
* @param message The message displayed.
|
|
*
|
|
* @return The value entered by the user.
|
|
*/
|
|
public static String showInputDialog(Component parentComponent,
|
|
Object message)
|
|
{
|
|
JOptionPane pane = new JOptionPane(message, QUESTION_MESSAGE);
|
|
pane.setWantsInput(true);
|
|
JDialog dialog = pane.createDialog(parentComponent, null);
|
|
dialog.pack();
|
|
dialog.show();
|
|
|
|
return (String) pane.getInputValue();
|
|
}
|
|
|
|
/**
|
|
* This method will show a QUESTION_MESSAGE type input dialog with the given
|
|
* message and initialSelectionValue. Since there is no selectionValues
|
|
* set, the Look and Feel will usually give a TextField to fill out. The
|
|
* frame owner will be the same as the one that holds the given
|
|
* parentComponent. This method will return the value entered by the user.
|
|
*
|
|
* @param parentComponent The component to find a frame in.
|
|
* @param message The message to display.
|
|
* @param initialSelectionValue The initially selected value.
|
|
*
|
|
* @return The value the user input.
|
|
*/
|
|
public static String showInputDialog(Component parentComponent,
|
|
Object message,
|
|
Object initialSelectionValue)
|
|
{
|
|
JOptionPane pane = new JOptionPane(message, QUESTION_MESSAGE);
|
|
pane.setInitialSelectionValue(initialSelectionValue);
|
|
pane.setWantsInput(true);
|
|
JDialog dialog = pane.createDialog(parentComponent, null);
|
|
dialog.pack();
|
|
dialog.show();
|
|
|
|
return (String) pane.getInputValue();
|
|
}
|
|
|
|
/**
|
|
* This method displays a new input dialog with the given message, title and
|
|
* messageType. Since no selectionValues value is given, the Look and Feel
|
|
* will usually give the user a TextField to input data to. This method
|
|
* returns the value the user inputs.
|
|
*
|
|
* @param parentComponent The component to find a frame in.
|
|
* @param message The message to display.
|
|
* @param title The title of the dialog.
|
|
* @param messageType The messageType.
|
|
*
|
|
* @return The value the user input.
|
|
*/
|
|
public static String showInputDialog(Component parentComponent,
|
|
Object message, String title,
|
|
int messageType)
|
|
{
|
|
JOptionPane pane = new JOptionPane(message, messageType);
|
|
pane.setWantsInput(true);
|
|
JDialog dialog = pane.createDialog(parentComponent, title);
|
|
dialog.pack();
|
|
dialog.show();
|
|
|
|
return (String) pane.getInputValue();
|
|
}
|
|
|
|
/**
|
|
* This method shows an input dialog with the given message, title,
|
|
* messageType, icon, selectionValues, and initialSelectionValue. This
|
|
* method returns the value that the user selects.
|
|
*
|
|
* @param parentComponent The component to find a frame in.
|
|
* @param message The message displayed.
|
|
* @param title The title of the dialog.
|
|
* @param messageType The messageType.
|
|
* @param icon The icon displayed.
|
|
* @param selectionValues The list of values to select from.
|
|
* @param initialSelectionValue The initially selected value.
|
|
*
|
|
* @return The user selected value.
|
|
*/
|
|
public static Object showInputDialog(Component parentComponent,
|
|
Object message, String title,
|
|
int messageType, Icon icon,
|
|
Object[] selectionValues,
|
|
Object initialSelectionValue)
|
|
{
|
|
JOptionPane pane = new JOptionPane(message, messageType);
|
|
pane.setWantsInput(true);
|
|
pane.setIcon(icon);
|
|
pane.setSelectionValues(selectionValues);
|
|
pane.setInitialSelectionValue(initialSelectionValue);
|
|
JDialog dialog = pane.createDialog(parentComponent, title);
|
|
dialog.pack();
|
|
dialog.show();
|
|
|
|
return (String) pane.getInputValue();
|
|
}
|
|
|
|
/**
|
|
* This method shows a QUESTION_MESSAGE type input dialog. Since no
|
|
* selectionValues is set, the Look and Feel will usually give the user a
|
|
* TextField to input data to. This method returns the value the user
|
|
* inputs.
|
|
*
|
|
* @param message The message to display.
|
|
*
|
|
* @return The user selected value.
|
|
*/
|
|
public static String showInputDialog(Object message)
|
|
{
|
|
JOptionPane pane = new JOptionPane(message, QUESTION_MESSAGE);
|
|
pane.setWantsInput(true);
|
|
JDialog dialog = pane.createDialog(null, null);
|
|
dialog.pack();
|
|
dialog.show();
|
|
|
|
return (String) pane.getInputValue();
|
|
}
|
|
|
|
/**
|
|
* This method shows a QUESTION_MESSAGE type input dialog. Since no
|
|
* selectionValues is set, the Look and Feel will usually give the user a
|
|
* TextField to input data to. The input component will be initialized with
|
|
* the initialSelectionValue. This method returns the value the user
|
|
* inputs.
|
|
*
|
|
* @param message The message to display.
|
|
* @param initialSelectionValue The initialSelectionValue.
|
|
*
|
|
* @return The user selected value.
|
|
*/
|
|
public static String showInputDialog(Object message,
|
|
Object initialSelectionValue)
|
|
{
|
|
JOptionPane pane = new JOptionPane(message, QUESTION_MESSAGE);
|
|
pane.setWantsInput(true);
|
|
pane.setInitialSelectionValue(initialSelectionValue);
|
|
JDialog dialog = pane.createDialog(null, null);
|
|
dialog.pack();
|
|
dialog.show();
|
|
|
|
return (String) pane.getInputValue();
|
|
}
|
|
|
|
/**
|
|
* DOCUMENT ME!
|
|
*
|
|
* @param parentComponent DOCUMENT ME!
|
|
* @param message DOCUMENT ME!
|
|
*
|
|
* @return DOCUMENT ME!
|
|
*/
|
|
public static int showInternalConfirmDialog(Component parentComponent,
|
|
Object message)
|
|
{
|
|
// FIXME: implement
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* DOCUMENT ME!
|
|
*
|
|
* @param parentComponent DOCUMENT ME!
|
|
* @param message DOCUMENT ME!
|
|
* @param title DOCUMENT ME!
|
|
* @param optionType DOCUMENT ME!
|
|
*
|
|
* @return DOCUMENT ME!
|
|
*/
|
|
public static int showInternalConfirmDialog(Component parentComponent,
|
|
Object message, String title,
|
|
int optionType)
|
|
{
|
|
// FIXME: implement
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* DOCUMENT ME!
|
|
*
|
|
* @param parentComponent DOCUMENT ME!
|
|
* @param message DOCUMENT ME!
|
|
* @param title DOCUMENT ME!
|
|
* @param optionType DOCUMENT ME!
|
|
* @param messageType DOCUMENT ME!
|
|
*
|
|
* @return DOCUMENT ME!
|
|
*/
|
|
public static int showInternalConfirmDialog(Component parentComponent,
|
|
Object message, String title,
|
|
int optionType, int messageType)
|
|
{
|
|
// FIXME: implement
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* DOCUMENT ME!
|
|
*
|
|
* @param parentComponent DOCUMENT ME!
|
|
* @param message DOCUMENT ME!
|
|
* @param title DOCUMENT ME!
|
|
* @param optionType DOCUMENT ME!
|
|
* @param messageType DOCUMENT ME!
|
|
* @param icon DOCUMENT ME!
|
|
*
|
|
* @return DOCUMENT ME!
|
|
*/
|
|
public static int showInternalConfirmDialog(Component parentComponent,
|
|
Object message, String title,
|
|
int optionType, int messageType,
|
|
Icon icon)
|
|
{
|
|
// FIXME: implement
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* DOCUMENT ME!
|
|
*
|
|
* @param parentComponent DOCUMENT ME!
|
|
* @param message DOCUMENT ME!
|
|
*
|
|
* @return DOCUMENT ME!
|
|
*/
|
|
public static String showInternalInputDialog(Component parentComponent,
|
|
Object message)
|
|
{
|
|
// FIXME: implement
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* DOCUMENT ME!
|
|
*
|
|
* @param parentComponent DOCUMENT ME!
|
|
* @param message DOCUMENT ME!
|
|
* @param title DOCUMENT ME!
|
|
* @param messageType DOCUMENT ME!
|
|
*
|
|
* @return DOCUMENT ME!
|
|
*/
|
|
public static String showInternalInputDialog(Component parentComponent,
|
|
Object message, String title,
|
|
int messageType)
|
|
{
|
|
// FIXME: implement
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* DOCUMENT ME!
|
|
*
|
|
* @param parentComponent DOCUMENT ME!
|
|
* @param message DOCUMENT ME!
|
|
* @param title DOCUMENT ME!
|
|
* @param messageType DOCUMENT ME!
|
|
* @param icon DOCUMENT ME!
|
|
* @param selectionValues DOCUMENT ME!
|
|
* @param initialSelectionValue DOCUMENT ME!
|
|
*
|
|
* @return DOCUMENT ME!
|
|
*/
|
|
public static Object showInternalInputDialog(Component parentComponent,
|
|
Object message, String title,
|
|
int messageType, Icon icon,
|
|
Object[] selectionValues,
|
|
Object initialSelectionValue)
|
|
{
|
|
// FIXME: implement
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* DOCUMENT ME!
|
|
*
|
|
* @param parentComponent DOCUMENT ME!
|
|
* @param message DOCUMENT ME!
|
|
*/
|
|
public static void showInternalMessageDialog(Component parentComponent,
|
|
Object message)
|
|
{
|
|
// FIXME: implement
|
|
}
|
|
|
|
/**
|
|
* DOCUMENT ME!
|
|
*
|
|
* @param parentComponent DOCUMENT ME!
|
|
* @param message DOCUMENT ME!
|
|
* @param title DOCUMENT ME!
|
|
* @param messageType DOCUMENT ME!
|
|
*/
|
|
public static void showInternalMessageDialog(Component parentComponent,
|
|
Object message, String title,
|
|
int messageType)
|
|
{
|
|
// FIXME: implement
|
|
}
|
|
|
|
/**
|
|
* DOCUMENT ME!
|
|
*
|
|
* @param parentComponent DOCUMENT ME!
|
|
* @param message DOCUMENT ME!
|
|
* @param title DOCUMENT ME!
|
|
* @param messageType DOCUMENT ME!
|
|
* @param icon DOCUMENT ME!
|
|
*/
|
|
public static void showInternalMessageDialog(Component parentComponent,
|
|
Object message, String title,
|
|
int messageType, Icon icon)
|
|
{
|
|
// FIXME: implement
|
|
}
|
|
|
|
/**
|
|
* DOCUMENT ME!
|
|
*
|
|
* @param parentComponent DOCUMENT ME!
|
|
* @param message DOCUMENT ME!
|
|
* @param title DOCUMENT ME!
|
|
* @param optionType DOCUMENT ME!
|
|
* @param messageType DOCUMENT ME!
|
|
* @param icon DOCUMENT ME!
|
|
* @param options DOCUMENT ME!
|
|
* @param initialValue DOCUMENT ME!
|
|
*
|
|
* @return DOCUMENT ME!
|
|
*/
|
|
public static int showInternalOptionDialog(Component parentComponent,
|
|
Object message, String title,
|
|
int optionType, int messageType,
|
|
Icon icon, Object[] options,
|
|
Object initialValue)
|
|
{
|
|
// FIXME: implement
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* This method shows an INFORMATION_MESSAGE type message dialog.
|
|
*
|
|
* @param parentComponent The component to find a frame in.
|
|
* @param message The message displayed.
|
|
*/
|
|
public static void showMessageDialog(Component parentComponent,
|
|
Object message)
|
|
{
|
|
JOptionPane pane = new JOptionPane(message, INFORMATION_MESSAGE);
|
|
JDialog dialog = pane.createDialog(parentComponent, null);
|
|
dialog.pack();
|
|
dialog.show();
|
|
}
|
|
|
|
/**
|
|
* This method shows a message dialog with the given message, title and
|
|
* messageType.
|
|
*
|
|
* @param parentComponent The component to find a frame in.
|
|
* @param message The message displayed.
|
|
* @param title The title of the dialog.
|
|
* @param messageType The messageType.
|
|
*/
|
|
public static void showMessageDialog(Component parentComponent,
|
|
Object message, String title,
|
|
int messageType)
|
|
{
|
|
JOptionPane pane = new JOptionPane(message, messageType);
|
|
JDialog dialog = pane.createDialog(parentComponent, title);
|
|
dialog.pack();
|
|
dialog.show();
|
|
}
|
|
|
|
/**
|
|
* This method shows a message dialog with the given message, title,
|
|
* messageType and icon.
|
|
*
|
|
* @param parentComponent The component to find a frame in.
|
|
* @param message The message displayed.
|
|
* @param title The title of the dialog.
|
|
* @param messageType The messageType.
|
|
* @param icon The icon displayed.
|
|
*/
|
|
public static void showMessageDialog(Component parentComponent,
|
|
Object message, String title,
|
|
int messageType, Icon icon)
|
|
{
|
|
JOptionPane pane = new JOptionPane(message, messageType);
|
|
pane.setIcon(icon);
|
|
JDialog dialog = pane.createDialog(parentComponent, title);
|
|
dialog.pack();
|
|
dialog.show();
|
|
}
|
|
|
|
/**
|
|
* This method shows an option dialog with the given message, title,
|
|
* optionType, messageType, icon, options and initialValue. This method
|
|
* returns the option that was selected.
|
|
*
|
|
* @param parentComponent The component to find a frame in.
|
|
* @param message The message displayed.
|
|
* @param title The title of the dialog.
|
|
* @param optionType The optionType.
|
|
* @param messageType The messageType.
|
|
* @param icon The icon displayed.
|
|
* @param options The options to choose from.
|
|
* @param initialValue The initial value.
|
|
*
|
|
* @return The selected option.
|
|
*/
|
|
public static int showOptionDialog(Component parentComponent,
|
|
Object message, String title,
|
|
int optionType, int messageType,
|
|
Icon icon, Object[] options,
|
|
Object initialValue)
|
|
{
|
|
JOptionPane pane = new JOptionPane(message, messageType, optionType, icon,
|
|
options, initialValue);
|
|
JDialog dialog = pane.createDialog(parentComponent, title);
|
|
dialog.pack();
|
|
dialog.show();
|
|
|
|
return ((Integer) pane.getValue()).intValue();
|
|
}
|
|
|
|
/**
|
|
* This method resets the UI to the Look and Feel default.
|
|
*/
|
|
public void updateUI()
|
|
{
|
|
setUI((OptionPaneUI) UIManager.getUI(this));
|
|
invalidate();
|
|
}
|
|
|
|
/**
|
|
* This method returns true if the key is a valid messageType.
|
|
*
|
|
* @param key The key to check.
|
|
*
|
|
* @return True if key is valid.
|
|
*/
|
|
private boolean validMessageType(int key)
|
|
{
|
|
switch (key)
|
|
{
|
|
case ERROR_MESSAGE:
|
|
case INFORMATION_MESSAGE:
|
|
case PLAIN_MESSAGE:
|
|
case QUESTION_MESSAGE:
|
|
case WARNING_MESSAGE:
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* This method returns true if the key is a valid optionType.
|
|
*
|
|
* @param key The key to check.
|
|
*
|
|
* @return True if key is valid.
|
|
*/
|
|
private boolean validOptionType(int key)
|
|
{
|
|
switch (key)
|
|
{
|
|
case DEFAULT_OPTION:
|
|
case OK_CANCEL_OPTION:
|
|
case YES_NO_CANCEL_OPTION:
|
|
case YES_NO_OPTION:
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
}
|