5757917258
2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTextAreaUI.java (create): New method. * javax/swing/text/DefaultHighlighter.java (DefaultHighlightPainter.debugRect): Removed. * javax/swing/text/StyleContext.java (DEFAULT_STYLE): New field. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicLookAndFeel.java (initComponentDefaults): Add keybindings for selection.backward and selection-forward for text components. * javax/swing/plaf/basic/BasicTextUI.java (paintSafely): Paint highlight only when something is actually selected. * javax/swing/text/DefaultCaret.java (handleHighlight): New method. (setSelectionVisible): Don't do anything when nothing changes. Handle highlight. (moveDot): Reimplemented. Handle highlight. (setDot): Set mark too. Handle highlight. (getSelectionPainter): New method. * javax/swing/text/DefaultEditorKit.java (defaultActions): Added new actions for text selection. * javax/swing/text/DefaultHighlighter.java (DefaultHighlightPainter): New inner class. (DefaultPainter): New field. (paint): Implemented. * javax/swing/text/PlainView.java (paint): Don't draw background here again. * javax/swing/text/Utilities.java (getTabbedTextWidth): Use width of ' ' instead of 'm' for tabsize. (drawTabbedText): Likewise. 2004-08-31 Graydon Hoare <graydon@redhat.com> * javax/swing/JComponent.java (resetKeyboardActions): Add null checks. 2004-08-31 Graydon Hoare <graydon@redhat.com> * javax/swing/DefaultButtonModel.java: Skip group notification when no group is set. 2004-08-31 Graydon Hoare <graydon@redhat.com> * javax/swing/JColorChooser.java: Make a couple inner classes static, for jikes. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTextUI.java (RottView.modelToView): New method. (UpdateHandler): Renamed from EventHandler. (updateHandler): Renamed from eventHandler. (modelToView): Implemented. * javax/swing/text/AbstractDocument.java (BranchElement.getElement): Return null for non-existing indeces. (BranchElement.getElementIndex): Return 0 in some corner cases. * javax/swing/text/FieldView.java (modelToView): New method. * javax/swing/text/PlainView.java (modelToView): Made public. 2004-08-31 Kim Ho <kho@redhat.com> * Makefile.am: New files. * Makefile.in: Regenerate. * gcj/Makefile.in: Regenerate. * include/Makefile.in: Regenerate. * java/awt/Color.java: Fix documentation. (RGBtoHSB): Use floats for conversions. * javax/swing/ButtonGroup.java: Run Jalopy. (setSelected): Reimplement. * javax/swing/DefaultButtonModel.java: Run Jalopy. (changeState): Let ButtonGroup know that the button is changing state. * javax/swing/JColorChooser.java: Implement. * javax/swing/JLabel.java: Run Jalopy. * javax/swing/JSpinner.java: Run Jalopy. (setValue): New method. * javax/swing/JTabbedPane.java: Run Jalopy. (removeTabAt): Call correct remove method. * javax/swing/SpinnerNumberModel.java: Run Jalopy. (getPreviousValue): Compare minimum value. * javax/swing/Timer.java: Run Jalopy. (run): Comment out println. * javax/swing/ToolTipManager.java: (mouseMoved): Get new tooltip text for location. * javax/swing/colorchooser/AbstractColorChooserPanel.java: Jalopy and Javadoc. * javax/swing/colorchooser/ColorChooserComponentFactory.java: Implement. * javax/swing/colorchooser/DefaultColorSelectionModel.java: Run Jalopy. (setSelectedColor): Fire ChangeEvent. * javax/swing/colorchooser/DefaultHSBChooserPanel.java: New file. Implement. * javax/swing/colorchooser/DefaultPreviewPanel.java: Ditto. * javax/swing/colorchooser/DefaultRGBChooserPanel.java: Ditto. * javax/swing/colorchooser/DefaultSwatchChooserPanel.java: Ditto. * javax/swing/plaf/basic/BasicArrowButton.java: (getArrow): Fix size of upward pointing button. * javax/swing/plaf/basic/BasicColorChooserUI.java: Implement. * javax/swing/plaf/basic/BasicSliderUI.java: (getWidthOfWidestLabel): Use preferred dimensions. (getHeightOfTallestLabel): Ditto. * javax/swing/plaf/basic/BasicSpinnerUI.java: Run Jalopy. (mousePressed): Disable changes to spinner if it is not enabled. * testsuite/Makefile.in: Regenerate. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTableHeaderUI.java, javax/swing/plaf/basic/BasicTableUI.java: Added copyright notice. 2004-08-31 Olga Rodimina <rodimina@redhat.com> * Makefile.am: Added new files. * Makefile.in: Regenerate. * javax/swing/ComboBoxEditor.java: Added javadocs. * javax/swing/ComboBoxModel.java: Likewise. * javax/swing/DefaultComboBoxModel.java: Implemented. * javax/swing/DefaultListCellRenderer.java: Added javadocs and ran through jalopy to fix formatting style. (getListCellRendererComponent): Use appropriate border if renderer has focus and use noFocusBorder when it doesn't. * javax/swing/JComboBox.java: Implemented. * javax/swing/JList.java: (locationToIndex): New Method. Implemented. (indexToLocation): New Method. * javax/swing/JPopupMenu.java: (visible): New field. (isVisible): Changed to use new field above. (setVisible): Likewise. * javax/swing/MutableComboBoxModel.java: Added javadocs. * javax/swing/plaf/basic/BasicArrowButton.java: (shadow): Changed default color to Color.gray. * javax/swing/plaf/basic/BasicComboBoxUI.java: New File. UI delegate for JComboBox. * javax/swing/plaf/basic/BasicComboPopup.java: New File. Popup menu containing list of JComboBox's items. * javax/swing/plaf/basic/BasicComboBoxEditor.java: New File. * javax/swing/plaf/basic/BasicComboBoxRenderer.java: New File. * javax/swing/plaf/basic/BasicComboBoxUI.java: New File. * javax/swing/plaf/basic/BasicComboPopup.java: New File. * javax/swing/plaf/basic/BasicPopupMenuUI.java: (popupMenuWillBecomeVisible): Set selected path to the first element only if it is of type MenuElement. Also fix formatting style. * javax/swing/plaf/basic/ComboPopup.java: Added javadocs and missing methods signatures. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/text/AbstractDocument.java (createBranchElement): Use new constructor of BranchElement. (createLeafElement): Renamed arguments. (getRootElements): Implemented. (BranchElement.start): Removed. (BranchElement.end): Likewise. (BranchElement.BranchElement): Fixed arguments. (BranchElement.getEndOffset): Reimplemented. (BranchElement.getStartOffset): Likewis. * javax/swing/text/DefaultCaret.java (paint): Draw simple vertical line as caret instead of a rectangle. * javax/swing/text/JTextComponent.java (setText): Use doc directly. * javax/swing/text/PlainView.java (nextTabStop): Implemented. * javax/swing/text/Utilities.java (drawTabbedText): nextTabStop() returns an absolute x position. (getTabbedTextWidth): Likewise. 2004-08-31 Graydon Hoare <graydon@redhat.com> * java/awt/Component.java (isFocusTraversable): Predicate on isLightweight() (setFocusable): Set isFocusTraversableOverridden. (requestFocus): Predicate peer dispatch on !isLightweight() (requestFocusInWindow): Likewise. (dispatchEventImpl): Coordinate with KeyboardFocusManager. * java/awt/Container.java (dispatchEventImpl): Predicate on event mask. (LightweightDispatcher): Remove focus machinery. * java/awt/DefaultFocusTraversalPolicy.java (accept): Expand predicate to include isFocusable(). * java/awt/DefaultKeyboardFocusManager.java: Globally change c.dispatchEvent(e) to redispatchEvent(c,e) * java/awt/KeyboardFocusManager.java (redispatchEvent): Synchronize on event to prevent feedback. * javax/swing/AbstractButton.java (ButtonFocusListener): Remove class. (init): Set focusPainted, focusable. * javax/swing/ActionMap.java (get): Check parent for null. * javax/swing/InputMap.java (get): Likewise. * javax/swing/JComponent.java (inputMap_whenFocused): New InputMap. (inputMap_whenAncestorOfFocused): Likewise. (inputMap_whenInFocusedWindow): Likewise. (getActionForKeyStroke): Rewrite. (getConditionForKeystroke): Likewise. (ActionListenerProxy): New private class. (setInputMap): Implement. (getInputMap): Likewise. (setActionMap): Likewise. (getActionMap): Likewise. (processComponentKeyEvent): New empty method. (processKeyEvent): Implement. (processKeyBinding): Likewise. (resetKeyboardActions): Rewrite. * javax/swing/KeyStroke.java: Rewrite. * javax/swing/SwingUtilities.java (notifyAction): Implement. (replaceUIActionMap): Likewise. (replaceUIInputMap): Likewise. * javax/swing/plaf/basic/BasicButtonListener.java (focusGained): Implement. (focusLost): Repaint if focusPainted(). (installKeyboardActions): Install pressed / released actions. (uninstallKeyboardActions): Implement. * javax/swing/plaf/basic/BasicButtonUI.java (focusColor): New field. (installDefaults): Load focus color, install input map. (installKeyboardActions): Implement. (uninstallKeyboardActions): Likewise. (paintFocus): Rewrite. * javax/swing/plaf/basic/BasicLookAndFeel.java (Button.focus): New default, midPurple. * javax/swing/plaf/basic/BasicTextUI.java (kit): Make static. (installUI): Get doc from kit, load defaults. (getKeymapName): Implement. (createKeymap): Likewise. (installKeyboardActions): Likewise. (getInputMap): Likewise. (getActionMap): Likewise. (createActionMap): Likewise. * javax/swing/text/AbstractDocument.java (getStartPosition): Implement. (getEndPosition): Likewise. * javax/swing/text/DefaultEditorKit.java (CopyAction): New class. (CutAction): Likewise. (DefaultKeyTypedAction): Likewise. (InsertBreakAction): Likewise. (InsertContentAction): Likewise. (InsertTabAction): Likewise. (PasteAction): Likewise. (defaultActions): New static table. (createCaret): Implement. (getActions): Likewise. * javax/swing/text/JTextComponent.java (KeymapWrapper): New private class. (KeymapActionMap): Likewise. (DefaultKeymap): New class. (keymaps): New static table. (keymap): New field. (getKeymap): Implement. (removeKeymap): Likewise. (addKeymap): Likewise. (setKeymap): Likewise. (loadKeymap): Likewise. (getActions): Likewise. (margin): New field. (JTextComponent): Build and install default keymap. * javax/swing/text/TextAction.java (textAction): Call super properly. (getTextComponent): Implement. * javax/swing/text/Utilities.java (drawTabbedText): Adjust position by ascent. 2004-08-31 David Jee <djee@redhat.com> PR AWT/17156 * gnu/java/awt/peer/gtk/GtkMenuItemPeer.java (setEnabled): Make it a native method. * java/awt/DefaultKeyboardFocusManager.java (postProcessKeyEvent): Only post event if the menu item is active. * java/awt/MenuItem.java: Private field 'enabled' should be true by default. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c (setEnabled): New function. 2004-08-31 David Jee <djee@redhat.com> PR AWT/17059 * gnu/java/awt/peer/gtk/GtkMenuBarPeer.java (nativeSetHelpMenu): New native method declaration. (addHelpMenu): Call nativeSetHelpMenu(). (addMenu): Remove. * java/awt/MenuBar.java (setHelpMenu): Call addNotify() on the new help menu. (add): Call addNotify() on the new menu. (addNotify): Set the help menu if one exists. * java/awt/peer/MenuBarPeer.java (addMenu): Remove. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c (nativeSetHelpMenu): New method. 2004-08-31 Graydon Hoare <graydon@redhat.com> * Makefile.am: Add new files. * Makefile.in: Regenerate. * javax/swing/Box.java: Fix setting of layout in ctor. * javax/swing/JScrollPane.java: Scroll headers as well. * javax/swing/JTable.java: Reimplement. * javax/swing/JViewPort.java: Only add non-null children. * javax/swing/ScrollPaneLayout.java: Correct header calculations. * javax/swing/Timer.java: Fix stopping null waker. * javax/swing/plaf/basic/BasicTableHeaderUI.java: New file. * javax/swing/plaf/basic/BasicTableUI.java: New file. * javax/swing/table/DefaultTableCellRenderer.java: Configure. * javax/swing/table/DefaultTableColumnModel.java: Flesh out. * javax/swing/table/DefaultTableModel.java: Clean up. * javax/swing/table/JTableHeader.java: Implement. 2004-08-31 Mark Wielaard <mark@klomp.org> * javax/swing/JSpinner.java (getChangeListeners): Remove double semi-colon. 2004-08-31 Mark Wielaard <mark@klomp.org> * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c: Declare variables at top of functions/block. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c: Likewise. 2004-08-31 Mark Wielaard <mark@klomp.org> * java/lang/Rectangle.java (intersects): Check r.width and r.height first. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/text/PlainView.java (selectedColor): New field. (unselectedColor): Likewise. (font): Likewise. (updateMetrics): New method. (lineToRect): Likewise. (modelToView): Likewise. (drawSelectedText): Use color from JTextComponent ad draw with Utilities class. (drawUnselectedText): Likewise. (paint): Initialize helper fields. * javax/swing/text/View.java (getChildAllocation): New method. (getViewIndex): Likewise. (getToolTipText): Likewise. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/text/Utilities.java (drawTabbedText): Reimplemented. (getTabbedTextWidth): Likewise. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTextUI.java (installDefaults): Install caret and highlighter. (modelToView): Use Bias.Forward when calling sibling. * javax/swing/text/AbstractDocument.java (ElementEdit): Implements DocumentEvent.ElementChange. (ElementEdit.ElementEdit): New method. (ElementEdit.getChildrenAdded): Likewise. (ElementEdit.getChildrenRemoved): Likewise. (ElementEdit.getElement): Likewise. (ElementEdit.getIndex): Likewise. * javax/swing/text/DefaultCaret.java (color): Removed. (textComponent): Renamed from parent, made private. (selectionVisible): Renamed from vis_sel, made private. (blinkRate): Renamed from blink, made private. (magicCaretPosition): Renamed from magic, made private. (visible): Renamed from vis, made private. (dot): Made private. (mark): Likewise. (deinstall): Remove as MouseMotionListener. (install): Initialize textComponent first. Add as MouseMotionListener. (paint): Reimplemented. * javax/swing/text/JTextComponent.java (setCaret): Deinstall old caret, install new one and fire property change after setting property. (setHighlighter): Deinstall old highlighter, install new one and fire property change after setting property. (setCaretColor): Fire property change after setting property. (setDisabledTextColor): Likewise. (setSelectedTextColor): Likewise. (setSelectionColor): Likewise. (modelToView): New method. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/text/AbstractDocument.java (getText): Simplified. * javax/swing/text/Segment.java (current): New field. (current): Reimplemented. (first): Likewise. (getIndex): Likewise. (last): Likewise. (next): Likewise. (previous): Likewise. (setIndex): Likewise. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicButtonUI.java (defaultTextIconGap): Made protected. (defaultTextShiftOffset): Likewise. (textShiftOffset): New field. (clearTextShiftOffset): New method. (getTextShiftOffset): Likewise. (setTextShiftOffset): Likewise. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTextUI.java (installUI): Add eventHandler as property listener. (uninstallUI): remove eventHandler as propert listener. (installDefaults): Added comment. (installListeners): Likewise. (installKeyboardActions): Likewise. (uninstallDefaults): Likewise. (uninstallListeners): Likewise. (uninstallKeyboardActions): Likewise. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/text/AbstractDocument.java: Fixed some typos in comments. (insertString): Reimplemented. (remove): Likewise. (replace): New method. (children): Dont use fully qualified class name. (DefaultDocumentEvent.offset): Renamed from off. (DefaultDocumentEvent.length): Renamed from len. (DefaultDocumentEvent.type): New field. (DefaultDocumentEvent.DefaultDocumentEvent): New constructor. (DefaultDocumentEvent.getType): Implemented. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTextUI.java (RootView.textComponent): Removed. (RootView.RootView): Don't initialize textComponent. (RootView.getViewFactory): New method. (EventHandler): New inner class. (rootView): Initialize at instance creation. (eventHandler): New field. (installUI): Don't create view hierarchy directly, call modelChanged() instead. (modelChanged): New method. * javax/swing/text/JTextComponent.java (setDocument): Fire property change event. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTextUI.java (RootView.paint): Removed debug output. (paintSafely): Draw highlighter before text. (paintBackground): Use background color of text component. * javax/swing/plaf/basic/BasicToggleButtonUI.java: Reformatted. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicToolBarUI.java (BasicToolBarUI): Fixed arguments for constructor. (createUI): Fixed creation of object. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/DefaultListSelectionModel.java (fireValueChanged): Renamed from fireSelectionValueChanged, made protected. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/text/TabSet.java (TabSet): Implements java.io.Serializable. * javax/swing/text/TabStop.java (TabStop): Implements java.io.Serializable. (TabStop): Made public. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/JComponent.java (setUI): Fire PropertyChange. * javax/swing/JLabel.java (text): Renamed from labelText. (horizontalAlignment): New default vlaue. (icon): Renamed from activeIcon. (displayedMnemonic): Renamed from mnemonicKey, added default value. (displayedMnemonicIndex): Renamed from underlineChar. (setDisplayedMnemonic): Reimplemented. * javax/swing/JRadioButton.java (JRadioButton): New constructors. * javax/swing/JTextField.java (JTextField): Throw exception if colums < 0, initialitialz this.columns directly and initialize document with text conditionally. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicFormattedTextFieldUI.java, javax/swing/plaf/basic/BasicPasswordFieldUI.java, javax/swing/plaf/basic/BasicTextAreaUI.java: New files. * javax/swing/text/FieldView.java (paint): Just call super method for now. * Makefile.am: Added new files. * Makefile.in: Regenerated. 2004-08-31 Ka-Hing Cheung <kahing@javabsp.org> * javax/swing/AbstractSpinnerModel.java, javax/swing/JSpinner.java, javax/swing/SpinnerNumberModel.java, javax/swing/plaf/basic/BasicSpinnerUI.java: New files. * javax/swing/plaf/basic/BasicLookAndFeel.java (initClassDefaults): Added defaults for BasicSpinnerUI. 2004-08-31 Michael Koch <konqueror@gmx.de> * Makefile.am: Added new files. * Makefile.in: Regenerated. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/TransferHandler.java, javax/swing/plaf/basic/ComboPopup.java: New files * Makefile.am: Added javax/swing/TransferHandler.java and javax/swing/plaf/basic/ComboPopup.java * Makefile.in: Regenerated. 2004-08-31 Roman Kennke <roman@ontographics.com> * javax/swing/text/Utilities.java: New file. 2004-08-31 Michael Koch <konqueror@gmx.de> * Makefile.am: Added javax/swing/text/Utilities.java. * Makefile.in: Regenerated. 2004-08-31 Graydon Hoare <graydon@redhat.com> * javax/swing/text/SimpleAttributeSet.java: New file. * javax/swing/text/StyleConstants.java: New file. * javax/swing/text/StyleContext.java: New file. * javax/swing/text/TabSet.java: New file. * javax/swing/text/TabStop.java: New file. * javax/swing/text/AbstactDocument.java: (AbstractElement): Implement attribute support. * javax/swing/text/AttributeSet.java (NameAttribute): New static field. (ResolveAttribute): New static field. * Makefile.am: Update for new files. * Makefile.in: Regenerate. 2004-08-31 Craig Black <craig.black@aonix.com> * gnu/java/awt/peer/gtk/GdkGraphics.java (drawImage): Add support for scaling pixmaps. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (copyAndScalePixmap): New native method. 2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com> PR AWT/16121 * jni/gtk-peer/gthread-jni.c: Include stdio.h. Eliminate type-punning compiler warnings using unions. (throw): Replace bzero with memset. 2004-08-31 Andreas Tobler <a.tobler@schweiz.ch> Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c: Move NSA_PB macros to gtkpeer.h. Include gtkpeer.h. * jni/gtk-peer/gtkpeer.h: Move NSA_PB macros here. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (nativeSetIconImageFromDecoder): Use NSA_GET_PB_PTR macro. 2004-08-31 Mark Wielaard <mark@klomp.org> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c: #include gdk.h, not gtk.h. #include jni.h, native_state.h, string.h and stdlib.h, not gtkpeer.h. (*vm): New static variable. (areaPreparedID): Make static. (areaUpdatedID): Likewise. (area_prepared): Get and use JNIEnv through stored JavaVM *vm. (area_prepared): Likewise. (area_updated): Likewise. (closed): Likewise. (initStaticState): Initialize *vm javaVM. (pumpBytes): Use given env, not global gdk_env. 2004-08-31 Mark Wielaard <mark@klomp.org> * java/awt/geom/CubicCurve2D.java (solveCubic): Removed duplicate comments. 2004-08-31 Sven de Marothy <sven@physto.se> * java/awt/geom/CubicCurve2D.java: Reindent. (contains): Implemented. (intersects): Implemented. * java/awt/geom/QuadCurve2D.java: Likewise. * java/awt/geom/GeneralPath.java: Reindent and document. Fully (re)implemented using separate xpoints and ypoints float[] coords. * java/awt/geom/RoundRectangle2D.java: Several bugfixes (Bug #6007). 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/JMenuItem.java (getMenuDragMouseListeners): New method. (getMenuKeyListeners): Likewise. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractButton.java (model): Made protected. (actionListener): Likewise. (changeListener): Likewise. (itemListener): Likewise. (multiClickThreshhold): New field. (getActionListeners): New method. (getChangeListeners): Likewise. (getItemListeners): Likewise. (fireItemStateChanged): Simplified implementation. (fireActionPerformed): Likewise. (fireStateChanged): Likewise. (getMultiClickThreshhold): New method. (setMultiClickThreshhold): Likewise. 2004-08-31 Tom Tromey <tromey@redhat.com> * java/awt/image/Kernel.java (clone): Use super.clone(). 2004-08-31 David Jee <djee@redhat.com> PR AWT/16682 * gnu/java/awt/peer/gtk/GtkFramePeer.java (nativeSetIconImage): Rename to nativeSetIconImageFromDecoder. (nativeSetIconImageFromData): New native method declaration. (setIconImage): Handle images not produced from GdkPixbufDecoder. * gnu/java/awt/peer/gtk/GtkImage.java (getPixelCache): New method. (getColorModel): New method. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (nativeSetIconImage): Rename to nativeSetIconImageFromDecoder. (free_pixbuf_data): New helper function. (nativeSetIconImageFromData): New function. 2004-08-31 Graydon Hoare <graydon@redhat.com> PR SWING/16576 * javax/swing/JLayeredPane.java (setLayer): Permit changing layer after addition. (setPosition): Permit over-length positions. (layerToRange): Compare intValue()s. * javax/swing/Box.java (createHorizontalBox): Implement. (createRigidArea): Likewise. (createVerticalBox): Likewise. 2004-08-31 Kim Ho <kho@redhat.com> * java/awt/Component.java: (processMouseEvent): Consume event after listeners process it. (processMouseMotionEvent): ditto. (processMouseWheelEvent): ditto. * java/awt/Container.java: (acquireComponentForMouseEvent): Do not dispatch to events that have been removed from the Container. (handleEvent): Consume the MouseEvents. * javax/swing/RepaintManager.java: (paintDirtyRegions): Do not add to list of damaged areas if the component has no root. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicMenuItemUI.java: Clean ip imports. 2004-08-31 Mark Wielaard <mark@klomp.org> * gnu/java/awt/peer/gtk/GtkToolkit.java (getFontPeer): Don't return null when a MissingResourceException is thrown. Should never happen. 2004-08-31 Mark Wielaard <mark@klomp.org> * java/awt/EventQueue.java (postEvent): Throw NullPointerException when argument is null. 2004-08-31 Mark Wielaard <mark@klomp.org> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilter): Define hid at start of function. (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter): Likewise. 2004-08-31 Mark Wielaard <mark@klomp.org> * gnu/java/awt/EmbeddedWindow.java: Reindent. * javax/swing/JButton.java: Reindent. * javax/swing/JCheckBox.java: Reindent. 2004-08-31 Mark Wielaard <mark@klomp.org> * Makefile.am (gtk_c_source_files): Added jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c. (gtk_awt_peer_sources): Added gnu/java/awt/peer/gtk/GThreadMutex.java and gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java. * Makefile.in: Regenerated. 2004-08-31 Archie Cobbs <archie@dellroad.org> * jni/gtk-peer/gthread-jni.c: don't #include nonexistent files 2004-08-31 Steven Augart <augart@watson.ibm.com> * jni/gtk-peer/gthread-jni.c (c-font-lock-extra-types): Added jfieldID, jmethodID. 2004-08-31 Mark Wielaard <mark@klomp.org> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit): Initialize gdk_env before calling any gdk or gtk function. * gnu/java/awt/peer/gtk/GtkMainThread.java (gtkInitCalled): New field. (GtkMainThread): Call wait() in while loop waiting for gtkInitCalled. (run): Set gtkInitCalled. 2004-08-31 Steven Augart <augart@watson.ibm.com> * gnu/java/awt/peer/gtk/GtkMainThread.java (run): Pass the value of the gnu.classpath.awt.gtk.portable.native.sync system property to C. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit): New argument, portableNativeSync. Delegate PORTABLE_NATIVE_SYNC work to init_glib_threads. (init_glib_threads): New function. 2004-08-31 Mark Wielaard <mark@klomp.org> * jni/gtk-peer/gthread-jni.c: Define MIN_, MAX_ and NORM_ PRIORITY when not already defined in header file. 2004-08-31 Mark Wielaard <mark@klomp.org> * jni/gtk-peer/gthread-jni.c (setup_cache): Call ExceptionOccurred, not ExceptionCheck, when we don't have JNI 1.2. 2004-08-31 Steven Augart <augart@watson.ibm.com> * gnu/native/jni/gtk-peer/gthread-jni.c: Indentation fixes. Implemented missing functions for GTK2. Added error handling. Renamed static functions out of the g_ namespace. Added TRACE_API_CALLS, EXPLAIN_TROUBLE, EXPLAIN_BROKEN, EXPLAIN_BADLY_BROKEN, and DELETE_LOCAL_REFS options. Rewrote global-reference code. Eliminated cascading errors. (mutex_trylock_jni_impl) Fully implemented. (cond_timed_wait_jni_impl) Went from millisecond to microsecond resolution. (setup_cache) New function. (mutex_cond_wait_jni_impl, mutex_cond_timed_wait_jni_impl) Fixed bug where they were not unlocking the GMutex associated with the condition variable during the wait on that condition variable. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c, native/jni/gtk-peer/gthread-jni.c, native/jni/gtk-peer/gthread-jni.h (g_thread_jni_functions): Renamed to ... (portable_native_sync_jni_functions): this name. (gdk_vm): Renamed to... (the_vm): this name. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (gdk_vm): Removed duplicate definition. (gtkInit): Removed stray message to stdout. (gtkInit): Use g_malloc and g_free instead of malloc and free. (gtkInit): Fix a const assignment bug. (gtkInit): Simplified code. * gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java, native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c, native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h, gnu/java/awt/peer/gtk/GThreadMutex.java: New files. 2004-08-31 Mark Wielaard <mark@klomp.org> * javax/swing/Box.java: Put FIXME comment above class declaration. * javax/swing/JButton.java: Remove illegal L&F HTML from comments. * javax/swing/JCheckBox.java: Likewise. * javax/swing/JDialog.java: Likewise. * javax/swing/JRadioButton.java: Likewise. * javax/swing/JToggleButton.java: Likewise. * javax/swing/UIManager.java: Likewise. * javax/swing/border/TitledBorder.java: Likewise. * javax/swing/plaf/basic/BasicLabelUI.java: Likewise. * javax/swing/plaf/basic/BasicLookAndFeel.java: Likewise. * javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java: Likewise. * javax/swing/plaf/basic/BasicProgressBarUI.java: Likewise. * javax/swing/plaf/basic/BasicScrollBarUI.java: Likewise. * javax/swing/plaf/basic/BasicSeparatorUI.java: Likewise. * javax/swing/text/JTextComponent.java: Likewise. 2004-08-31 David Jee <djee@redhat.com> PR AWT/16682 * gnu/java/awt/peer/gtk/GtkFramePeer.java (setIconImage): Add a FIXME for unhandled cases. 2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com> PR AWT/16040 * gnu/awt/LightweightRedirector.java: Call getModifiersEx, not getModifiers. Replace old button masks with new ones. * gnu/awt/xlib/XEventLoop.java: Likewise. * gnu/java/awt/peer/gtk/GtkButtonPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkComponentPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Likewise. * gnu/java/awt/peer/gtk/GtkListPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkTextFieldPeer.java: Likewise. * java/awt/AWTKeyStroke.java: Remove old modifier masks. * java/awt/Component.java: Replace old modifier masks with new ones. * java/awt/Container.java: Call getModifiersEx, not getModifiers. * java/awt/DefaultKeyboardFocusManager.java: Likewise. Remove old modifier masks. * javax/swing/JMenuItem.java: Replace old button masks with new ones. * javax/swing/KeyStroke.java: Call getModifiersEx, not getModifiers. * javax/swing/SwingUtilities.java: Likewise. * javax/swing/plaf/basic/BasicButtonListener.java: Likewise. * javax/swing/plaf/basic/BasicInternalFrameUI.java: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c: Replace old mask macros with new ones. * jni/gtk-peer/gtkpeer.h: Replace old button and modifier mask macros with new ones representing new masks. 2004-08-31 Craig Black <craig.black@aonix.com> * gnu/java/awt/peer/gtk/GdkGraphics.java (drawRoundRect): Implemented. (fillRoundRect): Implemented. * gnu/java/awt/peer/gtk/GdkGraphics2D.java (drawRoundRect): Reimplemented to match GdkGraphics. (fillRoundRect): Reimplemented to match GdkGraphics. 2004-08-31 Mark Wielaard <mark@klomp.org> * Makefile.in: Regenerated. 2004-08-31 Michael Koch <konqueror@gmx.de> * gnu/java/awt/EmbeddedWindow.java (addNotify): Use AccessController to allow execution of privileged code. 2004-08-31 Michael Koch <konqueror@gmx.de> * gnu/java/awt/EmbeddedWindow.java (static): Removed. (addNotify): Set peer via reflection. (setWindowPeer): Removed. * gnu/java/awt/natEmbeddedWindow.cc: Removed. * Makefile.am (nat_source_files): Removed gnu/java/awt/natEmbeddedWindow.cc. 2004-08-31 Bryce McKinlay <mckinlay@redhat.com> * Makefile.am: Add gnu/java/security/action/GetPropertyAction.java and gnu/java/security/action/SetAccessibleAction.java. 2004-08-31 Bryce McKinlay <mckinlay@redhat.com> * gnu/java/security/action/GetPropertyAction.java (setParameters): Renamed from 'setName'. New 2-argument form with default value. (run): Pass default 'value' parameter to System.getProperty(). * gnu/java/security/action/SetAccessibleAction.java: Fix javadoc typos. 2004-08-31 Bryce McKinlay <mckinlay@redhat.com> * gnu/java/security/action/GetPropertyAction.java: New class. * gnu/java/security/action/SetAccessibleAction.java: New class. 2004-08-31 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkFramePeer.java (setIconImage): Check if image is null. 2004-08-31 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkFramePeer.java (create): Set the icon image. (nativeSetIconImage): New native method declaration. (setIconImage): Implement. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (nativeSetIconImage): New function. 2004-08-31 Dalibor Topic <robilad@kaffe.org> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (filenameFilterCallback): Declare local variable accepted before use. 2004-08-31 Dalibor Topic <robilad@kaffe.org> * gnu/java/awt/ComponentDataBlitOp.java: Cleaned up imports. 2004-08-31 Tom Tromey <tromey@redhat.com> * gnu/java/awt/peer/GLightweightPeer.java, gnu/java/awt/peer/gtk/GdkGraphics2D.java, gnu/java/awt/peer/gtk/GtkComponentPeer.java, javax/swing/JScrollPane.java: Removed redundant imports. 2004-08-31 David Jee <djee@redhat.com> * java/awt/DefaultKeyboardFocusManager.java (postProcessKeyEvent): Only activate MenuShortcuts on KEY_PRESSED event. Fix shift modifier checking. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c (accel_attach): Remove. (setupAccelGroup): Remove calls to accel_attach. 2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkArg.java: Remove file. * gnu/java/awt/peer/gtk/GtkArgList.java: Remove file. * Makefile.am (gtk_awt_peer_sources): Remove GtkArg.java and GtkArgList.java. (gtk_c_files): Use CAIRO_CFLAGS and PANGOFT2_CFLAGS, not _LIBS. * Makefile.in: Regenerate. * gnu/java/awt/peer/gtk/GtkButtonPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c (create(String)): New method. (create): Call new create method. (getArgs): Remove method. * gnu/java/awt/peer/gtk/GtkCheckboxPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c (nativeCreate): Rename to create. (gtkSetLabel): Rename to gtkButtonSetLabel. (gtkToggleButtonSetActive): New method. (create): Call gtkToggleButtonSetActive and gtkButtonSetLabel. (setState): Replace set call with gtkToggleButtonSetActive. (setLabel): Replace gtkSetLabel call with gtkButtonSetLabel. (getArgs): Remove method. * gnu/java/awt/peer/gtk/GtkComponentPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (gtkWidgetSetSensitive): New method. (gtkWidgetSetParent): Likewise. (GtkComponentPeer): Call setParent, setComponentBounds and setVisibleAndEnabled. (setParent): New method. (setComponentBounds): New method. (setVisibleAndEnabled): New method. (setEnabled): Call gtkWidgetSetSensitive. (getArgs): Remove method. Remove all set methods. * gnu/java/awt/peer/gtk/GtkDialogPeer.java (create): Call gtkWindowSetModal, setTitle and setResizable. (getArgs): Remove method. * gnu/java/awt/peer/gtk/GtkFileDialogPeer.java (setComponentBounds): New method. * gnu/java/awt/peer/gtk/GtkFramePeer.java (setResizable): Replace set call with gtkWindowSetResizable. (getArgs): Remove method. (create): Call setTitle and setResizable. * gnu/java/awt/peer/gtk/GtkWindowPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (gtkWindowSetTitle): New method. (gtkWindowSetResizable): New method. (gtkWindowSetModal): New method. (setParent): New method. (setVisibleAndEnabled): New method. (getArgs): Remove method. (setTitle): Call gtkWindowSetTitle. (setResizable): Call gtkWindowSetResizable. * jni/gtk-peer/gtkpeer.h [DEBUG_LOCKING]: New define to turn on and off locking instrumentation. 2004-08-31 Kim Ho <kho@redhat.com> * Makefile.am: Add new file. * Makefile.in: Regenerate. * gcj/Makefile.in: Regenerate * include/Makefile.in: * java/awt/Container.java: (acquireComponentForMouseEvent): Respect the event mask when looking for candidate. * javax/swing/JComponent.java: Remove toolTip field. (createToolTip): Create a tooltip on demand. (setToolTipText): Register with the ToolTipManager. (getToolTipText(MouseEvent)): Return getToolTipText(). * javax/swing/JToolTip.java: Implement. * javax/swing/Timer.java: Jalopy. (restart): Call stop, then start. (stop): Interrupt the timer rather than wait for the timer to come to a stop naturally. * javax/swing/ToolTipManager.java: Implement. * javax/swing/plaf/basic/BasicLookAndFeel.java: Change ToolTip.background color. * javax/swing/plaf/basic/BasicToolTipUI.java: Implement. * testsuite/Makefile.in: Regenerate 2004-08-31 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/DirectColorModel.java (DirectColorModel): Fix constructor param comments. 2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com> * java/awt/Component.java: Document AWT 1.0 event handler methods. 2004-08-31 Roman Kennke <roman@ontographics.com> * javax/swing/Box.java: (createGlue): Implemented (createHorizontalGlue): Implemented (createHorizontalStrut): Implemented (createVerticalGlue): Implemented (createVerticalStrut): Implemented 2004-08-31 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkChoicePeer.java (GtkChoicePeer): Do not automatically select first item. (getHistory): Remove. (nativeGetSelected): New method. (nativeRemoveAll): New method. (add): Use nativeGetSelected() instead of getHistory(). (remove): Likewise. (removeAll): Call nativeRemoveAll(). * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c (create): Migrate to GtkComboBox. (append): Likewise. (nativeAdd): Likewise. (nativeRemove): Likewise. (select): Likewise. (nativeRemoveAll): New method. (nativeGetSelected): New method. (selection_changed): New method. (getHistory): Remove. (item_activate): Remove. (item_removed): Remove. (connect_choice_item_selectable_hook): Remove. 2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkTextFieldPeer.java (create): Use tf variable in setEditable call. * gnu/java/awt/peer/gtk/GtkTextFieldPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c (gtkWidgetSetBackground): New method. (gtkWidgetSetForeground): Likewise. (create): Set peer's editable state based on awtComponent's. * java/awt/Button.java (Button()): Use empty string rather than null in no-label constructor. 2004-08-31 Roman Kennke <roman@ontographics.com> * javax/swing/BoxLayout.java: Reimplement. 2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics.java, gnu_java_awt_peer_gtk_GdkGraphics.c (initState(GtkComponentPeer)): Don't return array of colour values. (GdkGraphics(int,int)): Set default font to size 12. (GdkGraphics(GtkComponentPeer)): Set graphics colour to component's foreground colour. * gnu/java/awt/peer/gtk/GdkGraphics2D.java, gnu_java_awt_peer_gtk_GdkGraphics2D.c (initState(GtkComponentPeer)): Don't return array of colour values. (GdkGraphics2D(GtkComponentPeer)): Set foreground and background colours to component's colours. (current_colors_of_widget): Remove function. * gnu/java/awt/peer/gtk/GtkOffScreenImage.java (getGraphics): Return a new graphics object. * java/awt/Font.java (toString): Fix format. * java/awt/Graphics.java (toString): Likewise. 2004-08-31 Craig Black <craig.black@aonix.com> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c (addTearOff): New function. * gnu/java/awt/peer/gtk/GtkMenuPeer.java (addTearOff): New native method. (init): Call addTearOff() when menu.isTearOff(). 2004-08-31 Bryce McKinlay <mckinlay@redhat.com> * gnu/java/awt/ClasspathToolkit.java (createImageProducer): New. Default implementation. * gnu/java/awt/peer/gtk/GtkToolkit.java (createImageProducer): New. Implement using GdkPixbufDecoder. 2004-08-31 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java (GtkComponentPeer): Use gtkWidgetGetPreferredDimensions() for setting the size of GtkFileDialogPeers. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (gtkWidgetGetPreferredDimensions): For widgets extending GtkWindow, use their default sizes rather than their natural requisitions. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/JFormattedTextField.java (JFormattedTextField): Implemented. * javax/swing/text/DefaultEditorKit.java (BeepAction): New inner class. * javax/swing/text/Segment.java (partialReturn): New field. (setPartialReturn): New method. (isPartialReturn): Likewise. * javax/swing/text/View.java (createFragment): Fixed typo. (getStartOffset): New method. (getEndOffset): Likewise. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/table/DefaultTableColumnModel.java (serialVersionUID): Made private. (listenerList): Initialize. (changeEvent): Initialize. * javax/swing/table/JTableHeader.java (JTableHeader): New constructors. (createDefaultColumnModel): New method. * javax/swing/table/TableColumn.java (setHeaderRenderer): Simplified code. (setCellRenderer): Likewise. (setWidth): Likewise. From-SVN: r86956
1009 lines
34 KiB
Java
1009 lines
34 KiB
Java
/* Color.java -- represents a color in Java
|
|
Copyright (C) 1999, 2002 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 java.awt;
|
|
|
|
import java.awt.color.ColorSpace;
|
|
import java.awt.geom.AffineTransform;
|
|
import java.awt.geom.Rectangle2D;
|
|
import java.awt.image.ColorModel;
|
|
import java.io.Serializable;
|
|
|
|
/**
|
|
* This class represents a color value in the AWT system. It uses the sRGB
|
|
* (standard Red-Green-Blue) system, along with an alpha value ranging from
|
|
* transparent (0.0f or 0) and opaque (1.0f or 255). The color is not
|
|
* pre-multiplied by the alpha value an any of the accessor methods. Further
|
|
* information about sRGB can be found at
|
|
* <a href="http://www.w3.org/pub/WWW/Graphics/Color/sRGB.html">
|
|
* http://www.w3.org/pub/WWW/Graphics/Color/sRGB.html</a>.
|
|
*
|
|
* @author Aaron M. Renn <arenn@urbanophile.com>
|
|
* @see ColorSpace
|
|
* @see AlphaComposite
|
|
* @since 1.0
|
|
* @status updated to 1.4
|
|
*/
|
|
public class Color implements Paint, Serializable
|
|
{
|
|
/**
|
|
* Compatible with JDK 1.0+.
|
|
*/
|
|
private static final long serialVersionUID = 118526816881161077L;
|
|
|
|
/** Constant for the color white: R=255, G=255, B=255. */
|
|
public static final Color white = new Color(0xffffff, false);
|
|
|
|
/**
|
|
* Constant for the color white: R=255, G=255, B=255.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static final Color WHITE = white;
|
|
|
|
/** Constant for the color light gray: R=192, G=192, B=192. */
|
|
public static final Color lightGray = new Color(0xc0c0c0, false);
|
|
|
|
/**
|
|
* Constant for the color light gray: R=192, G=192, B=192.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static final Color LIGHT_GRAY = lightGray;
|
|
|
|
/** Constant for the color gray: R=128, G=128, B=128. */
|
|
public static final Color gray = new Color(0x808080, false);
|
|
|
|
/**
|
|
* Constant for the color gray: R=128, G=128, B=128.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static final Color GRAY = gray;
|
|
|
|
/** Constant for the color dark gray: R=64, G=64, B=64. */
|
|
public static final Color darkGray = new Color(0x404040, false);
|
|
|
|
/**
|
|
* Constant for the color dark gray: R=64, G=64, B=64.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static final Color DARK_GRAY = darkGray;
|
|
|
|
/** Constant for the color black: R=0, G=0, B=0. */
|
|
public static final Color black = new Color(0x000000, false);
|
|
|
|
/**
|
|
* Constant for the color black: R=0, G=0, B=0.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static final Color BLACK = black;
|
|
|
|
/** Constant for the color red: R=255, G=0, B=0. */
|
|
public static final Color red = new Color(0xff0000, false);
|
|
|
|
/**
|
|
* Constant for the color red: R=255, G=0, B=0.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static final Color RED = red;
|
|
|
|
/** Constant for the color pink: R=255, G=175, B=175. */
|
|
public static final Color pink = new Color(0xffafaf, false);
|
|
|
|
/**
|
|
* Constant for the color pink: R=255, G=175, B=175.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static final Color PINK = pink;
|
|
|
|
/** Constant for the color orange: R=255, G=200, B=0. */
|
|
public static final Color orange = new Color(0xffc800, false);
|
|
|
|
/**
|
|
* Constant for the color orange: R=255, G=200, B=0.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static final Color ORANGE = orange;
|
|
|
|
/** Constant for the color yellow: R=255, G=255, B=0. */
|
|
public static final Color yellow = new Color(0xffff00, false);
|
|
|
|
/**
|
|
* Constant for the color yellow: R=255, G=255, B=0.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static final Color YELLOW = yellow;
|
|
|
|
/** Constant for the color green: R=0, G=255, B=0. */
|
|
public static final Color green = new Color(0x00ff00, false);
|
|
|
|
/**
|
|
* Constant for the color green: R=0, G=255, B=0.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static final Color GREEN = green;
|
|
|
|
/** Constant for the color magenta: R=255, G=0, B=255. */
|
|
public static final Color magenta = new Color(0xff00ff, false);
|
|
|
|
/**
|
|
* Constant for the color magenta: R=255, G=0, B=255.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static final Color MAGENTA = magenta;
|
|
|
|
/** Constant for the color cyan: R=0, G=255, B=255. */
|
|
public static final Color cyan = new Color(0x00ffff, false);
|
|
|
|
/**
|
|
* Constant for the color cyan: R=0, G=255, B=255.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static final Color CYAN = cyan;
|
|
|
|
/** Constant for the color blue: R=0, G=0, B=255. */
|
|
public static final Color blue = new Color(0x0000ff, false);
|
|
|
|
/**
|
|
* Constant for the color blue: R=0, G=0, B=255.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static final Color BLUE = blue;
|
|
|
|
/** Internal mask for red. */
|
|
private static final int RED_MASK = 255 << 16;
|
|
|
|
/** Internal mask for green. */
|
|
private static final int GREEN_MASK = 255 << 8;
|
|
|
|
/** Internal mask for blue. */
|
|
private static final int BLUE_MASK = 255;
|
|
|
|
/** Internal mask for alpha. Package visible for use in subclass. */
|
|
static final int ALPHA_MASK = 255 << 24;
|
|
|
|
/** Amount to scale a color by when brightening or darkening. */
|
|
private static final float BRIGHT_SCALE = 0.7f;
|
|
|
|
/**
|
|
* The color value, in sRGB. Note that the actual color may be more
|
|
* precise if frgbvalue or fvalue is non-null. This class stores alpha, red,
|
|
* green, and blue, each 0-255, packed in an int. However, the subclass
|
|
* SystemColor stores an index into an array. Therefore, for serial
|
|
* compatibility (and because of poor design on Sun's part), this value
|
|
* cannot be used directly; instead you must use <code>getRGB()</code>.
|
|
*
|
|
* @see #getRGB()
|
|
* @serial the value of the color, whether an RGB literal or array index
|
|
*/
|
|
final int value;
|
|
|
|
/**
|
|
* The color value, in sRGB. This may be null if the color was constructed
|
|
* with ints; and it does not include alpha. This stores red, green, and
|
|
* blue, in the range 0.0f - 1.0f.
|
|
*
|
|
* @see #getRGBColorComponents(float[])
|
|
* @see #getRGBComponents(float[])
|
|
* @serial the rgb components of the value
|
|
* @since 1.2
|
|
*/
|
|
private float[] frgbvalue;
|
|
|
|
/**
|
|
* The color value, in the native ColorSpace components. This may be null
|
|
* if the color was constructed with ints or in the sRGB color space; and
|
|
* it does not include alpha.
|
|
*
|
|
* @see #getRGBColorComponents(float[])
|
|
* @see #getRGBComponents(float[])
|
|
* @serial the original color space components of the color
|
|
* @since 1.2
|
|
*/
|
|
private float[] fvalue;
|
|
|
|
/**
|
|
* The alpha value. This is in the range 0.0f - 1.0f, but is invalid if
|
|
* deserialized as 0.0 when frgbvalue is null.
|
|
*
|
|
* @see #getRGBComponents(float[])
|
|
* @see #getComponents(float[])
|
|
* @serial the alpha component of this color
|
|
* @since 1.2
|
|
*/
|
|
private final float falpha;
|
|
|
|
/**
|
|
* The ColorSpace. Null means the default sRGB space.
|
|
*
|
|
* @see #getColor(String)
|
|
* @see #getColorSpace()
|
|
* @see #getColorComponents(float[])
|
|
* @serial the color space for this color
|
|
* @since 1.2
|
|
*/
|
|
private final ColorSpace cs;
|
|
|
|
/**
|
|
* The paint context for this solid color. Package visible for use in
|
|
* subclass.
|
|
*/
|
|
transient ColorPaintContext context;
|
|
|
|
/**
|
|
* Initializes a new instance of <code>Color</code> using the specified
|
|
* red, green, and blue values, which must be given as integers in the
|
|
* range of 0-255. Alpha will default to 255 (opaque). When drawing to
|
|
* screen, the actual color may be adjusted to the best match of hardware
|
|
* capabilities.
|
|
*
|
|
* @param red the red component of the RGB value
|
|
* @param green the green component of the RGB value
|
|
* @param blue the blue component of the RGB value
|
|
* @throws IllegalArgumentException if the values are out of range 0-255
|
|
* @see #getRed()
|
|
* @see #getGreen()
|
|
* @see #getBlue()
|
|
* @see #getRGB()
|
|
* @see #Color(int, int, int, int)
|
|
*/
|
|
public Color(int red, int green, int blue)
|
|
{
|
|
this(red, green, blue, 255);
|
|
}
|
|
|
|
/**
|
|
* Initializes a new instance of <code>Color</code> using the specified
|
|
* red, green, blue, and alpha values, which must be given as integers in
|
|
* the range of 0-255. When drawing to screen, the actual color may be
|
|
* adjusted to the best match of hardware capabilities.
|
|
*
|
|
* @param red the red component of the RGB value
|
|
* @param green the green component of the RGB value
|
|
* @param blue the blue component of the RGB value
|
|
* @param alpha the alpha value of the color
|
|
* @throws IllegalArgumentException if the values are out of range 0-255
|
|
* @see #getRed()
|
|
* @see #getGreen()
|
|
* @see #getBlue()
|
|
* @see #getAlpha()
|
|
* @see #getRGB()
|
|
*/
|
|
public Color(int red, int green, int blue, int alpha)
|
|
{
|
|
if ((red & 255) != red || (green & 255) != green || (blue & 255) != blue
|
|
|| (alpha & 255) != alpha)
|
|
throw new IllegalArgumentException("Bad RGB values"
|
|
+" red=0x"+Integer.toHexString(red)
|
|
+" green=0x"+Integer.toHexString(green)
|
|
+" blue=0x"+Integer.toHexString(blue)
|
|
+" alpha=0x"+Integer.toHexString(alpha) );
|
|
|
|
value = (alpha << 24) | (red << 16) | (green << 8) | blue;
|
|
falpha = 1;
|
|
cs = null;
|
|
}
|
|
|
|
/**
|
|
* Initializes a new instance of <code>Color</code> using the specified
|
|
* RGB value. The blue value is in bits 0-7, green in bits 8-15, and
|
|
* red in bits 16-23. The other bits are ignored. The alpha value is set
|
|
* to 255 (opaque). When drawing to screen, the actual color may be
|
|
* adjusted to the best match of hardware capabilities.
|
|
*
|
|
* @param value the RGB value
|
|
* @see ColorModel#getRGBdefault()
|
|
* @see #getRed()
|
|
* @see #getGreen()
|
|
* @see #getBlue()
|
|
* @see #getRGB()
|
|
* @see #Color(int, boolean)
|
|
*/
|
|
public Color(int value)
|
|
{
|
|
this(value, false);
|
|
}
|
|
|
|
/**
|
|
* Initializes a new instance of <code>Color</code> using the specified
|
|
* RGB value. The blue value is in bits 0-7, green in bits 8-15, and
|
|
* red in bits 16-23. The alpha value is in bits 24-31, unless hasalpha
|
|
* is false, in which case alpha is set to 255. When drawing to screen, the
|
|
* actual color may be adjusted to the best match of hardware capabilities.
|
|
*
|
|
* @param value the RGB value
|
|
* @param hasalpha true if value includes the alpha
|
|
* @see ColorModel#getRGBdefault()
|
|
* @see #getRed()
|
|
* @see #getGreen()
|
|
* @see #getBlue()
|
|
* @see #getAlpha()
|
|
* @see #getRGB()
|
|
*/
|
|
public Color(int value, boolean hasalpha)
|
|
{
|
|
// Note: SystemColor calls this constructor, setting falpha to 0; but
|
|
// code in getRGBComponents correctly reports falpha as 1.0 to the user
|
|
// for all instances of SystemColor since frgbvalue is left null here.
|
|
if (hasalpha)
|
|
falpha = ((value & ALPHA_MASK) >> 24) / 255f;
|
|
else
|
|
{
|
|
value |= ALPHA_MASK;
|
|
falpha = 1;
|
|
}
|
|
this.value = value;
|
|
cs = null;
|
|
}
|
|
|
|
/**
|
|
* Initializes a new instance of <code>Color</code> using the specified
|
|
* RGB values. These must be in the range of 0.0-1.0. Alpha is assigned
|
|
* the value of 1.0 (opaque). When drawing to screen, the actual color may
|
|
* be adjusted to the best match of hardware capabilities.
|
|
*
|
|
* @param red the red component of the RGB value
|
|
* @param green the green component of the RGB value
|
|
* @param blue the blue component of the RGB value
|
|
* @throws IllegalArgumentException tf the values are out of range 0.0f-1.0f
|
|
* @see #getRed()
|
|
* @see #getGreen()
|
|
* @see #getBlue()
|
|
* @see #getRGB()
|
|
* @see #Color(float, float, float, float)
|
|
*/
|
|
public Color(float red, float green, float blue)
|
|
{
|
|
this(red, green, blue, 1.0f);
|
|
}
|
|
|
|
/**
|
|
* Initializes a new instance of <code>Color</code> using the specified
|
|
* RGB and alpha values. These must be in the range of 0.0-1.0. When drawing
|
|
* to screen, the actual color may be adjusted to the best match of
|
|
* hardware capabilities.
|
|
*
|
|
* @param red the red component of the RGB value
|
|
* @param green the green component of the RGB value
|
|
* @param blue the blue component of the RGB value
|
|
* @param alpha the alpha value of the color
|
|
* @throws IllegalArgumentException tf the values are out of range 0.0f-1.0f
|
|
* @see #getRed()
|
|
* @see #getGreen()
|
|
* @see #getBlue()
|
|
* @see #getAlpha()
|
|
* @see #getRGB()
|
|
*/
|
|
public Color(float red, float green, float blue, float alpha)
|
|
{
|
|
value = convert(red, green, blue, alpha);
|
|
frgbvalue = new float[] {red, green, blue};
|
|
falpha = alpha;
|
|
cs = null;
|
|
}
|
|
|
|
/**
|
|
* Creates a color in the given ColorSpace with the specified alpha. The
|
|
* array must be non-null and have enough elements for the color space
|
|
* (for example, RGB requires 3 elements, CMYK requires 4). When drawing
|
|
* to screen, the actual color may be adjusted to the best match of
|
|
* hardware capabilities.
|
|
*
|
|
* @param space the color space of components
|
|
* @param components the color components, except alpha
|
|
* @param alpha the alpha value of the color
|
|
* @throws NullPointerException if cpsace or components is null
|
|
* @throws ArrayIndexOutOfBoundsException if components is too small
|
|
* @throws IllegalArgumentException if alpha or any component is out of range
|
|
* @see #getComponents(float[])
|
|
* @see #getColorComponents(float[])
|
|
*/
|
|
public Color(ColorSpace space, float[] components, float alpha)
|
|
{
|
|
frgbvalue = space.toRGB(components);
|
|
fvalue = components;
|
|
falpha = alpha;
|
|
cs = space;
|
|
value = convert(frgbvalue[0], frgbvalue[1], frgbvalue[2], alpha);
|
|
}
|
|
|
|
/**
|
|
* Returns the red value for this color, as an integer in the range 0-255
|
|
* in the sRGB color space.
|
|
*
|
|
* @return the red value for this color
|
|
* @see #getRGB()
|
|
*/
|
|
public int getRed()
|
|
{
|
|
// Do not inline getRGB() to value, because of SystemColor.
|
|
return (getRGB() & RED_MASK) >> 16;
|
|
}
|
|
|
|
/**
|
|
* Returns the green value for this color, as an integer in the range 0-255
|
|
* in the sRGB color space.
|
|
*
|
|
* @return the green value for this color
|
|
* @see #getRGB()
|
|
*/
|
|
public int getGreen()
|
|
{
|
|
// Do not inline getRGB() to value, because of SystemColor.
|
|
return (getRGB() & GREEN_MASK) >> 8;
|
|
}
|
|
|
|
/**
|
|
* Returns the blue value for this color, as an integer in the range 0-255
|
|
* in the sRGB color space.
|
|
*
|
|
* @return the blue value for this color
|
|
* @see #getRGB()
|
|
*/
|
|
public int getBlue()
|
|
{
|
|
// Do not inline getRGB() to value, because of SystemColor.
|
|
return getRGB() & BLUE_MASK;
|
|
}
|
|
|
|
/**
|
|
* Returns the alpha value for this color, as an integer in the range 0-255.
|
|
*
|
|
* @return the alpha value for this color
|
|
* @see #getRGB()
|
|
*/
|
|
public int getAlpha()
|
|
{
|
|
// Do not inline getRGB() to value, because of SystemColor.
|
|
return (getRGB() & ALPHA_MASK) >>> 24;
|
|
}
|
|
|
|
/**
|
|
* Returns the RGB value for this color, in the sRGB color space. The blue
|
|
* value will be in bits 0-7, green in 8-15, red in 16-23, and alpha value in
|
|
* 24-31.
|
|
*
|
|
* @return the RGB value for this color
|
|
* @see ColorModel#getRGBdefault()
|
|
* @see #getRed()
|
|
* @see #getGreen()
|
|
* @see #getBlue()
|
|
* @see #getAlpha()
|
|
*/
|
|
public int getRGB()
|
|
{
|
|
return value;
|
|
}
|
|
|
|
/**
|
|
* Returns a brighter version of this color. This is done by increasing the
|
|
* RGB values by an arbitrary scale factor. The new color is opaque (an
|
|
* alpha of 255). Note that this method and the <code>darker()</code>
|
|
* method are not necessarily inverses.
|
|
*
|
|
* @return a brighter version of this color
|
|
* @see #darker()
|
|
*/
|
|
public Color brighter()
|
|
{
|
|
// Do not inline getRGB() to this.value, because of SystemColor.
|
|
int value = getRGB();
|
|
int red = (value & RED_MASK) >> 16;
|
|
int green = (value & GREEN_MASK) >> 8;
|
|
int blue = value & BLUE_MASK;
|
|
// We have to special case 0-2 because they won't scale by division.
|
|
red = red < 3 ? 3 : (int) Math.min(255, red / BRIGHT_SCALE);
|
|
green = green < 3 ? 3 : (int) Math.min(255, green / BRIGHT_SCALE);
|
|
blue = blue < 3 ? 3 : (int) Math.min(255, blue / BRIGHT_SCALE);
|
|
return new Color(red, green, blue, 255);
|
|
}
|
|
|
|
/**
|
|
* Returns a darker version of this color. This is done by decreasing the
|
|
* RGB values by an arbitrary scale factor. The new color is opaque (an
|
|
* alpha of 255). Note that this method and the <code>brighter()</code>
|
|
* method are not necessarily inverses.
|
|
*
|
|
* @return a darker version of this color
|
|
* @see #brighter()
|
|
*/
|
|
public Color darker()
|
|
{
|
|
// Do not inline getRGB() to this.value, because of SystemColor.
|
|
int value = getRGB();
|
|
return new Color((int) (((value & RED_MASK) >> 16) * BRIGHT_SCALE),
|
|
(int) (((value & GREEN_MASK) >> 8) * BRIGHT_SCALE),
|
|
(int) ((value & BLUE_MASK) * BRIGHT_SCALE), 255);
|
|
}
|
|
|
|
/**
|
|
* Returns a hash value for this color. This is simply the color in 8-bit
|
|
* precision, in the format 0xAARRGGBB (alpha, red, green, blue).
|
|
*
|
|
* @return a hash value for this color
|
|
*/
|
|
public int hashCode()
|
|
{
|
|
return value;
|
|
}
|
|
|
|
/**
|
|
* Tests this object for equality against the specified object. This will
|
|
* be true if and only if the specified object is an instance of
|
|
* <code>Color</code> and has the same 8-bit integer red, green, and blue
|
|
* values as this object. Note that two colors may be slightly different
|
|
* as float values, but round to the same integer values. Also note that
|
|
* this does not accurately compare SystemColors, since that class does
|
|
* not store its internal data in RGB format like regular colors.
|
|
*
|
|
* @param obj the object to compare to
|
|
* @return true if the specified object is semantically equal to this one
|
|
*/
|
|
public boolean equals(Object obj)
|
|
{
|
|
return obj instanceof Color && ((Color) obj).value == value;
|
|
}
|
|
|
|
/**
|
|
* Returns a string representation of this object. Subclasses may return
|
|
* any desired format, except for null, but this implementation returns
|
|
* <code>getClass().getName() + "[r=" + getRed() + ",g=" + getGreen()
|
|
* + ",b=" + getBlue() + ']'</code>.
|
|
*
|
|
* @return a string representation of this object
|
|
*/
|
|
public String toString()
|
|
{
|
|
return getClass().getName() + "[r=" + ((value & RED_MASK) >> 16)
|
|
+ ",g=" + ((value & GREEN_MASK) >> 8) + ",b=" + (value & BLUE_MASK)
|
|
+ ']';
|
|
}
|
|
|
|
/**
|
|
* Converts the specified string to a number, using Integer.decode, and
|
|
* creates a new instance of <code>Color</code> from the value. The alpha
|
|
* value will be 255 (opaque).
|
|
*
|
|
* @param str the numeric color string
|
|
* @return a new instance of <code>Color</code> for the string
|
|
* @throws NumberFormatException if the string cannot be parsed
|
|
* @throws NullPointerException if the string is null
|
|
* @see Integer#decode(String)
|
|
* @see #Color(int)
|
|
* @since 1.1
|
|
*/
|
|
public static Color decode(String str)
|
|
{
|
|
return new Color(Integer.decode(str).intValue(), false);
|
|
}
|
|
|
|
/**
|
|
* Returns a new instance of <code>Color</code> from the value of the
|
|
* system property named by the specified string. If the property does not
|
|
* exist, or cannot be parsed, then <code>null</code> will be returned.
|
|
*
|
|
* @param prop the system property to retrieve
|
|
* @throws SecurityException if getting the property is denied
|
|
* @see #getColor(String, Color)
|
|
* @see Integer#getInteger(String)
|
|
*/
|
|
public static Color getColor(String prop)
|
|
{
|
|
return getColor(prop, null);
|
|
}
|
|
|
|
/**
|
|
* Returns a new instance of <code>Color</code> from the value of the
|
|
* system property named by the specified string. If the property does
|
|
* not exist, or cannot be parsed, then the default color value will be
|
|
* returned.
|
|
*
|
|
* @param prop the system property to retrieve
|
|
* @param defcolor the default color
|
|
* @throws SecurityException if getting the property is denied
|
|
* @see Integer#getInteger(String)
|
|
*/
|
|
public static Color getColor(String prop, Color defcolor)
|
|
{
|
|
Integer val = Integer.getInteger(prop, null);
|
|
return val == null ? defcolor
|
|
: new Color(val.intValue(), false);
|
|
}
|
|
|
|
/**
|
|
* Returns a new instance of <code>Color</code> from the value of the
|
|
* system property named by the specified string. If the property does
|
|
* not exist, or cannot be parsed, then the default RGB value will be
|
|
* used to create a return value.
|
|
*
|
|
* @param prop the system property to retrieve
|
|
* @param defrgb the default RGB value
|
|
* @throws SecurityException if getting the property is denied
|
|
* @see #getColor(String, Color)
|
|
* @see Integer#getInteger(String, int)
|
|
*/
|
|
public static Color getColor(String prop, int defrgb)
|
|
{
|
|
Color c = getColor(prop, null);
|
|
return c == null ? new Color(defrgb, false) : c;
|
|
}
|
|
|
|
/**
|
|
* Converts from the HSB (hue, saturation, brightness) color model to the
|
|
* RGB (red, green, blue) color model. The hue may be any floating point;
|
|
* it's fractional portion is used to select the angle in the HSB model.
|
|
* The saturation and brightness must be between 0 and 1. The result is
|
|
* suitable for creating an RGB color with the one-argument constructor.
|
|
*
|
|
* @param hue the hue of the HSB value
|
|
* @param saturation the saturation of the HSB value
|
|
* @param brightness the brightness of the HSB value
|
|
* @return the RGB value
|
|
* @see #getRGB()
|
|
* @see #Color(int)
|
|
* @see ColorModel#getRGBdefault()
|
|
*/
|
|
public static int HSBtoRGB(float hue, float saturation, float brightness)
|
|
{
|
|
if (saturation == 0)
|
|
return convert(brightness, brightness, brightness, 0);
|
|
if (saturation < 0 || saturation > 1 || brightness < 0 || brightness > 1)
|
|
throw new IllegalArgumentException();
|
|
hue = hue - (float) Math.floor(hue);
|
|
int i = (int) (6 * hue);
|
|
float f = 6 * hue - i;
|
|
float p = brightness * (1 - saturation);
|
|
float q = brightness * (1 - saturation * f);
|
|
float t = brightness * (1 - saturation * (1 - f));
|
|
switch (i)
|
|
{
|
|
case 0:
|
|
return convert(brightness, t, p, 0);
|
|
case 1:
|
|
return convert(q, brightness, p, 0);
|
|
case 2:
|
|
return convert(p, brightness, t, 0);
|
|
case 3:
|
|
return convert(p, q, brightness, 0);
|
|
case 4:
|
|
return convert(t, p, brightness, 0);
|
|
case 5:
|
|
return convert(brightness, p, q, 0);
|
|
default:
|
|
throw new InternalError("impossible");
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Converts from the RGB (red, green, blue) color model to the HSB (hue,
|
|
* saturation, brightness) color model. If the array is null, a new one
|
|
* is created, otherwise it is recycled. The results will be in the range
|
|
* 0.0-1.0 if the inputs are in the range 0-255.
|
|
*
|
|
* @param red the red part of the RGB value
|
|
* @param green the green part of the RGB value
|
|
* @param blue the blue part of the RGB value
|
|
* @param array an array for the result (at least 3 elements), or null
|
|
* @return the array containing HSB value
|
|
* @throws ArrayIndexOutOfBoundsException of array is too small
|
|
* @see #getRGB()
|
|
* @see #Color(int)
|
|
* @see ColorModel#getRGBdefault()
|
|
*/
|
|
public static float[] RGBtoHSB(int red, int green, int blue, float array[])
|
|
{
|
|
if (array == null)
|
|
array = new float[3];
|
|
// Calculate brightness.
|
|
int min;
|
|
int max;
|
|
if (red < green)
|
|
{
|
|
min = red;
|
|
max = green;
|
|
}
|
|
else
|
|
{
|
|
min = green;
|
|
max = red;
|
|
}
|
|
if (blue > max)
|
|
max = blue;
|
|
else if (blue < min)
|
|
min = blue;
|
|
array[2] = max / 255f;
|
|
// Calculate saturation.
|
|
if (max == 0)
|
|
array[1] = 0;
|
|
else
|
|
array[1] = (max - min) / max;
|
|
// Calculate hue.
|
|
if (array[1] == 0)
|
|
array[0] = 0;
|
|
else
|
|
{
|
|
float delta = (max - min) * 6;
|
|
if (red == max)
|
|
array[0] = (green - blue) / delta;
|
|
else if (green == max)
|
|
array[0] = 1f / 3 + (blue - red) / delta;
|
|
else
|
|
array[0] = 2f / 3 + (red - green) / delta;
|
|
if (array[0] < 0)
|
|
array[0]++;
|
|
}
|
|
return array;
|
|
}
|
|
|
|
/**
|
|
* Returns a new instance of <code>Color</code> based on the specified
|
|
* HSB values. The hue may be any floating point; it's fractional portion
|
|
* is used to select the angle in the HSB model. The saturation and
|
|
* brightness must be between 0 and 1.
|
|
*
|
|
* @param hue the hue of the HSB value
|
|
* @param saturation the saturation of the HSB value
|
|
* @param brightness the brightness of the HSB value
|
|
* @return the new <code>Color</code> object
|
|
*/
|
|
public static Color getHSBColor(float hue, float saturation,
|
|
float brightness)
|
|
{
|
|
return new Color(HSBtoRGB(hue, saturation, brightness), false);
|
|
}
|
|
|
|
/**
|
|
* Returns a float array with the red, green, and blue components, and the
|
|
* alpha value, in the default sRGB space, with values in the range 0.0-1.0.
|
|
* If the array is null, a new one is created, otherwise it is recycled.
|
|
*
|
|
* @param array the array to put results into (at least 4 elements), or null
|
|
* @return the RGB components and alpha value
|
|
* @throws ArrayIndexOutOfBoundsException if array is too small
|
|
*/
|
|
public float[] getRGBComponents(float[] array)
|
|
{
|
|
if (array == null)
|
|
array = new float[4];
|
|
getRGBColorComponents(array);
|
|
// Stupid serialization issues require this check.
|
|
array[3] = (falpha == 0 && frgbvalue == null
|
|
? ((getRGB() & ALPHA_MASK) >> 24) / 255f : falpha);
|
|
return array;
|
|
}
|
|
|
|
/**
|
|
* Returns a float array with the red, green, and blue components, in the
|
|
* default sRGB space, with values in the range 0.0-1.0. If the array is
|
|
* null, a new one is created, otherwise it is recycled.
|
|
*
|
|
* @param array the array to put results into (at least 3 elements), or null
|
|
* @return the RGB components
|
|
* @throws ArrayIndexOutOfBoundsException if array is too small
|
|
*/
|
|
public float[] getRGBColorComponents(float[] array)
|
|
{
|
|
if (array == null)
|
|
array = new float[3];
|
|
else if (array == frgbvalue)
|
|
return array; // Optimization for getColorComponents(float[]).
|
|
if (frgbvalue == null)
|
|
{
|
|
// Do not inline getRGB() to this.value, because of SystemColor.
|
|
int value = getRGB();
|
|
frgbvalue = new float[] { ((value & RED_MASK) >> 16) / 255f,
|
|
((value & GREEN_MASK) >> 8) / 255f,
|
|
(value & BLUE_MASK) / 255f };
|
|
}
|
|
array[0] = frgbvalue[0];
|
|
array[1] = frgbvalue[1];
|
|
array[2] = frgbvalue[2];
|
|
return array;
|
|
}
|
|
|
|
/**
|
|
* Returns a float array containing the color and alpha components of this
|
|
* color in the ColorSpace it was created with (the constructors which do
|
|
* not take a ColorSpace parameter use a default sRGB ColorSpace). If the
|
|
* array is null, a new one is created, otherwise it is recycled, and must
|
|
* have at least one more position than components used in the color space.
|
|
*
|
|
* @param array the array to put results into, or null
|
|
* @return the original color space components and alpha value
|
|
* @throws ArrayIndexOutOfBoundsException if array is too small
|
|
*/
|
|
public float[] getComponents(float[] array)
|
|
{
|
|
int numComponents = cs == null ? 3 : cs.getNumComponents();
|
|
if (array == null)
|
|
array = new float[1 + numComponents];
|
|
getColorComponents(array);
|
|
// Stupid serialization issues require this check.
|
|
array[numComponents] = (falpha == 0 && frgbvalue == null
|
|
? ((getRGB() & ALPHA_MASK) >> 24) / 255f : falpha);
|
|
return array;
|
|
}
|
|
|
|
/**
|
|
* Returns a float array containing the color components of this color in
|
|
* the ColorSpace it was created with (the constructors which do not take
|
|
* a ColorSpace parameter use a default sRGB ColorSpace). If the array is
|
|
* null, a new one is created, otherwise it is recycled, and must have at
|
|
* least as many positions as used in the color space.
|
|
*
|
|
* @param array the array to put results into, or null
|
|
* @return the original color space components
|
|
* @throws ArrayIndexOutOfBoundsException if array is too small
|
|
*/
|
|
public float[] getColorComponents(float[] array)
|
|
{
|
|
int numComponents = cs == null ? 3 : cs.getNumComponents();
|
|
if (array == null)
|
|
array = new float[numComponents];
|
|
if (fvalue == null) // If fvalue is null, cs should be null too.
|
|
fvalue = getRGBColorComponents(frgbvalue);
|
|
System.arraycopy(fvalue, 0, array, 0, numComponents);
|
|
return array;
|
|
}
|
|
|
|
/**
|
|
* Returns a float array containing the color and alpha components of this
|
|
* color in the given ColorSpace. If the array is null, a new one is
|
|
* created, otherwise it is recycled, and must have at least one more
|
|
* position than components used in the color space.
|
|
*
|
|
* @param space the color space to translate to
|
|
* @param array the array to put results into, or null
|
|
* @return the color space components and alpha value
|
|
* @throws ArrayIndexOutOfBoundsException if array is too small
|
|
* @throws NullPointerException if space is null
|
|
*/
|
|
public float[] getComponents(ColorSpace space, float[] array)
|
|
{
|
|
int numComponents = space.getNumComponents();
|
|
if (array == null)
|
|
array = new float[1 + numComponents];
|
|
getColorComponents(space, array);
|
|
// Stupid serialization issues require this check.
|
|
array[numComponents] = (falpha == 0 && frgbvalue == null
|
|
? ((getRGB() & ALPHA_MASK) >> 24) / 255f : falpha);
|
|
return array;
|
|
}
|
|
|
|
/**
|
|
* Returns a float array containing the color components of this color in
|
|
* the given ColorSpace. If the array is null, a new one is created,
|
|
* otherwise it is recycled, and must have at least as many positions as
|
|
* used in the color space.
|
|
*
|
|
* @param space the color space to translate to
|
|
* @return the color space components
|
|
* @throws ArrayIndexOutOfBoundsException if array is too small
|
|
* @throws NullPointerException if space is null
|
|
*/
|
|
public float[] getColorComponents(ColorSpace space, float[] array)
|
|
{
|
|
float[] components = space.fromRGB(getRGBColorComponents(frgbvalue));
|
|
if (array == null)
|
|
return components;
|
|
System.arraycopy(components, 0, array, 0, components.length);
|
|
return array;
|
|
}
|
|
|
|
/**
|
|
* Returns the color space of this color. Except for the constructor which
|
|
* takes a ColorSpace argument, this will be an implementation of
|
|
* ColorSpace.CS_sRGB.
|
|
*
|
|
* @return the color space
|
|
*/
|
|
public ColorSpace getColorSpace()
|
|
{
|
|
return cs == null ? ColorSpace.getInstance(ColorSpace.CS_sRGB) : cs;
|
|
}
|
|
|
|
/**
|
|
* Returns a paint context, used for filling areas of a raster scan with
|
|
* this color. Since the color is constant across the entire rectangle, and
|
|
* since it is always in sRGB space, this implementation returns the same
|
|
* object, regardless of the parameters. Subclasses, however, may have a
|
|
* mutable result.
|
|
*
|
|
* @param cm the requested color model
|
|
* @param deviceBounds the bounding box in device coordinates, ignored
|
|
* @param userBounds the bounding box in user coordinates, ignored
|
|
* @param xform the bounds transformation, ignored
|
|
* @param hints any rendering hints, ignored
|
|
* @return a context for painting this solid color
|
|
*/
|
|
public PaintContext createContext(ColorModel cm, Rectangle deviceBounds,
|
|
Rectangle2D userBounds,
|
|
AffineTransform xform,
|
|
RenderingHints hints)
|
|
{
|
|
if (context == null || !context.getColorModel().equals(cm))
|
|
context = new ColorPaintContext(cm,value);
|
|
return context;
|
|
}
|
|
|
|
/**
|
|
* Returns the transparency level of this color.
|
|
*
|
|
* @return one of {@link #OPAQUE}, {@link #BITMASK}, or {@link #TRANSLUCENT}
|
|
*/
|
|
public int getTransparency()
|
|
{
|
|
// Do not inline getRGB() to this.value, because of SystemColor.
|
|
int alpha = getRGB() & ALPHA_MASK;
|
|
return alpha == (255 << 24) ? OPAQUE : alpha == 0 ? BITMASK : TRANSLUCENT;
|
|
}
|
|
|
|
/**
|
|
* Converts float values to integer value.
|
|
*
|
|
* @param red the red value
|
|
* @param green the green value
|
|
* @param blue the blue value
|
|
* @param alpha the alpha value
|
|
* @return the integer value made of 8-bit sections
|
|
* @throws IllegalArgumentException if parameters are out of range 0.0-1.0
|
|
*/
|
|
private static int convert(float red, float green, float blue, float alpha)
|
|
{
|
|
if (red < 0 || red > 1 || green < 0 || green > 1 || blue < 0 || blue > 1
|
|
|| alpha < 0 || alpha > 1)
|
|
throw new IllegalArgumentException("Bad RGB values");
|
|
int redval = Math.round(255 * red);
|
|
int greenval = Math.round(255 * green);
|
|
int blueval = Math.round(255 * blue);
|
|
int alphaval = Math.round(255 * alpha);
|
|
return (alphaval << 24) | (redval << 16) | (greenval << 8) | blueval;
|
|
}
|
|
} // class Color
|