From 57579172585eae4fd6f57c0dbd55ea998ddfb63f Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Thu, 2 Sep 2004 05:10:34 +0000 Subject: [multiple changes] 2004-08-31 Michael Koch * 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 * 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 * javax/swing/JComponent.java (resetKeyboardActions): Add null checks. 2004-08-31 Graydon Hoare * javax/swing/DefaultButtonModel.java: Skip group notification when no group is set. 2004-08-31 Graydon Hoare * javax/swing/JColorChooser.java: Make a couple inner classes static, for jikes. 2004-08-31 Michael Koch * 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 * 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 * javax/swing/plaf/basic/BasicTableHeaderUI.java, javax/swing/plaf/basic/BasicTableUI.java: Added copyright notice. 2004-08-31 Olga Rodimina * 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 * 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 * 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 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 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 * 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 * javax/swing/JSpinner.java (getChangeListeners): Remove double semi-colon. 2004-08-31 Mark Wielaard * 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 * java/lang/Rectangle.java (intersects): Check r.width and r.height first. 2004-08-31 Michael Koch * 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 * javax/swing/text/Utilities.java (drawTabbedText): Reimplemented. (getTabbedTextWidth): Likewise. 2004-08-31 Michael Koch * 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 * 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 * 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 * 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 * 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 * 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 * 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 * javax/swing/plaf/basic/BasicToolBarUI.java (BasicToolBarUI): Fixed arguments for constructor. (createUI): Fixed creation of object. 2004-08-31 Michael Koch * javax/swing/DefaultListSelectionModel.java (fireValueChanged): Renamed from fireSelectionValueChanged, made protected. 2004-08-31 Michael Koch * 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 * 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 * 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 * 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 * Makefile.am: Added new files. * Makefile.in: Regenerated. 2004-08-31 Michael Koch * 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 * javax/swing/text/Utilities.java: New file. 2004-08-31 Michael Koch * Makefile.am: Added javax/swing/text/Utilities.java. * Makefile.in: Regenerated. 2004-08-31 Graydon Hoare * 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 * 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 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 Thomas Fitzsimmons * 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 * 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 * java/awt/geom/CubicCurve2D.java (solveCubic): Removed duplicate comments. 2004-08-31 Sven de Marothy * 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 * javax/swing/JMenuItem.java (getMenuDragMouseListeners): New method. (getMenuKeyListeners): Likewise. 2004-08-31 Michael Koch * 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 * java/awt/image/Kernel.java (clone): Use super.clone(). 2004-08-31 David Jee 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 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 * 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 * javax/swing/plaf/basic/BasicMenuItemUI.java: Clean ip imports. 2004-08-31 Mark Wielaard * 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 * java/awt/EventQueue.java (postEvent): Throw NullPointerException when argument is null. 2004-08-31 Mark Wielaard * 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 * gnu/java/awt/EmbeddedWindow.java: Reindent. * javax/swing/JButton.java: Reindent. * javax/swing/JCheckBox.java: Reindent. 2004-08-31 Mark Wielaard * 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 * jni/gtk-peer/gthread-jni.c: don't #include nonexistent files 2004-08-31 Steven Augart * jni/gtk-peer/gthread-jni.c (c-font-lock-extra-types): Added jfieldID, jmethodID. 2004-08-31 Mark Wielaard * 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 * 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 * jni/gtk-peer/gthread-jni.c: Define MIN_, MAX_ and NORM_ PRIORITY when not already defined in header file. 2004-08-31 Mark Wielaard * 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 * 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 * 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 PR AWT/16682 * gnu/java/awt/peer/gtk/GtkFramePeer.java (setIconImage): Add a FIXME for unhandled cases. 2004-08-31 Thomas Fitzsimmons 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 * 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 * Makefile.in: Regenerated. 2004-08-31 Michael Koch * gnu/java/awt/EmbeddedWindow.java (addNotify): Use AccessController to allow execution of privileged code. 2004-08-31 Michael Koch * 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 * Makefile.am: Add gnu/java/security/action/GetPropertyAction.java and gnu/java/security/action/SetAccessibleAction.java. 2004-08-31 Bryce McKinlay * 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 * gnu/java/security/action/GetPropertyAction.java: New class. * gnu/java/security/action/SetAccessibleAction.java: New class. 2004-08-31 David Jee * gnu/java/awt/peer/gtk/GtkFramePeer.java (setIconImage): Check if image is null. 2004-08-31 David Jee * 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 * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (filenameFilterCallback): Declare local variable accepted before use. 2004-08-31 Dalibor Topic * gnu/java/awt/ComponentDataBlitOp.java: Cleaned up imports. 2004-08-31 Tom Tromey * 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 * 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 * 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 * 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 * java/awt/image/DirectColorModel.java (DirectColorModel): Fix constructor param comments. 2004-08-31 Thomas Fitzsimmons * java/awt/Component.java: Document AWT 1.0 event handler methods. 2004-08-31 Roman Kennke * javax/swing/Box.java: (createGlue): Implemented (createHorizontalGlue): Implemented (createHorizontalStrut): Implemented (createVerticalGlue): Implemented (createVerticalStrut): Implemented 2004-08-31 David Jee * 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 * 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 * javax/swing/BoxLayout.java: Reimplement. 2004-08-31 Thomas Fitzsimmons * 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 * 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 * 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 * 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 * 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 * 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 --- .../swing/table/DefaultTableCellRenderer.java | 23 +- .../javax/swing/table/DefaultTableColumnModel.java | 258 ++++--- libjava/javax/swing/table/DefaultTableModel.java | 826 ++++++++++----------- libjava/javax/swing/table/JTableHeader.java | 532 ++++++++++++- libjava/javax/swing/table/TableColumn.java | 88 +-- 5 files changed, 1110 insertions(+), 617 deletions(-) (limited to 'libjava/javax/swing/table') diff --git a/libjava/javax/swing/table/DefaultTableCellRenderer.java b/libjava/javax/swing/table/DefaultTableCellRenderer.java index 563d9e6..ef82988 100644 --- a/libjava/javax/swing/table/DefaultTableCellRenderer.java +++ b/libjava/javax/swing/table/DefaultTableCellRenderer.java @@ -122,8 +122,22 @@ public class DefaultTableCellRenderer extends JLabel { if (value!=null) super.setText(value.toString()); - - return this; + + setOpaque(true); + if (isSelected) + { + setBackground(table.getSelectionBackground()); + setForeground(table.getSelectionForeground()); + } + else + { + setBackground(table.getBackground()); + setForeground(table.getForeground()); + } + + setEnabled(table.isEnabled()); + setFont(table.getFont()); + return this; } /** @@ -150,6 +164,11 @@ public class DefaultTableCellRenderer extends JLabel // Does nothing. } + public void revalidate() + { + // Does nothing. + } + /** * Overriden for performance. * diff --git a/libjava/javax/swing/table/DefaultTableColumnModel.java b/libjava/javax/swing/table/DefaultTableColumnModel.java index ea46ce5..d7a3c35 100644 --- a/libjava/javax/swing/table/DefaultTableColumnModel.java +++ b/libjava/javax/swing/table/DefaultTableColumnModel.java @@ -1,5 +1,5 @@ /* DefaultTableColumnModel.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -44,6 +44,7 @@ import java.util.Enumeration; import java.util.EventListener; import java.util.Vector; import javax.swing.ListSelectionModel; +import javax.swing.DefaultListSelectionModel; import javax.swing.event.ChangeEvent; import javax.swing.event.EventListenerList; import javax.swing.event.ListSelectionEvent; @@ -61,86 +62,93 @@ public class DefaultTableColumnModel implements TableColumnModel, PropertyChangeListener, ListSelectionListener, Serializable { - static final long serialVersionUID = 6580012493508960512L; - - /** - * tableColumns - */ - protected Vector tableColumns; - - /** - * selectionModel - */ - protected ListSelectionModel selectionModel; - - /** - * columnMargin - */ - protected int columnMargin; - - /** - * listenerList - */ - protected EventListenerList listenerList; - - /** - * changeEvent - */ - protected transient ChangeEvent changeEvent; - - /** - * columnSelectionAllowed - */ - protected boolean columnSelectionAllowed; - - /** - * totalColumnWidth - */ - protected int totalColumnWidth; - - /** - * Constructor DefaultTableColumnModel - */ + private static final long serialVersionUID = 6580012493508960512L; + + /** + * tableColumns + */ + protected Vector tableColumns; + + /** + * selectionModel + */ + protected ListSelectionModel selectionModel; + + /** + * columnMargin + */ + protected int columnMargin; + + /** + * listenerList + */ + protected EventListenerList listenerList = new EventListenerList(); + + /** + * changeEvent + */ + protected transient ChangeEvent changeEvent = new ChangeEvent(this); + + /** + * columnSelectionAllowed + */ + protected boolean columnSelectionAllowed; + + /** + * totalColumnWidth + */ + protected int totalColumnWidth; + + /** + * Constructor DefaultTableColumnModel + */ public DefaultTableColumnModel() { - // TODO + tableColumns = new Vector(); + setSelectionModel(new DefaultListSelectionModel()); + columnMargin = 1; + columnSelectionAllowed = false; } - /** - * addColumn - * @param value0 TODO - */ - public void addColumn(TableColumn value0) + /** + * addColumn + * @param value0 TODO + */ + public void addColumn(TableColumn col) { - // TODO + tableColumns.add(col); + invalidateWidthCache(); } - /** - * removeColumn - * @param value0 TODO - */ - public void removeColumn(TableColumn value0) + /** + * removeColumn + * @param value0 TODO + */ + public void removeColumn(TableColumn col) { - // TODO + tableColumns.remove(col); + invalidateWidthCache(); } - /** - * moveColumn - * @param value0 TODO - * @param value1 TODO - */ - public void moveColumn(int value0, int value1) + /** + * moveColumn + * @param value0 TODO + * @param value1 TODO + */ + public void moveColumn(int i, int j) { - // TODO + Object tmp = tableColumns.get(i); + tableColumns.set(i, tableColumns.get(j)); + tableColumns.set(j, tmp); } - /** - * setColumnMargin - * @param value0 TODO - */ - public void setColumnMargin(int value0) + /** + * setColumnMargin + * @param value0 TODO + */ + public void setColumnMargin(int m) { - // TODO + columnMargin = m; } /** @@ -149,7 +157,7 @@ public class DefaultTableColumnModel */ public int getColumnCount() { - return 0; // TODO + return tableColumns.size(); } /** @@ -158,27 +166,27 @@ public class DefaultTableColumnModel */ public Enumeration getColumns() { - return null; // TODO + return tableColumns.elements(); } /** * getColumnIndex * @param value0 TODO * @return int - */ - public int getColumnIndex(Object value0) + */ + public int getColumnIndex(Object obj) { - return 0; // TODO + return tableColumns.indexOf(obj, 0); } /** * getColumn * @param value0 TODO * @return TableColumn - */ - public TableColumn getColumn(int value0) + */ + public TableColumn getColumn(int i) { - return null; // TODO + return (TableColumn) tableColumns.get(i); } /** @@ -187,17 +195,25 @@ public class DefaultTableColumnModel */ public int getColumnMargin() { - return 0; // TODO + return columnMargin; } /** * getColumnIndexAtX * @param value0 TODO * @return int - */ - public int getColumnIndexAtX(int value0) - { - return 0; // TODO + */ + public int getColumnIndexAtX(int x) + { + for (int i = 0; i < tableColumns.size(); ++i) + { + int w = ((TableColumn)tableColumns.get(i)).getWidth(); + if (0 <= x && x < w) + return i; + else + x -= w; + } + return -1; } /** @@ -206,16 +222,23 @@ public class DefaultTableColumnModel */ public int getTotalColumnWidth() { - return 0; // TODO + if (totalColumnWidth == -1) + recalcWidthCache(); + return totalColumnWidth; } - /** - * setSelectionModel - * @param value0 TODO - */ - public void setSelectionModel(ListSelectionModel value0) + /** + * setSelectionModel + * @param model TODO + * @exception IllegalArgumentException if model is null + */ + public void setSelectionModel(ListSelectionModel model) { - // TODO + if (model == null) + throw new IllegalArgumentException(); + + selectionModel = model; + selectionModel.addListSelectionListener(this); } /** @@ -224,16 +247,16 @@ public class DefaultTableColumnModel */ public ListSelectionModel getSelectionModel() { - return null; // TODO + return selectionModel; } - /** - * setColumnSelectionAllowed - * @param value0 TODO - */ - public void setColumnSelectionAllowed(boolean value0) + /** + * setColumnSelectionAllowed + * @param value0 TODO + */ + public void setColumnSelectionAllowed(boolean a) { - // TODO + columnSelectionAllowed = a; } /** @@ -242,7 +265,7 @@ public class DefaultTableColumnModel */ public boolean getColumnSelectionAllowed() { - return false; // TODO + return columnSelectionAllowed; } /** @@ -263,13 +286,13 @@ public class DefaultTableColumnModel return 0; // TODO } - /** - * addColumnModelListener - * @param value0 TODO - */ - public void addColumnModelListener(TableColumnModelListener value0) + /** + * addColumnModelListener + * @param value0 TODO + */ + public void addColumnModelListener(TableColumnModelListener listener) { - // TODO + listenerList.add(TableColumnModelListener.class, listener); } /** @@ -308,13 +331,15 @@ public class DefaultTableColumnModel // TODO } - /** - * fireColumnSelectionChanged - * @param value0 TODO - */ - protected void fireColumnSelectionChanged(ListSelectionEvent value0) + /** + * fireColumnSelectionChanged + * @param value0 TODO + */ + protected void fireColumnSelectionChanged(ListSelectionEvent evt) { - // TODO + EventListener [] listeners = getListeners(TableColumnModelListener.class); + for (int i = 0; i < listeners.length; ++i) + ((TableColumnModelListener)listeners[i]).columnSelectionChanged(evt); } /** @@ -329,10 +354,10 @@ public class DefaultTableColumnModel * getListeners * @param value0 TODO * @return EventListener[] - */ - public EventListener[] getListeners(Class value0) + */ + public EventListener[] getListeners(Class klass) { - return null; // TODO + return listenerList.getListeners(klass); } /** @@ -350,7 +375,7 @@ public class DefaultTableColumnModel */ public void valueChanged(ListSelectionEvent value0) { - // TODO + fireColumnSelectionChanged(value0); } /** @@ -367,7 +392,14 @@ public class DefaultTableColumnModel */ protected void recalcWidthCache() { - // TODO + if (totalColumnWidth == -1) + { + totalColumnWidth = 0; + for (int i = 0; i < tableColumns.size(); ++i) + { + totalColumnWidth += ((TableColumn)tableColumns.get(i)).getWidth(); + } + } } /** @@ -375,6 +407,6 @@ public class DefaultTableColumnModel */ private void invalidateWidthCache() { - // TODO + totalColumnWidth = -1; } } diff --git a/libjava/javax/swing/table/DefaultTableModel.java b/libjava/javax/swing/table/DefaultTableModel.java index 5c57f81..8e11130 100644 --- a/libjava/javax/swing/table/DefaultTableModel.java +++ b/libjava/javax/swing/table/DefaultTableModel.java @@ -50,445 +50,387 @@ public class DefaultTableModel extends AbstractTableModel implements Serializable { static final long serialVersionUID = 6680042567037222321L; - - //------------------------------------------------------------- - // Variables -------------------------------------------------- - //------------------------------------------------------------- - - /** - * dataVector - */ - protected Vector dataVector; - - /** - * columnIdentifiers - */ - protected Vector columnIdentifiers; - - - //------------------------------------------------------------- - // Initialization --------------------------------------------- - //------------------------------------------------------------- - - /** - * Constructor DefaultTableModel - */ - public DefaultTableModel() { - this(0, 0); - } // DefaultTableModel() - - /** - * Constructor DefaultTableModel - * @param value0 TODO - * @param value1 TODO - */ - public DefaultTableModel(int numRows, int numColumns) { - - // Variables - int columnIndex; - Vector defaultNames; - - // Create Column Names - defaultNames = new Vector(); - for (columnIndex = 0; columnIndex < numColumns; columnIndex++) { - defaultNames.addElement(super.getColumnName(columnIndex)); - } // for - - // Setup Data -// setDataVector(defaultNames, numRows); - - } // DefaultTableModel() - - /** - * Constructor DefaultTableModel - * @param value0 TODO - * @param value1 TODO - */ - public DefaultTableModel(Vector columnNames, int numRows) { - - // Variables - Vector data; - Vector rowData; - int rowIndex; - int numColumns; - - // Create Data - data = new Vector(); - if (columnNames == null) { - numColumns = 0; - } else { - numColumns = columnNames.size(); - } // if - for (rowIndex = 0; rowIndex < numRows; rowIndex++) { - rowData = new Vector(); - rowData.setSize(numColumns); - data.addElement(rowData); - } // for - - // Setup Data - setDataVector(data, columnNames); - - } // DefaultTableModel() - - /** - * Constructor DefaultTableModel - * @param value0 TODO - * @param value1 TODO - */ - public DefaultTableModel(Object[] columnNames, int numRows) { - this(convertToVector(columnNames), numRows); - } // DefaultTableModel() - - /** - * Constructor DefaultTableModel - * @param value0 TODO - * @param value1 TODO - */ - public DefaultTableModel(Vector data, Vector columnNames) { - setDataVector(data, columnNames); - } // DefaultTableModel() - - /** - * Constructor DefaultTableModel - * @param value0 TODO - * @param value1 TODO - */ - public DefaultTableModel(Object[][] data, Object[] columnNames) { - this(convertToVector(data), convertToVector(columnNames)); - } // DefaultTableModel() - - - //------------------------------------------------------------- - // Methods ---------------------------------------------------- - //------------------------------------------------------------- - - /** - * getDataVector - * @returns Vector - */ - public Vector getDataVector() { - return dataVector; - } // getDataVector() - - /** - * setDataVector - * @param value0 TODO - * @param value1 TODO - */ - public void setDataVector(Vector data, Vector columnNames) { - - // Variables - int rowIndex; - int numRows; - int numColumns; - Vector columnVector; - - // Set Data - dataVector = data; - columnIdentifiers = columnNames; - - // Check Data - numRows = data.size(); - numColumns = columnNames.size(); - for (rowIndex = 0; rowIndex < numRows; rowIndex++) { - columnVector = (Vector) dataVector.get(rowIndex); - columnVector.setSize(numColumns); - } // for - - } // setDataVector() - - /** - * setDataVector - * @param value0 TODO - * @param value1 TODO - */ - public void setDataVector(Object[][] data, Object[] columnNames) { - setDataVector(convertToVector(data), convertToVector(columnNames)); - } // setDataVector() - - /** - * newDataAvailable - * @param value0 TODO - */ - public void newDataAvailable(TableModelEvent event) { - fireTableChanged(event); - } // newDataAvailable() - - /** - * newRowsAdded - * @param value0 TODO - */ - public void newRowsAdded(TableModelEvent event) { - // TODO - } // newRowsAdded() - - /** - * rowsRemoved - * @param value0 TODO - */ - public void rowsRemoved(TableModelEvent event) { - fireTableChanged(event); - } // rowsRemoved() - - /** - * setColumnIdentifiers - * @param value0 TODO - */ - public void setColumnIdentifiers(Vector columnIdentifiers) { - this.columnIdentifiers = columnIdentifiers; - setColumnCount(columnIdentifiers.size()); - } // setColumnIdentifiers() - - /** - * setColumnIdentifiers - * @param value0 TODO - */ - public void setColumnIdentifiers(Object[] columnIdentifiers) { - setColumnIdentifiers(convertToVector(columnIdentifiers)); - } // setColumnIdentifiers() - - /** - * setNumRows - * @param value0 TODO - */ - public void setNumRows(int numRows) { - setRowCount(numRows); - } // setNumRows() - - /** - * setRowCount - * @param value0 TODO - */ - public void setRowCount(int rowCount) { - // TODO - } // setRowCount() - - /** - * setColumnCount - * @param value0 TODO - */ - public void setColumnCount(int columnCount) { - // TODO - } // setColumnCount() - - /** - * addColumn - * @param value0 TODO - */ - public void addColumn(Object columnName) { - addColumn(columnName, new Vector(dataVector.size())); - } // addColumn() - - /** - * addColumn - * @param value0 TODO - * @param value1 TODO - */ - public void addColumn(Object columnName, Vector columnData) { - // TODO - } // addColumn() - - /** - * addColumn - * @param value0 TODO - * @param value1 TODO - */ - public void addColumn(Object columnName, Object[] columnData) { - // TODO - } // addColumn() - - /** - * addRow - * @param value0 TODO - */ - public void addRow(Vector rowData) { - // TODO - } // addRow() - - /** - * addRow - * @param value0 TODO - */ - public void addRow(Object[] rowData) { - addRow(convertToVector(rowData)); - } // addRow() - - /** - * insertRow - * @param value0 TODO - * @param value1 TODO - */ - public void insertRow(int row, Vector rowData) { - dataVector.add(row, rowData); - } // insertRow() - - /** - * insertRow - * @param value0 TODO - * @param value1 TODO - */ - public void insertRow(int row, Object[] rowData) { - insertRow(row, convertToVector(rowData)); - } // insertRow() - - /** - * moveRow - * @param value0 TODO - * @param value1 TODO - * @param value2 TODO - */ - public void moveRow(int startIndex, int endIndex, int toIndex) { - - // Variables - int index; - Vector vector; - - // Move Rows - for (index = 0; index < (endIndex - startIndex); index++) { - vector = (Vector) dataVector.remove(startIndex); - dataVector.add(toIndex, vector); - } // for - - } // moveRow() - - /** - * removeRow - * @param value0 TODO - */ - public void removeRow(int row) { - dataVector.remove(row); - } // removeRow() - - /** - * getRowCount - * @returns int - */ - public int getRowCount() { - return dataVector.size(); - } // getRowCount() - - /** - * getColumnCount - * @returns int - */ - public int getColumnCount() { - return columnIdentifiers.size(); - } // getColumnCount() - - /** - * getColumnName - * @param value0 TODO - * @returns String - */ - public String getColumnName(int column) { - - // Check for Column - if (columnIdentifiers == null || column >= getColumnCount()) { - return super.getColumnName(column); - } // if - - // Return Column name - return (String) columnIdentifiers.get(column); - - } // getColumnName() - - /** - * isCellEditable - * @param value0 TODO - * @param value1 TODO - * @returns boolean - */ - public boolean isCellEditable(int row, int column) { - return true; - } // isCellEditable() - - /** - * getValueAt - * @param value0 TODO - * @param value1 TODO - * @returns Object - */ - public Object getValueAt(int row, int column) { - - // Variables - Vector rowVector; - - // Get Row Vector - rowVector = (Vector) dataVector.get(row); - - // Get Data - return rowVector.get(column); - - } // getValueAt() - - /** - * setValueAt - * @param value0 TODO - * @param value1 TODO - * @param value2 TODO - */ - public void setValueAt(Object value, int row, int column) { - - // Variables - Vector rowVector; - - // Get Row Vector - rowVector = (Vector) dataVector.get(row); - - // Set Data - rowVector.remove(column); - rowVector.add(column, value); - - } // setValueAt() - - /** - * convertToVector - * @param value0 TODO - * @returns Vector - */ - protected static Vector convertToVector(Object[] data) { - - // Variables - int index; - Vector vector; - - // Check for null - if (data == null) { - return null; - } // if - - // Process - vector = new Vector(); - for (index = 0; index < data.length; index++) { - vector.add(data[index]); - } // for: index - - // Return new Vector - return vector; - - } // convertToVector() - - /** - * convertToVector - * @param value0 TODO - * @returns Vector - */ - protected static Vector convertToVector(Object[][] data) { - - // Variables - int index; - Vector vector; - - // Process - vector = new Vector(); - for (index = 0; index < data.length; index++) { - vector.add(convertToVector(data[index])); - } // for: index - - // Return new Vector - return vector; - - } // convertToVector() - - -} // DefaultTableModel + /** + * dataVector + */ + protected Vector dataVector; + + /** + * columnIdentifiers + */ + protected Vector columnIdentifiers; + + /** + * Constructor DefaultTableModel + */ + public DefaultTableModel() + { + this(0, 0); + } + + /** + * Constructor DefaultTableModel + * @param value0 TODO + * @param value1 TODO + */ + public DefaultTableModel(int numRows, int numColumns) + { + Vector defaultNames = new Vector(numColumns); + Vector data = new Vector(numRows); + for (int i = 0; i < numColumns; i++) + { + defaultNames.add(super.getColumnName(i)); + Vector tmp = new Vector(numColumns); + tmp.setSize(numColumns); + data.add(tmp); + } + setDataVector(defaultNames, data); + } + + /** + * Constructor DefaultTableModel + * @param value0 TODO + * @param value1 TODO + */ + public DefaultTableModel(Vector columnNames, int numRows) + { + Vector data = new Vector(); + int numColumns = 0; + + if (columnNames != null) + numColumns = columnNames.size(); + + while (0 < numRows--) + { + Vector rowData = new Vector(); + rowData.setSize(numColumns); + data.add(rowData); + } + setDataVector(data, columnNames); + } + + /** + * Constructor DefaultTableModel + * @param value0 TODO + * @param value1 TODO + */ + public DefaultTableModel(Object[] columnNames, int numRows) + { + this(convertToVector(columnNames), numRows); + } + + /** + * Constructor DefaultTableModel + * @param value0 TODO + * @param value1 TODO + */ + public DefaultTableModel(Vector data, Vector columnNames) + { + setDataVector(data, columnNames); + } + + /** + * Constructor DefaultTableModel + * @param value0 TODO + * @param value1 TODO + */ + public DefaultTableModel(Object[][] data, Object[] columnNames) + { + this(convertToVector(data), convertToVector(columnNames)); + } + + /** + * getDataVector + * @returns Vector + */ + public Vector getDataVector() + { + return dataVector; + } + + /** + * setDataVector + * @param value0 TODO + * @param value1 TODO + */ + public void setDataVector(Vector data, Vector columnNames) + { + dataVector = data; + columnIdentifiers = columnNames; + for (int r = 0; r < data.size(); r++) { + ((Vector) dataVector.get(r)).setSize(columnNames.size()); + } + } + + /** + * setDataVector + * @param value0 TODO + * @param value1 TODO + */ + public void setDataVector(Object[][] data, Object[] columnNames) + { + setDataVector(convertToVector(data), + convertToVector(columnNames)); + } + + /** + * newDataAvailable + * @param value0 TODO + */ + public void newDataAvailable(TableModelEvent event) + { + fireTableChanged(event); + } + + /** + * newRowsAdded + * @param value0 TODO + */ + public void newRowsAdded(TableModelEvent event) + { + fireTableChanged(event); + } + + /** + * rowsRemoved + * @param value0 TODO + */ + public void rowsRemoved(TableModelEvent event) + { + fireTableChanged(event); + } + + /** + * setColumnIdentifiers + * @param value0 TODO + */ + public void setColumnIdentifiers(Vector columnIdentifiers) + { + this.columnIdentifiers = columnIdentifiers; + setColumnCount(columnIdentifiers.size()); + } + + /** + * setColumnIdentifiers + * @param value0 TODO + */ + public void setColumnIdentifiers(Object[] columnIdentifiers) + { + setColumnIdentifiers(convertToVector(columnIdentifiers)); + } + + /** + * setNumRows + * @param value0 TODO + */ + public void setNumRows(int numRows) + { + setRowCount(numRows); + } + + /** + * setRowCount + * @param value0 TODO + */ + public void setRowCount(int rowCount) + { + dataVector.setSize(rowCount); + fireTableDataChanged(); + } + + /** + * setColumnCount + * @param value0 TODO + */ + public void setColumnCount(int columnCount) + { + for (int i = 0; i < dataVector.size(); ++i) + { + ((Vector) dataVector.get(i)).setSize(columnCount); + } + columnIdentifiers.setSize(columnCount); + fireTableDataChanged(); + } + + /** + * addColumn + * @param value0 TODO + */ + public void addColumn(Object columnName) + { + addColumn(columnName, (Object[]) null); + } + + /** + * addColumn + * @param value0 TODO + * @param value1 TODO + */ + public void addColumn(Object columnName, Vector columnData) + { + addColumn(columnName, columnData == null ? null : columnData.toArray()); + } + + /** + * addColumn + * @param value0 TODO + * @param value1 TODO + */ + public void addColumn(Object columnName, Object[] columnData) { + for (int i = 0; i < dataVector.size(); ++i) + { + ((Vector) dataVector.get(i)).add(columnData == null ? null : columnData[i]); + } + columnIdentifiers.add(columnName); + fireTableDataChanged(); + } + + /** + * addRow + * @param value0 TODO + */ + public void addRow(Vector rowData) { + dataVector.add(rowData); + fireTableDataChanged(); + } + + /** + * addRow + * @param value0 TODO + */ + public void addRow(Object[] rowData) { + addRow(convertToVector(rowData)); + } + + /** + * insertRow + * @param value0 TODO + * @param value1 TODO + */ + public void insertRow(int row, Vector rowData) { + dataVector.add(row, rowData); + fireTableDataChanged(); + } + + /** + * insertRow + * @param value0 TODO + * @param value1 TODO + */ + public void insertRow(int row, Object[] rowData) { + insertRow(row, convertToVector(rowData)); + } + + /** + * moveRow + * @param value0 TODO + * @param value1 TODO + * @param value2 TODO + */ + public void moveRow(int startIndex, int endIndex, int toIndex) { + for (int index = 0; index < (endIndex - startIndex); index++) { + Vector vector = (Vector) dataVector.remove(startIndex); + dataVector.add(toIndex, vector); + } + fireTableDataChanged(); + } + + /** + * removeRow + * @param value0 TODO + */ + public void removeRow(int row) { + dataVector.remove(row); + fireTableDataChanged(); + } + + /** + * getRowCount + * @returns int + */ + public int getRowCount() { + return dataVector.size(); + } + + /** + * getColumnCount + * @returns int + */ + public int getColumnCount() { + return columnIdentifiers.size(); + } + + /** + * getColumnName + * @param value0 TODO + * @returns String + */ + public String getColumnName(int column) { + // Check for Column + if (columnIdentifiers == null || column >= getColumnCount()) { + return super.getColumnName(column); + } + + // Return Column name + return (String) columnIdentifiers.get(column); + } + + /** + * isCellEditable + * @param value0 TODO + * @param value1 TODO + * @returns boolean + */ + public boolean isCellEditable(int row, int column) { + return true; + } + + /** + * getValueAt + * @param value0 TODO + * @param value1 TODO + * @returns Object + */ + public Object getValueAt(int row, int column) { + return ((Vector) dataVector.get(row)).get(column); + } + + /** + * setValueAt + * @param value0 TODO + * @param value1 TODO + * @param value2 TODO + */ + public void setValueAt(Object value, int row, int column) { + ((Vector) dataVector.get(row)).set(column, value); + fireTableDataChanged(); + } + + /** + * convertToVector + * @param value0 TODO + * @returns Vector + */ + protected static Vector convertToVector(Object[] data) { + if (data == null) + return null; + Vector vector = new Vector(data.length); + for (int i = 0; i < data.length; i++) + vector.add(data[i]); + return vector; + } + + /** + * convertToVector + * @param value0 TODO + * @returns Vector + */ + protected static Vector convertToVector(Object[][] data) { + if (data == null) + return null; + Vector vector = new Vector(data.length); + for (int i = 0; i < data.length; i++) + vector.add(convertToVector(data[i])); + return vector; + } +} diff --git a/libjava/javax/swing/table/JTableHeader.java b/libjava/javax/swing/table/JTableHeader.java index 6b48601..9e55647 100644 --- a/libjava/javax/swing/table/JTableHeader.java +++ b/libjava/javax/swing/table/JTableHeader.java @@ -38,26 +38,536 @@ exception statement from your version. */ package javax.swing.table; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.awt.Color; +import java.awt.Cursor; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.Point; +import java.awt.Rectangle; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.util.Locale; + +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleAction; +import javax.accessibility.AccessibleComponent; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleSelection; +import javax.accessibility.AccessibleStateSet; +import javax.accessibility.AccessibleRole; +import javax.accessibility.AccessibleText; +import javax.accessibility.AccessibleValue; import javax.swing.JComponent; import javax.swing.JTable; +import javax.swing.UIManager; +import javax.swing.plaf.TableHeaderUI; public class JTableHeader extends JComponent { - protected class AccessibleJTableHeader + protected class AccessibleJTableHeader extends AccessibleJComponent { - protected class AccessibleJTableHeaderEntry + protected class AccessibleJTableHeaderEntry extends AccessibleContext + implements Accessible, AccessibleComponent { - } + public void addFocusListener(FocusListener l) + { + throw new Error("not implemented"); + } + public void addPropertyChangeListener(PropertyChangeListener l) + { + throw new Error("not implemented"); + } + public boolean contains(Point p) + { + throw new Error("not implemented"); + } + public AccessibleAction getAccessibleAction() + { + throw new Error("not implemented"); + } + public Accessible getAccessibleAt(Point p) + { + throw new Error("not implemented"); + } + public Accessible getAccessibleChild(int i) + { + throw new Error("not implemented"); + } + public int getAccessibleChildrenCount() + { + throw new Error("not implemented"); + } + public AccessibleComponent getAccessibleComponent() + { + throw new Error("not implemented"); + } + public AccessibleContext getAccessibleContext() + { + throw new Error("not implemented"); + } + public String getAccessibleDescription() + { + throw new Error("not implemented"); + } + public int getAccessibleIndexInParent() + { + throw new Error("not implemented"); + } + public String getAccessibleName() + { + throw new Error("not implemented"); + } + public AccessibleRole getAccessibleRole() + { + throw new Error("not implemented"); + } + public AccessibleSelection getAccessibleSelection() + { + throw new Error("not implemented"); + } + public AccessibleStateSet getAccessibleStateSet() + { + throw new Error("not implemented"); + } + public AccessibleText getAccessibleText() + { + throw new Error("not implemented"); + } + public AccessibleValue getAccessibleValue() + { + throw new Error("not implemented"); + } + public Color getBackground() + { + throw new Error("not implemented"); + } + public Rectangle getBounds() + { + throw new Error("not implemented"); + } + public Cursor getCursor() + { + throw new Error("not implemented"); + } + public Font getFont() + { + throw new Error("not implemented"); + } + public FontMetrics getFontMetrics(Font f) + { + throw new Error("not implemented"); + } + public Color getForeground() + { + throw new Error("not implemented"); + } + public Locale getLocale() + { + throw new Error("not implemented"); + } + public Point getLocation() + { + throw new Error("not implemented"); + } + public Point getLocationOnScreen() + { + throw new Error("not implemented"); + } + public Dimension getSize() + { + throw new Error("not implemented"); + } + public boolean isEnabled() + { + throw new Error("not implemented"); + } + public boolean isFocusTraversable() + { + throw new Error("not implemented"); + } + public boolean isShowing() + { + throw new Error("not implemented"); + } + public boolean isVisible() + { + throw new Error("not implemented"); + } + public void removeFocusListener(FocusListener l) + { + throw new Error("not implemented"); + } + public void removePropertyChangeListener(PropertyChangeListener l) + { + throw new Error("not implemented"); + } + public void requestFocus() + { + throw new Error("not implemented"); + } + public void setAccessibleDescription(String s) + { + throw new Error("not implemented"); + } + public void setAccessibleName(String s) + { + throw new Error("not implemented"); + } + public void setBackground(Color c) + { + throw new Error("not implemented"); + } + public void setBounds(Rectangle r) + { + throw new Error("not implemented"); + } + public void setCursor(Cursor c) + { + throw new Error("not implemented"); + } + public void setEnabled(boolean b) + { + throw new Error("not implemented"); + } + public void setFont(Font f) + { + throw new Error("not implemented"); + } + public void setForeground(Color c) + { + throw new Error("not implemented"); + } + public void setLocation(Point p) + { + throw new Error("not implemented"); + } + public void setSize(Dimension d) + { + throw new Error("not implemented"); + } + public void setVisible(boolean b) + { + throw new Error("not implemented"); + } + }; } private static final long serialVersionUID = 5144633983372967710L; - protected TableColumnModel columnModel; - protected TableColumn draggedColumn; - protected int draggedDistance; - protected boolean reorderingAllowed; - protected boolean resizingAllowed; - protected TableColumn resizingColumn; - protected JTable table; - protected boolean updateTableInRealTime; + /** + * The accessibleContext property. + */ + AccessibleContext accessibleContext; + + /** + * The columnModel property. + */ + TableColumnModel columnModel; + + /** + * The draggedColumn property. + */ + TableColumn draggedColumn; + + /** + * The draggedDistance property. + */ + int draggedDistance; + + /** + * The opaque property. + */ + boolean opaque; + + /** + * The reorderingAllowed property. + */ + boolean reorderingAllowed; + + /** + * The resizingAllowed property. + */ + boolean resizingAllowed; + + /** + * The resizingColumn property. + */ + TableColumn resizingColumn; + + /** + * The table property. + */ + JTable table; + + /** + * The updateTableInRealTime property. + */ + boolean updateTableInRealTime; + + TableCellRenderer cellRenderer; + + public JTableHeader() + { + this(null); + } + + public JTableHeader(TableColumnModel cm) + { + accessibleContext = new AccessibleJTableHeader(); + columnModel = cm == null ? createDefaultTableColumnModel() : cm; + draggedColumn = null; + draggedDistance = 0; + opaque = true; + reorderingAllowed = true; + resizingAllowed = true; + resizingColumn = null; + table = null; + updateTableInRealTime = true; + cellRenderer = createDefaultRenderer(); + updateUI(); + } + + protected TableColumnModel createDefaultTableColumnModel() + { + return new DefaultTableColumnModel(); + } + + + /** + * Get the value of the {@link #accessibleContext} property. + * + * @return The current value of the property + */ + public AccessibleContext getAccessibleContext() + { + return accessibleContext; + } + + /** + * Get the value of the {@link #columnModel} property. + * + * @return The current value of the property + */ + public TableColumnModel getColumnModel() + { + return columnModel; + } + + /** + * Get the value of the {@link #draggedColumn} property. + * + * @return The current value of the property + */ + public TableColumn getDraggedColumn() + { + return draggedColumn; + } + + /** + * Get the value of the {@link #draggedDistance} property. + * + * @return The current value of the property + */ + public int getDraggedDistance() + { + return draggedDistance; + } + + /** + * Get the value of the {@link #reorderingAllowed} property. + * + * @return The current value of the property + */ + public boolean getReorderingAllowed() + { + return reorderingAllowed; + } + + /** + * Get the value of the {@link #resizingAllowed} property. + * + * @return The current value of the property + */ + public boolean getResizingAllowed() + { + return resizingAllowed; + } + + /** + * Get the value of the {@link #resizingColumn} property. + * + * @return The current value of the property + */ + public TableColumn getResizingColumn() + { + return resizingColumn; + } + + /** + * Get the value of the {@link #table} property. + * + * @return The current value of the property + */ + public JTable getTable() + { + return table; + } + + /** + * Get the value of the {@link #updateTableInRealTime} property. + * + * @return The current value of the property + */ + public boolean getUpdateTableInRealTime() + { + return updateTableInRealTime; + } + + /** + * Get the value of the {@link #opaque} property. + * + * @return The current value of the property + */ + public boolean isOpaque() + { + return opaque; + } + + /** + * Set the value of the {@link #columnModel} property. + * + * @param c The new value of the property + */ + public void setColumnModel(TableColumnModel c) + { + columnModel = c; + } + + /** + * Set the value of the {@link #draggedColumn} property. + * + * @param d The new value of the property + */ + public void setDraggedColumn(TableColumn d) + { + draggedColumn = d; + } + + /** + * Set the value of the {@link #draggedDistance} property. + * + * @param d The new value of the property + */ + public void setDraggedDistance(int d) + { + draggedDistance = d; + } + + /** + * Set the value of the {@link #opaque} property. + * + * @param o The new value of the property + */ + public void setOpaque(boolean o) + { + opaque = o; + } + + /** + * Set the value of the {@link #reorderingAllowed} property. + * + * @param r The new value of the property + */ + public void setReorderingAllowed(boolean r) + { + reorderingAllowed = r; + } + + /** + * Set the value of the {@link #resizingAllowed} property. + * + * @param r The new value of the property + */ + public void setResizingAllowed(boolean r) + { + resizingAllowed = r; + } + + /** + * Set the value of the {@link #resizingColumn} property. + * + * @param r The new value of the property + */ + public void setResizingColumn(TableColumn r) + { + resizingColumn = r; + } + + /** + * Set the value of the {@link #table} property. + * + * @param t The new value of the property + */ + public void setTable(JTable t) + { + table = t; + } + + /** + * Set the value of the {@link #updateTableInRealTime} property. + * + * @param u The new value of the property + */ + public void setUpdateTableInRealTime(boolean u) + { + updateTableInRealTime = u; + } + + protected TableCellRenderer createDefaultRenderer() + { + return new DefaultTableCellRenderer(); + } + + public TableCellRenderer getDefaultRenderer() + { + return cellRenderer; + } + + public Rectangle getHeaderRect(int column) + { + Rectangle r = getTable().getCellRect(-1, column, true); + r.height = getHeight(); + return r; + } + + protected String paramString() + { + return "JTableHeader"; + } + + // UI support + + public String getUIClassID() + { + return "TableHeaderUI"; + } + + public TableHeaderUI getUI() + { + return (TableHeaderUI) ui; + } + + public void setUI(TableHeaderUI u) + { + super.setUI(u); + } + + public void updateUI() + { + setUI((TableHeaderUI) UIManager.getUI(this)); + } + } diff --git a/libjava/javax/swing/table/TableColumn.java b/libjava/javax/swing/table/TableColumn.java index 39ae1bd..02ef7f8 100644 --- a/libjava/javax/swing/table/TableColumn.java +++ b/libjava/javax/swing/table/TableColumn.java @@ -285,23 +285,19 @@ public class TableColumn return headerValue; } - /** - * setHeaderRenderer - * @param headerRenderer TODO - */ - public void setHeaderRenderer(TableCellRenderer headerRenderer) + /** + * setHeaderRenderer + * @param headerRenderer TODO + */ + public void setHeaderRenderer(TableCellRenderer renderer) { - // Variables - TableCellRenderer oldRenderer; - - // Get Old Renderer - oldRenderer = this.headerRenderer; - - // Set Property - this.headerRenderer = headerRenderer; - - // Notify Listeners of change - firePropertyChange(HEADER_RENDERER_PROPERTY, oldRenderer, headerRenderer); + if (headerRenderer == renderer) + return; + + TableCellRenderer oldRenderer = headerRenderer; + headerRenderer = renderer; + firePropertyChange(HEADER_RENDERER_PROPERTY, + oldRenderer, headerRenderer); } /** @@ -313,23 +309,19 @@ public class TableColumn return headerRenderer; } - /** - * setCellRenderer - * @param cellRenderer TODO - */ - public void setCellRenderer(TableCellRenderer cellRenderer) + /** + * setCellRenderer + * @param cellRenderer TODO + */ + public void setCellRenderer(TableCellRenderer renderer) { - // Variables - TableCellRenderer oldRenderer; - - // Get Old Renderer - oldRenderer = this.cellRenderer; - - // Set Property - this.cellRenderer = cellRenderer; - - // Notify Listeners of change - firePropertyChange(CELL_RENDERER_PROPERTY, oldRenderer, cellRenderer); + if (cellRenderer == renderer) + return; + + TableCellRenderer oldRenderer = cellRenderer; + cellRenderer = renderer; + firePropertyChange(CELL_RENDERER_PROPERTY, + oldRenderer, cellRenderer); } /** @@ -359,27 +351,25 @@ public class TableColumn return cellEditor; } - /** - * setWidth - * @param width TODO - */ - public void setWidth(int width) + /** + * setWidth + * @param newWidth TODO + */ + public void setWidth(int newWidth) { - // Variables - int oldWidth; + int oldWidth = width; - // Get Old Width - oldWidth = this.width; - - // Adjust Width within Limits - if (width < minWidth) - this.width = minWidth; - else if (width > maxWidth) - this.width = maxWidth; + if (newWidth < minWidth) + width = minWidth; + else if (newWidth > maxWidth) + width = maxWidth; else - this.width = width; + width = newWidth; + + if (width == oldWidth) + return; - firePropertyChange(COLUMN_WIDTH_PROPERTY, oldWidth, this.width); + firePropertyChange(COLUMN_WIDTH_PROPERTY, oldWidth, width); } /** -- cgit v1.1