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
1318 lines
38 KiB
Java
1318 lines
38 KiB
Java
/* Font.java -- Font object
|
|
Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package java.awt;
|
|
|
|
import java.awt.font.FontRenderContext;
|
|
import java.awt.font.GlyphVector;
|
|
import java.awt.font.LineMetrics;
|
|
import java.awt.font.TextAttribute;
|
|
import java.awt.font.TransformAttribute;
|
|
import java.awt.geom.AffineTransform;
|
|
import java.awt.geom.Rectangle2D;
|
|
import java.awt.peer.FontPeer;
|
|
import java.io.InputStream;
|
|
import java.io.IOException;
|
|
import java.io.Serializable;
|
|
import java.util.Locale;
|
|
import java.util.Map;
|
|
import java.util.HashMap;
|
|
import java.util.StringTokenizer;
|
|
import java.text.CharacterIterator;
|
|
import java.text.AttributedCharacterIterator;
|
|
import java.text.StringCharacterIterator;
|
|
|
|
import gnu.java.awt.ClasspathToolkit;
|
|
import gnu.java.awt.peer.ClasspathFontPeer;
|
|
|
|
/**
|
|
* This class represents a windowing system font.
|
|
*
|
|
* @author Aaron M. Renn (arenn@urbanophile.com)
|
|
* @author Warren Levy <warrenl@cygnus.com>
|
|
* @author Graydon Hoare <graydon@redhat.com>
|
|
*/
|
|
public class Font implements Serializable
|
|
{
|
|
|
|
/*
|
|
* Static Variables
|
|
*/
|
|
|
|
/**
|
|
* Constant indicating a "plain" font.
|
|
*/
|
|
public static final int PLAIN = 0;
|
|
|
|
/**
|
|
* Constant indicating a "bold" font.
|
|
*/
|
|
public static final int BOLD = 1;
|
|
|
|
/**
|
|
* Constant indicating an "italic" font.
|
|
*/
|
|
public static final int ITALIC = 2;
|
|
|
|
/**
|
|
* Constant indicating the baseline mode characteristic of Roman.
|
|
*/
|
|
public static final int ROMAN_BASELINE = 0;
|
|
|
|
/**
|
|
* Constant indicating the baseline mode characteristic of Chinese.
|
|
*/
|
|
public static final int CENTER_BASELINE = 1;
|
|
|
|
/**
|
|
* Constant indicating the baseline mode characteristic of Devanigri.
|
|
*/
|
|
public static final int HANGING_BASELINE = 2;
|
|
|
|
|
|
/**
|
|
* Indicates to <code>createFont</code> that the supplied font data
|
|
* is in TrueType format.
|
|
*
|
|
* <p><em>Specification Note:</em> The Sun JavaDoc for J2SE 1.4 does
|
|
* not indicate whether this value also subsumes OpenType. OpenType
|
|
* is essentially the same format as TrueType, but allows to define
|
|
* glyph shapes in the same way as PostScript, using cubic bezier
|
|
* curves.
|
|
*
|
|
* @since 1.3
|
|
*/
|
|
public static final int TRUETYPE_FONT = 0;
|
|
|
|
|
|
/**
|
|
* A flag for <code>layoutGlyphVector</code>, indicating that the
|
|
* orientation of a text run is from left to right.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static final int LAYOUT_LEFT_TO_RIGHT = 0;
|
|
|
|
|
|
/**
|
|
* A flag for <code>layoutGlyphVector</code>, indicating that the
|
|
* orientation of a text run is from right to left.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static final int LAYOUT_RIGHT_TO_LEFT = 1;
|
|
|
|
|
|
/**
|
|
* A flag for <code>layoutGlyphVector</code>, indicating that the
|
|
* text does not contain valid characters before the
|
|
* <code>start</code> position. If this flag is set,
|
|
* <code>layoutGlyphVector</code> does not examine the text before
|
|
* <code>start</code>, even if this would be necessary to select the
|
|
* correct glyphs (e.g., for Arabic text).
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static final int LAYOUT_NO_START_CONTEXT = 2;
|
|
|
|
|
|
/**
|
|
* A flag for <code>layoutGlyphVector</code>, indicating that the
|
|
* text does not contain valid characters after the
|
|
* <code>limit</code> position. If this flag is set,
|
|
* <code>layoutGlyphVector</code> does not examine the text after
|
|
* <code>limit</code>, even if this would be necessary to select the
|
|
* correct glyphs (e.g., for Arabic text).
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static final int LAYOUT_NO_LIMIT_CONTEXT = 4;
|
|
|
|
|
|
// Serialization constant
|
|
private static final long serialVersionUID = -4206021311591459213L;
|
|
|
|
|
|
// The ClasspathToolkit-provided peer which implements this font
|
|
private ClasspathFontPeer peer;
|
|
|
|
/*************************************************************************/
|
|
|
|
/*
|
|
* Static Methods
|
|
*/
|
|
|
|
/**
|
|
* Creates a <code>Font</code> object from the specified string, which
|
|
* is in one of the following formats:
|
|
* <p>
|
|
* <ul>
|
|
* <li>fontname-style-pointsize
|
|
* <li>fontname-style
|
|
* <li>fontname-pointsize
|
|
* <li>fontname
|
|
* </ul>
|
|
* <p>
|
|
* The style should be one of BOLD, ITALIC, or BOLDITALIC. The default
|
|
* style if none is specified is PLAIN. The default size if none
|
|
* is specified is 12.
|
|
*/
|
|
public static Font decode (String fontspec)
|
|
{
|
|
String name = null;
|
|
int style = PLAIN;
|
|
int size = 12;
|
|
|
|
StringTokenizer st = new StringTokenizer(fontspec, "-");
|
|
while (st.hasMoreTokens())
|
|
{
|
|
String token = st.nextToken();
|
|
if (name == null)
|
|
{
|
|
name = token;
|
|
continue;
|
|
}
|
|
|
|
if (token.toUpperCase().equals("BOLD"))
|
|
{
|
|
style = BOLD;
|
|
continue;
|
|
}
|
|
if (token.toUpperCase().equals("ITALIC"))
|
|
{
|
|
style = ITALIC;
|
|
continue;
|
|
}
|
|
if (token.toUpperCase().equals("BOLDITALIC"))
|
|
{
|
|
style = BOLD | ITALIC;
|
|
continue;
|
|
}
|
|
|
|
int tokenval = 0;
|
|
try
|
|
{
|
|
tokenval = Integer.parseInt(token);
|
|
}
|
|
catch(NumberFormatException e) { ; }
|
|
|
|
if (tokenval != 0)
|
|
size = tokenval;
|
|
}
|
|
|
|
return getFontFromToolkit (name, attrsToMap (style, size));
|
|
}
|
|
|
|
/* These methods delegate to the toolkit. */
|
|
|
|
protected static ClasspathToolkit tk ()
|
|
{
|
|
return (ClasspathToolkit)(Toolkit.getDefaultToolkit ());
|
|
}
|
|
|
|
protected static Map attrsToMap(int style, int size)
|
|
{
|
|
Map attrs = new HashMap();
|
|
attrs.put (TextAttribute.SIZE, new Float ((float)size));
|
|
|
|
if ((style & BOLD) == BOLD)
|
|
attrs.put (TextAttribute.WEIGHT, TextAttribute.WEIGHT_BOLD);
|
|
else
|
|
attrs.put (TextAttribute.WEIGHT, TextAttribute.WEIGHT_REGULAR);
|
|
|
|
if ((style & ITALIC) == ITALIC)
|
|
attrs.put (TextAttribute.POSTURE, TextAttribute.POSTURE_OBLIQUE);
|
|
else
|
|
attrs.put (TextAttribute.POSTURE, TextAttribute.POSTURE_REGULAR);
|
|
return attrs;
|
|
}
|
|
|
|
/* Every factory method in Font should eventually call this. */
|
|
protected static Font getFontFromToolkit (String name, Map attribs)
|
|
{
|
|
return tk ().getFont (name, attribs);
|
|
}
|
|
|
|
/* Every Font constructor should eventually call this. */
|
|
protected static ClasspathFontPeer getPeerFromToolkit (String name, Map attrs)
|
|
{
|
|
return tk ().getClasspathFontPeer (name, attrs);
|
|
}
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Returns a <code>Font</code> object from the passed property name.
|
|
*
|
|
* @param propname The name of the system property.
|
|
* @param default Value to use if the property is not found.
|
|
*
|
|
* @return The requested font, or <code>default</code> if the property
|
|
* not exist or is malformed.
|
|
*/
|
|
public static Font getFont (String propname, Font defval)
|
|
{
|
|
String propval = System.getProperty(propname);
|
|
if (propval != null)
|
|
return decode (propval);
|
|
return defval;
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Returns a <code>Font</code> object from the passed property name.
|
|
*
|
|
* @param propname The name of the system property.
|
|
*
|
|
* @return The requested font, or <code>null</code> if the property
|
|
* not exist or is malformed.
|
|
*/
|
|
public static Font getFont (String propname)
|
|
{
|
|
return getFont (propname, (Font)null);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/*
|
|
* Constructors
|
|
*/
|
|
|
|
/**
|
|
* Initializes a new instance of <code>Font</code> with the specified
|
|
* attributes.
|
|
*
|
|
* @param name The name of the font.
|
|
* @param style The font style.
|
|
* @param size The font point size.
|
|
*/
|
|
|
|
public Font (String name, int style, int size)
|
|
{
|
|
this.peer = getPeerFromToolkit (name, attrsToMap (style, size));
|
|
}
|
|
|
|
public Font (Map attrs)
|
|
{
|
|
this(null, attrs);
|
|
}
|
|
|
|
/* This extra constructor is here to permit ClasspathToolkit and to build
|
|
a font with a "logical name" as well as attrs. */
|
|
public Font (String name, Map attrs)
|
|
{
|
|
// If attrs is null, setting it to an empty HashMap will give this
|
|
// Font default attributes.
|
|
if (attrs == null)
|
|
attrs = new HashMap();
|
|
this.peer = getPeerFromToolkit (name, attrs);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/*
|
|
* Instance Methods
|
|
*/
|
|
|
|
/**
|
|
* Returns the logical name of the font. A logical name is the name the
|
|
* font was constructed with. It may be the name of a logical font (one
|
|
* of 6 required names in all java environments) or it may be a face
|
|
* name.
|
|
*
|
|
* @return The logical name of the font.
|
|
*
|
|
* @see getFamily()
|
|
* @see getFontName()
|
|
*/
|
|
public String getName ()
|
|
{
|
|
return peer.getName (this);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Returns the style of the font.
|
|
*
|
|
* @return The font style.
|
|
*/
|
|
public int getSize ()
|
|
{
|
|
return (int) peer.getSize (this);
|
|
}
|
|
|
|
public float getSize2D ()
|
|
{
|
|
return peer.getSize (this);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Tests whether or not this is a plain font. This will be true if
|
|
* and only if neither the bold nor the italics style is set.
|
|
*
|
|
* @return <code>true</code> if this is a plain font, <code>false</code>
|
|
* otherwise.
|
|
*/
|
|
public boolean isPlain ()
|
|
{
|
|
return peer.isPlain (this);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Tests whether or not this font is bold.
|
|
*
|
|
* @return <code>true</code> if this font is bold, <code>false</code>
|
|
* otherwise.
|
|
*/
|
|
public boolean isBold ()
|
|
{
|
|
return peer.isBold (this);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Tests whether or not this font is italic.
|
|
*
|
|
* @return <code>true</code> if this font is italic, <code>false</code>
|
|
* otherwise.
|
|
*/
|
|
public boolean isItalic ()
|
|
{
|
|
return peer.isItalic (this);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Returns the family name of this font. A family name describes a design
|
|
* or "brand name" (such as Helvetica or Palatino). It is less specific
|
|
* than a font face name (such as Helvetica Bold).
|
|
*
|
|
* @return A string containing the font family name.
|
|
*
|
|
* @since 1.2
|
|
*
|
|
* @see getName()
|
|
* @see getFontName()
|
|
* @see GraphicsEnvironment.getAvailableFontFamilyNames()
|
|
*/
|
|
public String getFamily ()
|
|
{
|
|
return peer.getFamily (this);
|
|
}
|
|
|
|
/**
|
|
* Returns integer code representing the sum of style flags of this font, a
|
|
* combination of either {@link PLAIN}, {@link BOLD}, or {@link ITALIC}.
|
|
*
|
|
* @return code representing the style of this font.
|
|
*
|
|
* @see isPlain()
|
|
* @see isBold()
|
|
* @see isItalic()
|
|
*/
|
|
public int getStyle ()
|
|
{
|
|
return peer.getStyle (this);
|
|
}
|
|
|
|
/**
|
|
* Checks if specified character maps to a glyph in this font.
|
|
*
|
|
* @param c The character to check.
|
|
*
|
|
* @return Whether the character has a corresponding glyph in this font.
|
|
*
|
|
* @since 1.2
|
|
*/
|
|
public boolean canDisplay (char c)
|
|
{
|
|
return peer.canDisplay (this, c);
|
|
}
|
|
|
|
/**
|
|
* Checks how much of a given string can be mapped to glyphs in
|
|
* this font.
|
|
*
|
|
* @param s The string to check.
|
|
*
|
|
* @return The index of the first character in <code>s</code> which cannot
|
|
* be converted to a glyph by this font, or <code>-1</code> if all
|
|
* characters can be mapped to glyphs.
|
|
*
|
|
* @since 1.2
|
|
*/
|
|
public int canDisplayUpTo (String s)
|
|
{
|
|
return peer.canDisplayUpTo (this, new StringCharacterIterator (s),
|
|
0, s.length () - 1);
|
|
}
|
|
|
|
/**
|
|
* Checks how much of a given sequence of text can be mapped to glyphs in
|
|
* this font.
|
|
*
|
|
* @param text Array containing the text to check.
|
|
* @param start Position of first character to check in <code>text</code>.
|
|
* @param limit Position of last character to check in <code>text</code>.
|
|
*
|
|
* @return The index of the first character in the indicated range which
|
|
* cannot be converted to a glyph by this font, or <code>-1</code> if all
|
|
* characters can be mapped to glyphs.
|
|
*
|
|
* @since 1.2
|
|
*
|
|
* @throws IndexOutOfBoundsException if the range [start, limit] is
|
|
* invalid in <code>text</code>.
|
|
*/
|
|
public int canDisplayUpTo (char[] text, int start, int limit)
|
|
{
|
|
return peer.canDisplayUpTo
|
|
(this, new StringCharacterIterator (new String (text)), start, limit);
|
|
}
|
|
|
|
/**
|
|
* Checks how much of a given sequence of text can be mapped to glyphs in
|
|
* this font.
|
|
*
|
|
* @param i Iterator over the text to check.
|
|
* @param start Position of first character to check in <code>i</code>.
|
|
* @param limit Position of last character to check in <code>i</code>.
|
|
*
|
|
* @return The index of the first character in the indicated range which
|
|
* cannot be converted to a glyph by this font, or <code>-1</code> if all
|
|
* characters can be mapped to glyphs.
|
|
*
|
|
* @since 1.2
|
|
*
|
|
* @throws IndexOutOfBoundsException if the range [start, limit] is
|
|
* invalid in <code>i</code>.
|
|
*/
|
|
public int canDisplayUpTo (CharacterIterator i, int start, int limit)
|
|
{
|
|
return peer.canDisplayUpTo (this, i, start, limit);
|
|
}
|
|
|
|
/**
|
|
* Creates a new font with point size 1 and {@link PLAIN} style,
|
|
* reading font data from the provided input stream. The resulting font
|
|
* can have further fonts derived from it using its
|
|
* <code>deriveFont</code> method.
|
|
*
|
|
* @param fontFormat Integer code indicating the format the font data is
|
|
* in.Currently this can only be {@link TRUETYPE_FONT}.
|
|
* @param is {@link InputStream} from which font data will be read. This
|
|
* stream is not closed after font data is extracted.
|
|
*
|
|
* @return A new {@link Font} of the format indicated.
|
|
*
|
|
* @throws IllegalArgumentException if <code>fontType</code> is not
|
|
* recognized.
|
|
* @throws FontFormatException if data in InputStream is not of format
|
|
* indicated.
|
|
* @throws IOException if insufficient data is present on InputStream.
|
|
*
|
|
* @since 1.3
|
|
*/
|
|
public static Font createFont (int fontFormat, InputStream is)
|
|
throws FontFormatException, IOException
|
|
{
|
|
return tk().createFont (fontFormat, is);
|
|
}
|
|
|
|
/**
|
|
* Maps characters to glyphs in a one-to-one relationship, returning a new
|
|
* {@link GlyphVector} with a mapped glyph for each input character. This
|
|
* sort of mapping is often sufficient for some scripts such as Roman, but
|
|
* is inappropriate for scripts with special shaping or contextual layout
|
|
* requirements such as Arabic, Indic, Hebrew or Thai.
|
|
*
|
|
* @param ctx The rendering context used for precise glyph placement.
|
|
* @param str The string to convert to Glyphs.
|
|
*
|
|
* @return A new {@link GlyphVector} containing glyphs mapped from str,
|
|
* through the font's cmap table.
|
|
*
|
|
* @see layoutGlyphVector()
|
|
*/
|
|
public GlyphVector createGlyphVector (FontRenderContext ctx, String str)
|
|
{
|
|
return peer.createGlyphVector (this, ctx, new StringCharacterIterator (str));
|
|
}
|
|
|
|
/**
|
|
* Maps characters to glyphs in a one-to-one relationship, returning a new
|
|
* {@link GlyphVector} with a mapped glyph for each input character. This
|
|
* sort of mapping is often sufficient for some scripts such as Roman, but
|
|
* is inappropriate for scripts with special shaping or contextual layout
|
|
* requirements such as Arabic, Indic, Hebrew or Thai.
|
|
*
|
|
* @param ctx The rendering context used for precise glyph placement.
|
|
* @param i Iterator over the text to convert to glyphs.
|
|
*
|
|
* @return A new {@link GlyphVector} containing glyphs mapped from str,
|
|
* through the font's cmap table.
|
|
*
|
|
* @see layoutGlyphVector()
|
|
*/
|
|
public GlyphVector createGlyphVector (FontRenderContext ctx, CharacterIterator i)
|
|
{
|
|
return peer.createGlyphVector (this, ctx, i);
|
|
}
|
|
|
|
/**
|
|
* Maps characters to glyphs in a one-to-one relationship, returning a new
|
|
* {@link GlyphVector} with a mapped glyph for each input character. This
|
|
* sort of mapping is often sufficient for some scripts such as Roman, but
|
|
* is inappropriate for scripts with special shaping or contextual layout
|
|
* requirements such as Arabic, Indic, Hebrew or Thai.
|
|
*
|
|
* @param ctx The rendering context used for precise glyph placement.
|
|
* @param chars Array of characters to convert to glyphs.
|
|
*
|
|
* @return A new {@link GlyphVector} containing glyphs mapped from str,
|
|
* through the font's cmap table.
|
|
*
|
|
* @see layoutGlyphVector()
|
|
*/
|
|
public GlyphVector createGlyphVector (FontRenderContext ctx, char[] chars)
|
|
{
|
|
return peer.createGlyphVector
|
|
(this, ctx, new StringCharacterIterator (new String (chars)));
|
|
}
|
|
|
|
/**
|
|
* Extracts a sequence of glyphs from a font, returning a new {@link
|
|
* GlyphVector} with a mapped glyph for each input glyph code.
|
|
*
|
|
* @param ctx The rendering context used for precise glyph placement.
|
|
* @param chars Array of characters to convert to glyphs.
|
|
*
|
|
* @return A new {@link GlyphVector} containing glyphs mapped from str,
|
|
* through the font's cmap table.
|
|
*
|
|
* @see layoutGlyphVector()
|
|
*
|
|
* @specnote This method is documented to perform character-to-glyph
|
|
* conversions, in the Sun documentation, but its second parameter name is
|
|
* "glyphCodes" and it is not clear to me why it would exist if its
|
|
* purpose was to transport character codes inside integers. I assume it
|
|
* is mis-documented in the Sun documentation.
|
|
*/
|
|
|
|
public GlyphVector createGlyphVector (FontRenderContext ctx, int[] glyphCodes)
|
|
{
|
|
return peer.createGlyphVector (this, ctx, glyphCodes);
|
|
}
|
|
|
|
/**
|
|
* Produces a new {@link Font} based on the current font, adjusted to a
|
|
* new size and style.
|
|
*
|
|
* @param style The style of the newly created font.
|
|
* @param size The size of the newly created font.
|
|
*
|
|
* @return A clone of the current font, with the specified size and style.
|
|
*
|
|
* @since 1.2
|
|
*/
|
|
public Font deriveFont (int style, float size)
|
|
{
|
|
return peer.deriveFont (this, style, size);
|
|
}
|
|
|
|
/**
|
|
* Produces a new {@link Font} based on the current font, adjusted to a
|
|
* new size.
|
|
*
|
|
* @param size The size of the newly created font.
|
|
*
|
|
* @return A clone of the current font, with the specified size.
|
|
*
|
|
* @since 1.2
|
|
*/
|
|
public Font deriveFont (float size)
|
|
{
|
|
return peer.deriveFont (this, size);
|
|
}
|
|
|
|
/**
|
|
* Produces a new {@link Font} based on the current font, adjusted to a
|
|
* new style.
|
|
*
|
|
* @param style The style of the newly created font.
|
|
*
|
|
* @return A clone of the current font, with the specified style.
|
|
*
|
|
* @since 1.2
|
|
*/
|
|
public Font deriveFont (int style)
|
|
{
|
|
return peer.deriveFont (this, style);
|
|
}
|
|
|
|
/**
|
|
* Produces a new {@link Font} based on the current font, adjusted to a
|
|
* new style and subjected to a new affine transformation.
|
|
*
|
|
* @param style The style of the newly created font.
|
|
* @param a The transformation to apply.
|
|
*
|
|
* @return A clone of the current font, with the specified style and
|
|
* transform.
|
|
*
|
|
* @throws IllegalArgumentException If transformation is
|
|
* <code>null</code>.
|
|
*
|
|
* @since 1.2
|
|
*/
|
|
public Font deriveFont (int style, AffineTransform a)
|
|
{
|
|
if (a == null)
|
|
throw new IllegalArgumentException ("Affine transformation is null");
|
|
|
|
return peer.deriveFont (this, style, a);
|
|
}
|
|
|
|
/**
|
|
* Produces a new {@link Font} based on the current font, subjected
|
|
* to a new affine transformation.
|
|
*
|
|
* @param a The transformation to apply.
|
|
*
|
|
* @return A clone of the current font, with the specified transform.
|
|
*
|
|
* @throws IllegalArgumentException If transformation is
|
|
* <code>null</code>.
|
|
*
|
|
* @since 1.2
|
|
*/
|
|
public Font deriveFont (AffineTransform a)
|
|
{
|
|
if (a == null)
|
|
throw new IllegalArgumentException ("Affine transformation is null");
|
|
|
|
return peer.deriveFont (this, a);
|
|
}
|
|
|
|
/**
|
|
* Produces a new {@link Font} based on the current font, adjusted to a
|
|
* new set of attributes.
|
|
*
|
|
* @param attributes Attributes of the newly created font.
|
|
*
|
|
* @return A clone of the current font, with the specified attributes.
|
|
*
|
|
* @since 1.2
|
|
*/
|
|
public Font deriveFont (Map attributes)
|
|
{
|
|
return peer.deriveFont (this, attributes);
|
|
}
|
|
|
|
/**
|
|
* Returns a map of chracter attributes which this font currently has set.
|
|
*
|
|
* @return A map of chracter attributes which this font currently has set.
|
|
*
|
|
* @see getAvailableAttributes()
|
|
* @see java.text.AttributedCharacterIterator.Attribute
|
|
* @see java.awt.font.TextAttribute
|
|
*/
|
|
public Map getAttributes ()
|
|
{
|
|
return peer.getAttributes (this);
|
|
}
|
|
|
|
/**
|
|
* Returns an array of chracter attribute keys which this font understands.
|
|
*
|
|
* @return An array of chracter attribute keys which this font understands.
|
|
*
|
|
* @see getAttributes()
|
|
* @see java.text.AttributedCharacterIterator.Attribute
|
|
* @see java.awt.font.TextAttribute
|
|
*/
|
|
public AttributedCharacterIterator.Attribute[] getAvailableAttributes()
|
|
{
|
|
return peer.getAvailableAttributes (this);
|
|
}
|
|
|
|
/**
|
|
* Returns a baseline code (one of {@link ROMAN_BASELINE}, {@link
|
|
* CENTER_BASELINE} or {@link HANGING_BASELINE}) indicating which baseline
|
|
* this font will measure baseline offsets for, when presenting glyph
|
|
* metrics for a given character.
|
|
*
|
|
* Baseline offsets describe the position of a glyph relative to an
|
|
* invisible line drawn under, through the center of, or over a line of
|
|
* rendered text, respectively. Different scripts use different baseline
|
|
* modes, so clients should not assume all baseline offsets in a glyph
|
|
* vector are from a common baseline.
|
|
*
|
|
* @param c The character code to select a baseline mode for.
|
|
*
|
|
* @return The baseline mode which would be used in a glyph associated
|
|
* with the provided character.
|
|
*
|
|
* @since 1.2
|
|
*
|
|
* @see LineMetrics.getBaselineOffsets()
|
|
*/
|
|
public byte getBaselineFor (char c)
|
|
{
|
|
return peer.getBaselineFor (this, c);
|
|
}
|
|
|
|
/**
|
|
* Returns the family name of this font. A family name describes a
|
|
* typographic style (such as Helvetica or Palatino). It is more specific
|
|
* than a logical font name (such as Sans Serif) but less specific than a
|
|
* font face name (such as Helvetica Bold).
|
|
*
|
|
* @param lc The locale in which to describe the name of the font family.
|
|
*
|
|
* @return A string containing the font family name, localized for the
|
|
* provided locale.
|
|
*
|
|
* @since 1.2
|
|
*
|
|
* @see getName()
|
|
* @see getFontName()
|
|
* @see GraphicsEnvironment.getAvailableFontFamilyNames()
|
|
* @see Locale
|
|
*/
|
|
public String getFamily (Locale lc)
|
|
{
|
|
return peer.getFamily (this, lc);
|
|
}
|
|
|
|
/**
|
|
* Returns a font appropriate for the given attribute set.
|
|
*
|
|
* @param attributes The attributes required for the new font.
|
|
*
|
|
* @return A new Font with the given attributes.
|
|
*
|
|
* @since 1.2
|
|
*
|
|
* @see TextAttribure
|
|
*/
|
|
public static Font getFont (Map attributes)
|
|
{
|
|
return getFontFromToolkit (null, attributes);
|
|
}
|
|
|
|
/**
|
|
* Returns the font face name of the font. A font face name describes a
|
|
* specific variant of a font family (such as Helvetica Bold). It is more
|
|
* specific than both a font family name (such as Helvetica) and a logical
|
|
* font name (such as Sans Serif).
|
|
*
|
|
* @return The font face name of the font.
|
|
*
|
|
* @since 1.2
|
|
*
|
|
* @see getName()
|
|
* @see getFamily()
|
|
*/
|
|
public String getFontName ()
|
|
{
|
|
return peer.getFontName (this);
|
|
}
|
|
|
|
/**
|
|
* Returns the font face name of the font. A font face name describes a
|
|
* specific variant of a font family (such as Helvetica Bold). It is more
|
|
* specific than both a font family name (such as Helvetica).
|
|
*
|
|
* @param lc The locale in which to describe the name of the font face.
|
|
*
|
|
* @return A string containing the font face name, localized for the
|
|
* provided locale.
|
|
*
|
|
* @since 1.2
|
|
*
|
|
* @see getName()
|
|
* @see getFamily()
|
|
*/
|
|
public String getFontName (Locale lc)
|
|
{
|
|
return peer.getFontName (this, lc);
|
|
}
|
|
|
|
/**
|
|
* Returns the italic angle of this font, a measurement of its slant when
|
|
* style is {@link ITALIC}. The precise meaning is the inverse slope of a
|
|
* caret line which "best measures" the font's italic posture.
|
|
*
|
|
* @return The italic angle.
|
|
*
|
|
* @see TextAttribute.POSTURE
|
|
*/
|
|
public float getItalicAngle ()
|
|
{
|
|
return peer.getItalicAngle (this);
|
|
}
|
|
|
|
/**
|
|
* Returns a {@link LineMetrics} object constructed with the specified
|
|
* text and {@link FontRenderContext}.
|
|
*
|
|
* @param text The string to calculate metrics from.
|
|
* @param begin Index of first character in <code>text</code> to measure.
|
|
* @param limit Index of last character in <code>text</code> to measure.
|
|
* @param rc Context for calculating precise glyph placement and hints.
|
|
*
|
|
* @return A new {@link LineMetrics} object.
|
|
*
|
|
* @throws IndexOutOfBoundsException if the range [begin, limit] is
|
|
* invalid in <code>text</code>.
|
|
*/
|
|
public LineMetrics getLineMetrics(String text, int begin,
|
|
int limit, FontRenderContext rc)
|
|
{
|
|
return peer.getLineMetrics (this, new StringCharacterIterator (text),
|
|
begin, limit, rc);
|
|
}
|
|
|
|
/**
|
|
* Returns a {@link LineMetrics} object constructed with the specified
|
|
* text and {@link FontRenderContext}.
|
|
*
|
|
* @param chars The string to calculate metrics from.
|
|
* @param begin Index of first character in <code>text</code> to measure.
|
|
* @param limit Index of last character in <code>text</code> to measure.
|
|
* @param rc Context for calculating precise glyph placement and hints.
|
|
*
|
|
* @return A new {@link LineMetrics} object.
|
|
*
|
|
* @throws IndexOutOfBoundsException if the range [begin, limit] is
|
|
* invalid in <code>chars</code>.
|
|
*/
|
|
public LineMetrics getLineMetrics(char[] chars, int begin,
|
|
int limit, FontRenderContext rc)
|
|
{
|
|
return peer.getLineMetrics (this, new StringCharacterIterator (new String(chars)),
|
|
begin, limit, rc);
|
|
}
|
|
|
|
/**
|
|
* Returns a {@link LineMetrics} object constructed with the specified
|
|
* text and {@link FontRenderContext}.
|
|
*
|
|
* @param ci The string to calculate metrics from.
|
|
* @param begin Index of first character in <code>text</code> to measure.
|
|
* @param limit Index of last character in <code>text</code> to measure.
|
|
* @param rc Context for calculating precise glyph placement and hints.
|
|
*
|
|
* @return A new {@link LineMetrics} object.
|
|
*
|
|
* @throws IndexOutOfBoundsException if the range [begin, limit] is
|
|
* invalid in <code>ci</code>.
|
|
*/
|
|
public LineMetrics getLineMetrics (CharacterIterator ci, int begin,
|
|
int limit, FontRenderContext rc)
|
|
{
|
|
return peer.getLineMetrics (this, ci, begin, limit, rc);
|
|
}
|
|
|
|
/**
|
|
* Returns the maximal bounding box of all the bounding boxes in this
|
|
* font, when the font's bounding boxes are evaluated in a given {@link
|
|
* FontRenderContext}
|
|
*
|
|
* @param rc Context in which to evaluate bounding boxes.
|
|
*
|
|
* @return The maximal bounding box.
|
|
*/
|
|
public Rectangle2D getMaxCharBounds (FontRenderContext rc)
|
|
{
|
|
return peer.getMaxCharBounds (this, rc);
|
|
}
|
|
|
|
/**
|
|
* Returns the glyph code this font uses to represent missing glyphs. This
|
|
* code will be present in glyph vectors when the font was unable to
|
|
* locate a glyph to represent a particular character code.
|
|
*
|
|
* @return The missing glyph code.
|
|
*
|
|
* @since 1.2
|
|
*/
|
|
public int getMissingGlyphCode ()
|
|
{
|
|
return peer.getMissingGlyphCode (this);
|
|
}
|
|
|
|
/**
|
|
* Returns the overall number of glyphs in this font. This number is one
|
|
* more than the greatest glyph code used in any glyph vectors this font
|
|
* produces. In other words, glyph codes are taken from the range
|
|
* <code>[ 0, getNumGlyphs() - 1 ]</code>.
|
|
*
|
|
* @return The number of glyphs in this font.
|
|
*
|
|
* @since 1.2
|
|
*/
|
|
public int getNumGlyphs ()
|
|
{
|
|
return peer.getMissingGlyphCode (this);
|
|
}
|
|
|
|
/**
|
|
* Returns the PostScript Name of this font.
|
|
*
|
|
* @return The PostScript Name of this font.
|
|
*
|
|
* @since 1.2
|
|
*
|
|
* @see getName()
|
|
* @see getFamily()
|
|
* @see getFontName()
|
|
*/
|
|
public String getPSName ()
|
|
{
|
|
return peer.getPostScriptName (this);
|
|
}
|
|
|
|
/**
|
|
* Returns the logical bounds of the specified string when rendered with this
|
|
* font in the specified {@link FontRenderContext}. This box will include the
|
|
* glyph origin, ascent, advance, height, and leading, but may not include all
|
|
* diacritics or accents. To get the complete visual bounding box of all the
|
|
* glyphs in a run of text, use the {@link TextLayout#getBounds} method of
|
|
* {@link TextLayout}.
|
|
*
|
|
* @param str The string to measure.
|
|
* @param frc The context in which to make the precise glyph measurements.
|
|
*
|
|
* @return A bounding box covering the logical bounds of the specified text.
|
|
*
|
|
* @see createGlyphVector()
|
|
*/
|
|
public Rectangle2D getStringBounds (String str, FontRenderContext frc)
|
|
{
|
|
return getStringBounds (str, 0, str.length () - 1, frc);
|
|
}
|
|
|
|
/**
|
|
* Returns the logical bounds of the specified string when rendered with this
|
|
* font in the specified {@link FontRenderContext}. This box will include the
|
|
* glyph origin, ascent, advance, height, and leading, but may not include all
|
|
* diacritics or accents. To get the complete visual bounding box of all the
|
|
* glyphs in a run of text, use the {@link TextLayout#getBounds} method of
|
|
* {@link TextLayout}.
|
|
*
|
|
* @param str The string to measure.
|
|
* @param begin Index of the first character in <code>str</code> to measure.
|
|
* @param limit Index of the last character in <code>str</code> to measure.
|
|
* @param frc The context in which to make the precise glyph measurements.
|
|
*
|
|
* @return A bounding box covering the logical bounds of the specified text.
|
|
*
|
|
* @throws IndexOutOfBoundsException if the range [begin, limit] is
|
|
* invalid in <code>str</code>.
|
|
*
|
|
* @since 1.2
|
|
*
|
|
* @see createGlyphVector()
|
|
*/
|
|
public Rectangle2D getStringBounds (String str, int begin,
|
|
int limit, FontRenderContext frc)
|
|
{
|
|
return peer.getStringBounds (this, new StringCharacterIterator(str), begin, limit, frc);
|
|
}
|
|
|
|
/**
|
|
* Returns the logical bounds of the specified string when rendered with this
|
|
* font in the specified {@link FontRenderContext}. This box will include the
|
|
* glyph origin, ascent, advance, height, and leading, but may not include all
|
|
* diacritics or accents. To get the complete visual bounding box of all the
|
|
* glyphs in a run of text, use the {@link TextLayout#getBounds} method of
|
|
* {@link TextLayout}.
|
|
*
|
|
* @param ci The text to measure.
|
|
* @param begin Index of the first character in <code>ci</code> to measure.
|
|
* @param limit Index of the last character in <code>ci</code> to measure.
|
|
* @param frc The context in which to make the precise glyph measurements.
|
|
*
|
|
* @return A bounding box covering the logical bounds of the specified text.
|
|
*
|
|
* @throws IndexOutOfBoundsException if the range [begin, limit] is
|
|
* invalid in <code>ci</code>.
|
|
*
|
|
* @since 1.2
|
|
*
|
|
* @see createGlyphVector()
|
|
*/
|
|
public Rectangle2D getStringBounds (CharacterIterator ci, int begin,
|
|
int limit, FontRenderContext frc)
|
|
{
|
|
return peer.getStringBounds (this, ci, begin, limit, frc);
|
|
}
|
|
|
|
/**
|
|
* Returns the logical bounds of the specified string when rendered with this
|
|
* font in the specified {@link FontRenderContext}. This box will include the
|
|
* glyph origin, ascent, advance, height, and leading, but may not include all
|
|
* diacritics or accents. To get the complete visual bounding box of all the
|
|
* glyphs in a run of text, use the {@link TextLayout#getBounds} method of
|
|
* {@link TextLayout}.
|
|
*
|
|
* @param chars The text to measure.
|
|
* @param begin Index of the first character in <code>ci</code> to measure.
|
|
* @param limit Index of the last character in <code>ci</code> to measure.
|
|
* @param frc The context in which to make the precise glyph measurements.
|
|
*
|
|
* @return A bounding box covering the logical bounds of the specified text.
|
|
*
|
|
* @throws IndexOutOfBoundsException if the range [begin, limit] is
|
|
* invalid in <code>chars</code>.
|
|
*
|
|
* @since 1.2
|
|
*
|
|
* @see createGlyphVector()
|
|
*/
|
|
public Rectangle2D getStringBounds (char[] chars, int begin,
|
|
int limit, FontRenderContext frc)
|
|
{
|
|
return peer.getStringBounds (this, new StringCharacterIterator (new String (chars)),
|
|
begin, limit, frc);
|
|
}
|
|
|
|
/**
|
|
* Returns a copy of the affine transformation this font is currently
|
|
* subject to, if any.
|
|
*
|
|
* @return The current transformation.
|
|
*/
|
|
public AffineTransform getTransform ()
|
|
{
|
|
return peer.getTransform (this);
|
|
}
|
|
|
|
/**
|
|
* Indicates whether this font's line metrics are uniform. A font may be
|
|
* composed of several "subfonts", each covering a different code range,
|
|
* and each with their own line metrics. A font with no subfonts, or
|
|
* subfonts with identical line metrics, is said to have "uniform" line
|
|
* metrics.
|
|
*
|
|
* @return Whether this font has uniform line metrics.
|
|
*
|
|
* @see LineMetrics
|
|
* @see getLineMetrics()
|
|
*/
|
|
public boolean hasUniformLineMetrics ()
|
|
{
|
|
return peer.hasUniformLineMetrics (this);
|
|
}
|
|
|
|
/**
|
|
* Indicates whether this font is subject to a non-identity affine
|
|
* transformation.
|
|
*
|
|
* @return <code>true</code> iff the font has a non-identity affine
|
|
* transformation applied to it.
|
|
*/
|
|
public boolean isTransformed ()
|
|
{
|
|
return peer.isTransformed (this);
|
|
}
|
|
|
|
/**
|
|
* Produces a glyph vector representing a full layout fo the specified
|
|
* text in this font. Full layouts may include complex shaping and
|
|
* reordering operations, for scripts such as Arabic or Hindi.
|
|
*
|
|
* Bidirectional (bidi) layout is not performed in this method; text
|
|
* should have its bidi direction specified with one of the flags {@link
|
|
* LAYOUT_LEFT_TO_RIGHT} or {@link LAYOUT_RIGHT_TO_LEFT}.
|
|
*
|
|
* Some types of layout (notably Arabic glyph shaping) may examine context
|
|
* characters beyond the bounds of the indicated range, in order to select
|
|
* an appropriate shape. The flags {@link LAYOUT_NO_START_CONTEXT} and
|
|
* {@link LAYOUT_NO_LIMIT_CONTEXT} can be provided to prevent these extra
|
|
* context areas from being examined, for instance if they contain invalid
|
|
* characters.
|
|
*
|
|
* @param frc Context in which to perform the layout.
|
|
* @param chars Text to perform layout on.
|
|
* @param start Index of first character to perform layout on.
|
|
* @param limit Index of last character to perform layout on.
|
|
* @param flags Combination of flags controlling layout.
|
|
*
|
|
* @return A new {@link GlyphVector} representing the specified text.
|
|
*
|
|
* @throws IndexOutOfBoundsException if the range [begin, limit] is
|
|
* invalid in <code>chars</code>.
|
|
*/
|
|
public GlyphVector layoutGlyphVector (FontRenderContext frc,
|
|
char[] chars, int start,
|
|
int limit, int flags)
|
|
{
|
|
return peer.layoutGlyphVector (this, frc, chars, start, limit, flags);
|
|
}
|
|
|
|
|
|
/**
|
|
* Returns a native peer object for this font.
|
|
*
|
|
* @return A native peer object for this font.
|
|
*
|
|
* @deprecated
|
|
*/
|
|
public FontPeer getPeer ()
|
|
{
|
|
return peer;
|
|
}
|
|
|
|
|
|
/**
|
|
* Returns a hash value for this font.
|
|
*
|
|
* @return A hash for this font.
|
|
*/
|
|
public int hashCode()
|
|
{
|
|
return this.toString().hashCode();
|
|
}
|
|
|
|
|
|
/**
|
|
* Tests whether or not the specified object is equal to this font. This
|
|
* will be true if and only if:
|
|
* <P>
|
|
* <ul>
|
|
* <li>The object is not <code>null</code>.
|
|
* <li>The object is an instance of <code>Font</code>.
|
|
* <li>The object has the same names, style, size, and transform as this object.
|
|
* </ul>
|
|
*
|
|
* @return <code>true</code> if the specified object is equal to this
|
|
* object, <code>false</code> otherwise.
|
|
*/
|
|
public boolean
|
|
equals(Object obj)
|
|
{
|
|
if (obj == null)
|
|
return(false);
|
|
|
|
if (!(obj instanceof Font))
|
|
return(false);
|
|
|
|
Font f = (Font)obj;
|
|
|
|
return (f.getName ().equals (this.getName ()) &&
|
|
f.getFamily ().equals (this.getFamily ()) &&
|
|
f.getFontName ().equals (this.getFontName ()) &&
|
|
f.getTransform ().equals (this.getTransform ()) &&
|
|
f.getSize() == this.getSize() &&
|
|
f.getStyle() == this.getStyle());
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Returns a string representation of this font.
|
|
*
|
|
* @return A string representation of this font.
|
|
*/
|
|
public String
|
|
toString()
|
|
{
|
|
String styleString = "";
|
|
|
|
switch (getStyle ())
|
|
{
|
|
case 0:
|
|
styleString = "plain";
|
|
break;
|
|
case 1:
|
|
styleString = "bold";
|
|
break;
|
|
case 2:
|
|
styleString = "italic";
|
|
break;
|
|
default:
|
|
styleString = "unknown";
|
|
}
|
|
|
|
return getClass ().getName ()
|
|
+ "[family=" + getFamily ()
|
|
+ ",name=" + getFontName ()
|
|
+ ",style=" + styleString
|
|
+ ",size=" + getSize () + "]";
|
|
}
|
|
|
|
|
|
/**
|
|
* Determines the line metrics for a run of text.
|
|
*
|
|
* @param str the text run to be measured.
|
|
*
|
|
* @param frc the font rendering parameters that are used for the
|
|
* measurement. The exact placement and size of text slightly
|
|
* depends on device-specific characteristics, for instance
|
|
* the device resolution or anti-aliasing. For this reason,
|
|
* the returned measurement will only be accurate if the
|
|
* passed <code>FontRenderContext</code> correctly reflects
|
|
* the relevant parameters. Hence, <code>frc</code> should be
|
|
* obtained from the same <code>Graphics2D</code> that will
|
|
* be used for drawing, and any rendering hints should be set
|
|
* to the desired values before obtaining <code>frc</code>.
|
|
*
|
|
* @see java.awt.Graphics2D#getFontRenderContext()
|
|
*/
|
|
public LineMetrics getLineMetrics(String str, FontRenderContext frc)
|
|
{
|
|
return getLineMetrics (str, 0, str.length () - 1, frc);
|
|
}
|
|
|
|
} // class Font
|
|
|