Attachment #122412 for bug #216013

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 216013
Collapse All | Expand All




<apidef name="awt">AWT API</apidef>
</apidefs>
<changes>
    <change id="ColorComboBox">
      <api name="awt"/>
      <summary>ColorComboBox for color selection.</summary>
      <version major="7" minor="49"/>
      <date day="26" month="7" year="2012"/>
      <author login="saubrecht"/>
      <compatibility addition="yes" binary="compatible" source="compatible" deprecation="no" semantic="compatible" modification="no" deletion="no"/>
      <description>
          There's a new class ColorComboBox that can be used as color picker.
      </description>
      <class package="org.openide.awt" name="ColorComboBox"/>
      <issue number="216013"/>
    </change>
    <change id="TabbedPaneFactorySubClass">
      <api name="awt"/>
      <summary>TabbedPaneFactory can be subclassed.</summary>

Lines 2-6 Link Here

(-)a/openide.awt/manifest.mf (-1 / +1 lines)
2	OpenIDE-Module: org.openide.awt	2	OpenIDE-Module: org.openide.awt
3	OpenIDE-Module-Localizing-Bundle: org/openide/awt/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/openide/awt/Bundle.properties
4	AutoUpdate-Essential-Module: true	4	AutoUpdate-Essential-Module: true
5	OpenIDE-Module-Specification-Version: 7.48	5	OpenIDE-Module-Specification-Version: 7.49
6		6




# either: default, never or always
#NOI18N
USE_MNEMONICS=default

#ColorComboBox
Custom=Custom ...
Black=Black
Blue=Blue
Cyan=Cyan
Dark_Gray=Dark Gray
Gray=Gray
Green=Green
Light_Gray=Light Gray
Magenta=Magenta
Orange=Orange
Pink=Pink
Red=Red
White=White
Yellow=Yellow

SelectColor=Select Color

Lines 1-4 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/colors/AnnotationsPanel.form (-1 / +10 lines)
1	<?xml version="1.1" encoding="UTF-8" ?>	1	<?xml version="1.0" encoding="UTF-8" ?>
2		2
3	<Form version="1.3" maxVersion="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">	3	<Form version="1.3" maxVersion="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
4	<AuxValues>	4	<AuxValues>
Lines 121-126 Link Here
121	<StringArray count="0"/>	121	<StringArray count="0"/>
122	</Property>	122	</Property>
123	</Properties>	123	</Properties>
		124	<AuxValues>
		125	<AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new ColorComboBox();"/>
		126	</AuxValues>
124	</Component>	127	</Component>
125	<Component class="javax.swing.JComboBox" name="cbBackground">	128	<Component class="javax.swing.JComboBox" name="cbBackground">
126	<Properties>	129	<Properties>
Lines 128-133 Link Here
128	<StringArray count="0"/>	131	<StringArray count="0"/>
129	</Property>	132	</Property>
130	</Properties>	133	</Properties>
		134	<AuxValues>
		135	<AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new ColorComboBox();"/>
		136	</AuxValues>
131	</Component>	137	</Component>
132	<Component class="javax.swing.JComboBox" name="cbWaveUnderlined">	138	<Component class="javax.swing.JComboBox" name="cbWaveUnderlined">
133	<Properties>	139	<Properties>
Lines 135-140 Link Here
135	<StringArray count="0"/>	141	<StringArray count="0"/>
136	</Property>	142	</Property>
137	</Properties>	143	</Properties>
		144	<AuxValues>
		145	<AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new ColorComboBox();"/>
		146	</AuxValues>
138	</Component>	147	</Component>
139	</SubComponents>	148	</SubComponents>
140	</Form>	149	</Form>





package org.netbeans.modules.options.colors;

import org.netbeans.modules.options.colors.spi.FontsColorsController;
import java.awt.Color;
import java.awt.Component;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;

import javax.swing.text.SimpleAttributeSet;
import javax.swing.text.StyleConstants;
import org.netbeans.api.editor.settings.EditorStyleConstants;
import org.netbeans.modules.options.colors.spi.FontsColorsController;
import org.openide.awt.ColorComboBox;
import org.openide.awt.Mnemonics;
import org.openide.util.NbBundle;


 * @author  Jan Jancura
 */
public class AnnotationsPanel extends JPanel implements ActionListener, 
    ItemListener, FontsColorsController {
    
    private ColorModel          colorModel;
    private boolean		listen = false;

        cbWaveUnderlined.getAccessibleContext ().setAccessibleDescription (loc ("AD_Wave_Underlined"));
        lCategories.getAccessibleContext ().setAccessibleName (loc ("AN_Categories"));
        lCategories.getAccessibleContext ().setAccessibleDescription (loc ("AD_Categories"));
        ColorComboBox.init (cbForeground);
        ColorComboBox.init (cbBackground);
        ColorComboBox.init (cbWaveUnderlined);
        lCategories.setSelectionMode (ListSelectionModel.SINGLE_SELECTION);
        lCategories.setVisibleRowCount (3);
        lCategories.addListSelectionListener (new ListSelectionListener () {

            }
        });
	lCategories.setCellRenderer (new CategoryRenderer ());
        cbForeground.addItemListener(this);
        cbBackground.addItemListener(this);
        cbWaveUnderlined.addItemListener(this);
        ((JComponent)cbBackground.getEditor()).addPropertyChangeListener (this);
        cbWaveUnderlined.addPropertyChangeListener (this);
        ((JComponent)cbWaveUnderlined.getEditor()).addPropertyChangeListener (this);
        
        lCategory.setLabelFor (lCategories);
        loc(lCategory, "CTL_Category");

        lForeground = new javax.swing.JLabel();
        lbackground = new javax.swing.JLabel();
        lWaveUnderlined = new javax.swing.JLabel();
        cbForeground = new ColorComboBox();
        cbBackground = new ColorComboBox();
        cbWaveUnderlined = new ColorComboBox();

        lCategory.setText(org.openide.util.NbBundle.getMessage(AnnotationsPanel.class, "CTL_Category")); // NOI18N


        changed = true;
    }
    
    @Override
    public void itemStateChanged( ItemEvent e ) {
        if( e.getStateChange() == ItemEvent.DESELECTED )
            return;
        if (!listen) return;
        if (evt.getPropertyName () != ColorComboBox.PROP_COLOR) return;
        updateData ();
    }
    

        Vector<AttributeSet> annotations = getAnnotations(currentScheme);
        SimpleAttributeSet c = (SimpleAttributeSet) annotations.get(lCategories.getSelectedIndex());
        
        Color color = ColorComboBoxSupport.getSelectedColor( (ColorComboBox)cbBackground );
        if (color != null) {
            c.addAttribute(StyleConstants.Background, color);
        } else {
            c.removeAttribute(StyleConstants.Background);
        }
        
        color = ColorComboBoxSupport.getSelectedColor( (ColorComboBox)cbForeground );
        if (color != null) {
            c.addAttribute(StyleConstants.Foreground, color);
        } else {
            c.removeAttribute(StyleConstants.Foreground);
        }
        
        color = ColorComboBoxSupport.getSelectedColor( (ColorComboBox)cbWaveUnderlined );
        if (color != null) {
            c.addAttribute(EditorStyleConstants.WaveUnderlineColor, color);
        } else {

            if (inheritedForeground == null) {
                inheritedForeground = Color.black;
            }
            ColorComboBoxSupport.setInheritedColor((ColorComboBox)cbForeground, inheritedForeground);
            
            Color inheritedBackground = (Color) defAs.getAttribute(StyleConstants.Background);
            if (inheritedBackground == null) {
                inheritedBackground = Color.white;
            }
            ColorComboBoxSupport.setInheritedColor((ColorComboBox)cbBackground, inheritedBackground);
        }

        // set values
        Vector<AttributeSet> annotations = getAnnotations (currentScheme);
        AttributeSet c = annotations.get (index);
        ColorComboBoxSupport.setSelectedColor( (ColorComboBox)cbForeground, (Color) c.getAttribute (StyleConstants.Foreground));
        ColorComboBoxSupport.setSelectedColor( (ColorComboBox)cbBackground, (Color) c.getAttribute (StyleConstants.Background));
        ((ColorComboBox)cbWaveUnderlined).setSelectedColor((Color) c.getAttribute (EditorStyleConstants.WaveUnderlineColor));
        );
        ColorComboBox.setColor (
            cbBackground,
            (Color) c.getAttribute (StyleConstants.Background)
        );
        ColorComboBox.setColor (
            cbWaveUnderlined,
            (Color) c.getAttribute (EditorStyleConstants.WaveUnderlineColor)
        );
        listen = true;
    }
    

Lines 97-102 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/colors/ColorValue.java (-1 / +1 lines)
97	}	97	}
98		98
99	private static String loc (String key) {	99	private static String loc (String key) {
100	return NbBundle.getMessage (ColorComboBox.class, key);	100	return NbBundle.getMessage (ColorComboBoxSupport.class, key);
101	}	101	}
102	}	102	}

Lines 107-112 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/colors/HighlightingPanel.form (+6 lines)
107	<StringArray count="0"/>	107	<StringArray count="0"/>
108	</Property>	108	</Property>
109	</Properties>	109	</Properties>
		110	<AuxValues>
		111	<AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new ColorComboBox();"/>
		112	</AuxValues>
110	</Component>	113	</Component>
111	<Component class="javax.swing.JComboBox" name="cbForeground">	114	<Component class="javax.swing.JComboBox" name="cbForeground">
112	<Properties>	115	<Properties>
Lines 114-119 Link Here
114	<StringArray count="0"/>	117	<StringArray count="0"/>
115	</Property>	118	</Property>
116	</Properties>	119	</Properties>
		120	<AuxValues>
		121	<AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new ColorComboBox();"/>
		122	</AuxValues>
117	</Component>	123	</Component>
118	</SubComponents>	124	</SubComponents>
119	</Form>	125	</Form>





package org.netbeans.modules.options.colors;

import org.netbeans.modules.options.colors.spi.FontsColorsController;
import java.awt.Color;
import java.awt.Component;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;

import javax.swing.text.AttributeSet;
import javax.swing.text.SimpleAttributeSet;
import javax.swing.text.StyleConstants;
import org.netbeans.modules.options.colors.spi.FontsColorsController;
import org.openide.awt.ColorComboBox;
import org.openide.awt.Mnemonics;
import org.openide.util.NbBundle;


 *
 * @author  Jan Jancura
 */
public class HighlightingPanel extends JPanel implements ActionListener, ItemListener, FontsColorsController {
    
    private ColorModel          colorModel = null;
    private boolean             listen = false;

        cbForeground.getAccessibleContext ().setAccessibleDescription (loc ("AD_Foreground_Chooser"));
        cbBackground.getAccessibleContext ().setAccessibleName (loc ("AN_Background_Chooser"));
        cbBackground.getAccessibleContext ().setAccessibleDescription (loc ("AD_Background_Chooser"));
        ColorComboBox.init (cbForeground);
        ColorComboBox.init (cbBackground);
        lCategories.setSelectionMode (ListSelectionModel.SINGLE_SELECTION);
        lCategories.setVisibleRowCount (3);
        lCategories.addListSelectionListener (new ListSelectionListener () {

            }
        });
        lCategories.setCellRenderer (new CategoryRenderer ());
        cbForeground.addItemListener(this);
        cbBackground.addItemListener (this);
        cbBackground.addActionListener (this);
        ((JComponent) cbBackground.getEditor ()).addPropertyChangeListener (this);

        lCategory.setLabelFor (lCategories);
        loc (lCategory, "CTL_Category");

        lCategories = new javax.swing.JList();
        lForeground = new javax.swing.JLabel();
        lBackground = new javax.swing.JLabel();
        cbBackground = new ColorComboBox();
        cbForeground = new ColorComboBox();

        lCategory.setText(org.openide.util.NbBundle.getMessage(HighlightingPanel.class, "CTL_Category")); // NOI18N


    }
    
    @Override
    public void itemStateChanged( ItemEvent e ) {
        if( e.getStateChange() == ItemEvent.DESELECTED )
            return;
        if (!listen) return;
        updateData ();
        changed = true;
            changed = true;
        }
    }
    
    @Override

        AttributeSet category = categories.get(lCategories.getSelectedIndex());
        SimpleAttributeSet c = new SimpleAttributeSet(category);
        
        Color color = ColorComboBoxSupport.getSelectedColor( (ColorComboBox)cbBackground );
        if (color != null) {
            c.addAttribute(StyleConstants.Background, color);
        } else {
            c.removeAttribute(StyleConstants.Background);
        }
        
        color = ColorComboBoxSupport.getSelectedColor( (ColorComboBox)cbForeground );
        if (color != null) {
            c.addAttribute(StyleConstants.Foreground, color);
        } else {

            if (inheritedForeground == null) {
                inheritedForeground = Color.black;
            }
            ColorComboBoxSupport.setInheritedColor((ColorComboBox)cbForeground, inheritedForeground);
            
            Color inheritedBackground = (Color) defAs.getAttribute(StyleConstants.Background);
            if (inheritedBackground == null) {
                inheritedBackground = Color.white;
            }
            ColorComboBoxSupport.setInheritedColor((ColorComboBox)cbBackground, inheritedBackground);
        }
        
        // set values
        ColorComboBoxSupport.setSelectedColor((ColorComboBox)cbForeground, (Color) category.getAttribute (StyleConstants.Foreground));
        ColorComboBoxSupport.setSelectedColor((ColorComboBox)cbBackground, (Color) category.getAttribute (StyleConstants.Background));
            (Color) category.getAttribute (StyleConstants.Foreground)
        );
        ColorComboBox.setColor (
            cbBackground,
            (Color) category.getAttribute (StyleConstants.Background)
        );
        listen = true;
    }
    

Lines 219-224 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.form (+9 lines)
219	<StringArray count="0"/>	219	<StringArray count="0"/>
220	</Property>	220	</Property>
221	</Properties>	221	</Properties>
		222	<AuxValues>
		223	<AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new org.openide.awt.ColorComboBox();"/>
		224	</AuxValues>
222	</Component>	225	</Component>
223	<Component class="javax.swing.JComboBox" name="cbBackground">	226	<Component class="javax.swing.JComboBox" name="cbBackground">
224	<Properties>	227	<Properties>
Lines 226-231 Link Here
226	<StringArray count="0"/>	229	<StringArray count="0"/>
227	</Property>	230	</Property>
228	</Properties>	231	</Properties>
		232	<AuxValues>
		233	<AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new ColorComboBox();"/>
		234	</AuxValues>
229	</Component>	235	</Component>
230	<Component class="javax.swing.JComboBox" name="cbEffects">	236	<Component class="javax.swing.JComboBox" name="cbEffects">
231	<Properties>	237	<Properties>
Lines 240-245 Link Here
240	<StringArray count="0"/>	246	<StringArray count="0"/>
241	</Property>	247	</Property>
242	</Properties>	248	</Properties>
		249	<AuxValues>
		250	<AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new ColorComboBox();"/>
		251	</AuxValues>
243	</Component>	252	</Component>
244	<Component class="javax.swing.JTextField" name="tfFont">	253	<Component class="javax.swing.JTextField" name="tfFont">
245	</Component>	254	</Component>





package org.netbeans.modules.options.colors;

import org.netbeans.modules.options.colors.spi.FontsColorsController;
import java.awt.Color;
import java.awt.Component;
import java.awt.Font;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyEditor;

import org.netbeans.api.editor.settings.FontColorNames;
import org.netbeans.api.editor.settings.FontColorSettings;
import org.netbeans.modules.options.colors.ColorModel.Preview;
import org.netbeans.modules.options.colors.spi.FontsColorsController;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
import org.openide.awt.ColorComboBox;
import org.openide.awt.Mnemonics;
import org.openide.util.NbBundle;
import org.openide.util.RequestProcessor;

 * @author  Jan Jancura
 */
public class SyntaxColoringPanel extends JPanel implements ActionListener, 
    PropertyChangeListener, FontsColorsController, ItemListener {
    
    
    private Preview             preview;

        cbEffects.getAccessibleContext ().setAccessibleDescription (loc ("AD_Efects_Color_Chooser"));
        cbEffectColor.getAccessibleContext ().setAccessibleName (loc ("AN_Efects_Color"));
        cbEffectColor.getAccessibleContext ().setAccessibleDescription (loc ("AD_Efects_Color"));
        ColorComboBox.init (cbBackground);
        ColorComboBox.init (cbForeground);
        ColorComboBox.init (cbEffectColor);
        cbLanguage.addActionListener (this);
        lCategories.setSelectionMode (ListSelectionModel.SINGLE_SELECTION);
        lCategories.setVisibleRowCount (3);

        tfFont.setEditable (false);
        bFont.addActionListener (this);
        bFont.setMargin (new Insets (0, 0, 0, 0));
        cbForeground.addItemListener(this);
        cbBackground.addItemListener(this);

        cbBackground.addActionListener (this);
        ((JComponent)cbBackground.getEditor()).addPropertyChangeListener (this);
        
        cbEffects.addItem (loc ("CTL_Effects_None"));
        cbEffects.addItem (loc ("CTL_Effects_Underlined"));

        cbEffects.getAccessibleContext ().setAccessibleName (loc ("AN_Effects"));
        cbEffects.getAccessibleContext ().setAccessibleDescription (loc ("AD_Effects"));
        cbEffects.addActionListener (this);
        cbEffectColor.addItemListener(this);
        cbEffectColor.addActionListener (this);
        
        loc(bFont, "CTL_Font_button");
        loc(lBackground, "CTL_Background_label");

        lBackground = new javax.swing.JLabel();
        lEffects = new javax.swing.JLabel();
        lEffectColor = new javax.swing.JLabel();
        cbForeground = new org.openide.awt.ColorComboBox();
        cbBackground = new ColorComboBox();
        cbEffects = new javax.swing.JComboBox();
        cbEffectColor = new ColorComboBox();
        tfFont = new javax.swing.JTextField();
        bFont = new javax.swing.JButton();


    public void actionPerformed (ActionEvent evt) {
        if (!listen) return;
	if (evt.getSource () == cbEffects) {
            if (cbEffects.getSelectedIndex () == 0)
                cbEffectColor.setSelectedItem( null );
	    cbEffectColor.setEnabled (cbEffects.getSelectedIndex () > 0);
            if (cbEffects.getSelectedIndex () == 0)
                ColorComboBox.setColor (cbEffectColor, null);
            updateData ();
	} else
	if (evt.getSource () == cbLanguage) {

                    break;
                }
            }
        } else if (ColorComboBox.PROP_COLOR.equals(evt.getPropertyName())) {
            updateData();
        }
    }
    

              wave = null, 
              strikethrough = null;
        if (cbEffects.getSelectedIndex () == 1)
            underline = ((ColorComboBox)cbEffectColor).getSelectedColor();
        if (cbEffects.getSelectedIndex () == 2)
            wave = ((ColorComboBox)cbEffectColor).getSelectedColor();
        if (cbEffects.getSelectedIndex () == 3)
            strikethrough = ((ColorComboBox)cbEffectColor).getSelectedColor();
        
        SimpleAttributeSet c = category != null ? new SimpleAttributeSet(category) : new SimpleAttributeSet();
        
        Color color = ColorComboBoxSupport.getSelectedColor( (ColorComboBox)cbBackground );
        if (color != null) {
            c.addAttribute(StyleConstants.Background, color);
        } else {
            c.removeAttribute(StyleConstants.Background);
        }
        
        color = ColorComboBoxSupport.getSelectedColor( (ColorComboBox)cbForeground );
        if (color != null) {
            c.addAttribute(StyleConstants.Foreground, color);
        } else {

            bFont.setEnabled (false);
            cbEffects.setEnabled (false);
            cbForeground.setEnabled (false);
            ((org.openide.awt.ColorComboBox)cbForeground).setSelectedColor( null );
            cbBackground.setEnabled (false);
            cbBackground.setSelectedItem (new ColorValue (null, null));
            cbEffectColor.setEnabled (false);

        Color inheritedForeground = (Color) getDefault 
            (currentLanguage, category, StyleConstants.Foreground);
        if (inheritedForeground == null) inheritedForeground = Color.black;
        ColorComboBoxSupport.setInheritedColor ((ColorComboBox)cbForeground, inheritedForeground);
        Color inheritedBackground = (Color) getDefault 
            (currentLanguage, category, StyleConstants.Background);
        if (inheritedBackground == null) inheritedBackground = Color.white;
        ColorComboBoxSupport.setInheritedColor ((ColorComboBox)cbBackground, inheritedBackground);
        
        String font = fontToString (category);
        tfFont.setText (font);
        ColorComboBoxSupport.setSelectedColor( (ColorComboBox)cbForeground, (Color) category.getAttribute (StyleConstants.Foreground));
        ColorComboBoxSupport.setSelectedColor( (ColorComboBox)cbBackground, (Color) category.getAttribute (StyleConstants.Background));
            (Color) category.getAttribute (StyleConstants.Foreground)
        );
        ColorComboBox.setColor (
            cbBackground,
            (Color) category.getAttribute (StyleConstants.Background)
        );
        
        if (category.getAttribute (StyleConstants.Underline) != null) {
            cbEffects.setSelectedIndex (1);
            cbEffectColor.setEnabled (true);
            ((ColorComboBox)cbEffectColor).setSelectedColor((Color) category.getAttribute (StyleConstants.Underline));
                cbEffectColor,
                (Color) category.getAttribute (StyleConstants.Underline)
            );
        } else
        if (category.getAttribute (EditorStyleConstants.WaveUnderlineColor) != null) {
            cbEffects.setSelectedIndex (2);
            cbEffectColor.setEnabled (true);
            ((ColorComboBox)cbEffectColor).setSelectedColor((Color) category.getAttribute (EditorStyleConstants.WaveUnderlineColor));
                cbEffectColor,
                (Color) category.getAttribute (EditorStyleConstants.WaveUnderlineColor)
            );
        } else
        if (category.getAttribute (StyleConstants.StrikeThrough) != null) {
            cbEffects.setSelectedIndex (3);
            cbEffectColor.setEnabled (true);
            ((ColorComboBox)cbEffectColor).setSelectedColor((Color) category.getAttribute (StyleConstants.StrikeThrough));
                cbEffectColor,
                (Color) category.getAttribute (StyleConstants.StrikeThrough)
            );
        } else
        if (getDefault (currentLanguage, category, StyleConstants.Underline) != null) {
            cbEffects.setSelectedIndex (1);
            cbEffectColor.setEnabled (true);
            ((ColorComboBox)cbEffectColor).setSelectedColor((Color) getDefault (currentLanguage, category, StyleConstants.Underline));
                cbEffectColor,
                (Color) getDefault (currentLanguage, category, StyleConstants.Underline)
            );
        } else
        if (getDefault (currentLanguage, category, EditorStyleConstants.WaveUnderlineColor) != null) {
            cbEffects.setSelectedIndex (2);
            cbEffectColor.setEnabled (true);
            ((ColorComboBox)cbEffectColor).setSelectedColor((Color) getDefault (currentLanguage, category, EditorStyleConstants.WaveUnderlineColor));
                cbEffectColor,
                (Color) getDefault (currentLanguage, category, EditorStyleConstants.WaveUnderlineColor)
            );
        } else
        if (getDefault (currentLanguage, category, StyleConstants.StrikeThrough) != null) {
            cbEffects.setSelectedIndex (3);
            cbEffectColor.setEnabled (true);
            ((ColorComboBox)cbEffectColor).setSelectedColor((Color) getDefault (currentLanguage, category, StyleConstants.StrikeThrough));
                cbEffectColor,
                (Color) getDefault (currentLanguage, category, StyleConstants.StrikeThrough)
            );
        } else {
            cbEffects.setSelectedIndex (0);
            cbEffectColor.setEnabled (false);

        convertALC.put("literal", "keyword"); //NOI18N
        convertALC.put("keyword-directive", "keyword"); //NOI18N
    }

    @Override
    public void itemStateChanged( ItemEvent e ) {
        if( e.getStateChange() == ItemEvent.DESELECTED )
            return;
        updateData();
    }
    
    private static final class LanguagesComparator implements Comparator<String> {
        @Override

Return to bug 216013

Lines 50-55 Link Here

(-)a/openide.awt/apichanges.xml (+13 lines)
50	<apidef name="awt">AWT API</apidef>	50	<apidef name="awt">AWT API</apidef>
51	</apidefs>	51	</apidefs>
52	<changes>	52	<changes>
		53	<change id="ColorComboBox">
		54	<api name="awt"/>
		55	<summary>ColorComboBox for color selection.</summary>
		56	<version major="7" minor="49"/>
		57	<date day="26" month="7" year="2012"/>
		58	<author login="saubrecht"/>
		59	<compatibility addition="yes" binary="compatible" source="compatible" deprecation="no" semantic="compatible" modification="no" deletion="no"/>
		60	<description>
		61	There's a new class ColorComboBox that can be used as color picker.
		62	</description>
		63	<class package="org.openide.awt" name="ColorComboBox"/>
		64	<issue number="216013"/>
		65	</change>
53	<change id="TabbedPaneFactorySubClass">	66	<change id="TabbedPaneFactorySubClass">
54	<api name="awt"/>	67	<api name="awt"/>
55	<summary>TabbedPaneFactory can be subclassed.</summary>	68	<summary>TabbedPaneFactory can be subclassed.</summary>

Lines 125-127 Link Here

(-)a/openide.awt/src/org/openide/awt/Bundle.properties (+18 lines)
125	# either: default, never or always	125	# either: default, never or always
126	#NOI18N	126	#NOI18N
127	USE_MNEMONICS=default	127	USE_MNEMONICS=default
		128
		129	#ColorComboBox
		130	Custom=Custom ...
		131	Black=Black
		132	Blue=Blue
		133	Cyan=Cyan
		134	Dark_Gray=Dark Gray
		135	Gray=Gray
		136	Green=Green
		137	Light_Gray=Light Gray
		138	Magenta=Magenta
		139	Orange=Orange
		140	Pink=Pink
		141	Red=Red
		142	White=White
		143	Yellow=Yellow
		144
		145	SelectColor=Select Color

Lines 6-18 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/colors/AnnotationsPanel.java (-35 / +23 lines)
6		6
7	package org.netbeans.modules.options.colors;	7	package org.netbeans.modules.options.colors;
8		8
9	import org.netbeans.modules.options.colors.spi.FontsColorsController;
10	import java.awt.Color;	9	import java.awt.Color;
11	import java.awt.Component;	10	import java.awt.Component;
12	import java.awt.event.ActionEvent;	11	import java.awt.event.ActionEvent;
13	import java.awt.event.ActionListener;	12	import java.awt.event.ActionListener;
14	import java.beans.PropertyChangeEvent;	13	import java.awt.event.ItemEvent;
15	import java.beans.PropertyChangeListener;	14	import java.awt.event.ItemListener;
16	import java.util.ArrayList;	15	import java.util.ArrayList;
17	import java.util.Collection;	16	import java.util.Collection;
18	import java.util.Collections;	17	import java.util.Collections;
Lines 34-39 Link Here
34	import javax.swing.text.SimpleAttributeSet;	33	import javax.swing.text.SimpleAttributeSet;
35	import javax.swing.text.StyleConstants;	34	import javax.swing.text.StyleConstants;
36	import org.netbeans.api.editor.settings.EditorStyleConstants;	35	import org.netbeans.api.editor.settings.EditorStyleConstants;
		36	import org.netbeans.modules.options.colors.spi.FontsColorsController;
		37	import org.openide.awt.ColorComboBox;
37	import org.openide.awt.Mnemonics;	38	import org.openide.awt.Mnemonics;
38	import org.openide.util.NbBundle;	39	import org.openide.util.NbBundle;
39		40
Lines 42-48 Link Here
42	* @author Jan Jancura	43	* @author Jan Jancura
43	*/	44	*/
44	public class AnnotationsPanel extends JPanel implements ActionListener,	45	public class AnnotationsPanel extends JPanel implements ActionListener,
45	PropertyChangeListener, FontsColorsController {	46	ItemListener, FontsColorsController {
46		47
47	private ColorModel colorModel;	48	private ColorModel colorModel;
48	private boolean listen = false;	49	private boolean listen = false;
Lines 67-75 Link Here
67	cbWaveUnderlined.getAccessibleContext ().setAccessibleDescription (loc ("AD_Wave_Underlined"));	68	cbWaveUnderlined.getAccessibleContext ().setAccessibleDescription (loc ("AD_Wave_Underlined"));
68	lCategories.getAccessibleContext ().setAccessibleName (loc ("AN_Categories"));	69	lCategories.getAccessibleContext ().setAccessibleName (loc ("AN_Categories"));
69	lCategories.getAccessibleContext ().setAccessibleDescription (loc ("AD_Categories"));	70	lCategories.getAccessibleContext ().setAccessibleDescription (loc ("AD_Categories"));
70	ColorComboBox.init (cbForeground);
71	ColorComboBox.init (cbBackground);
72	ColorComboBox.init (cbWaveUnderlined);
73	lCategories.setSelectionMode (ListSelectionModel.SINGLE_SELECTION);	71	lCategories.setSelectionMode (ListSelectionModel.SINGLE_SELECTION);
74	lCategories.setVisibleRowCount (3);	72	lCategories.setVisibleRowCount (3);
75	lCategories.addListSelectionListener (new ListSelectionListener () {	73	lCategories.addListSelectionListener (new ListSelectionListener () {
Lines 79-90 Link Here
79	}	77	}
80	});	78	});
81	lCategories.setCellRenderer (new CategoryRenderer ());	79	lCategories.setCellRenderer (new CategoryRenderer ());
82	cbForeground.addPropertyChangeListener (this);	80	cbForeground.addItemListener(this);
83	((JComponent)cbForeground.getEditor()).addPropertyChangeListener (this);	81	cbBackground.addItemListener(this);
84	cbBackground.addPropertyChangeListener (this);	82	cbWaveUnderlined.addItemListener(this);
85	((JComponent)cbBackground.getEditor()).addPropertyChangeListener (this);
86	cbWaveUnderlined.addPropertyChangeListener (this);
87	((JComponent)cbWaveUnderlined.getEditor()).addPropertyChangeListener (this);
88		83
89	lCategory.setLabelFor (lCategories);	84	lCategory.setLabelFor (lCategories);
90	loc(lCategory, "CTL_Category");	85	loc(lCategory, "CTL_Category");
Lines 107-115 Link Here
107	lForeground = new javax.swing.JLabel();	102	lForeground = new javax.swing.JLabel();
108	lbackground = new javax.swing.JLabel();	103	lbackground = new javax.swing.JLabel();
109	lWaveUnderlined = new javax.swing.JLabel();	104	lWaveUnderlined = new javax.swing.JLabel();
110	cbForeground = new javax.swing.JComboBox();	105	cbForeground = new ColorComboBox();
111	cbBackground = new javax.swing.JComboBox();	106	cbBackground = new ColorComboBox();
112	cbWaveUnderlined = new javax.swing.JComboBox();	107	cbWaveUnderlined = new ColorComboBox();
113		108
114	lCategory.setText(org.openide.util.NbBundle.getMessage(AnnotationsPanel.class, "CTL_Category")); // NOI18N	109	lCategory.setText(org.openide.util.NbBundle.getMessage(AnnotationsPanel.class, "CTL_Category")); // NOI18N
115		110
Lines 187-195 Link Here
187	changed = true;	182	changed = true;
188	}	183	}
189		184
190	public void propertyChange (PropertyChangeEvent evt) {	185	@Override
		186	public void itemStateChanged( ItemEvent e ) {
		187	if( e.getStateChange() == ItemEvent.DESELECTED )
		188	return;
191	if (!listen) return;	189	if (!listen) return;
192	if (evt.getPropertyName () != ColorComboBox.PROP_COLOR) return;
193	updateData ();	190	updateData ();
194	}	191	}
195		192
Lines 271-291 Link Here
271	Vector<AttributeSet> annotations = getAnnotations(currentScheme);	268	Vector<AttributeSet> annotations = getAnnotations(currentScheme);
272	SimpleAttributeSet c = (SimpleAttributeSet) annotations.get(lCategories.getSelectedIndex());	269	SimpleAttributeSet c = (SimpleAttributeSet) annotations.get(lCategories.getSelectedIndex());
273		270
274	Color color = ColorComboBox.getColor(cbBackground);	271	Color color = ColorComboBoxSupport.getSelectedColor( (ColorComboBox)cbBackground );
275	if (color != null) {	272	if (color != null) {
276	c.addAttribute(StyleConstants.Background, color);	273	c.addAttribute(StyleConstants.Background, color);
277	} else {	274	} else {
278	c.removeAttribute(StyleConstants.Background);	275	c.removeAttribute(StyleConstants.Background);
279	}	276	}
280		277
281	color = ColorComboBox.getColor(cbForeground);	278	color = ColorComboBoxSupport.getSelectedColor( (ColorComboBox)cbForeground );
282	if (color != null) {	279	if (color != null) {
283	c.addAttribute(StyleConstants.Foreground, color);	280	c.addAttribute(StyleConstants.Foreground, color);
284	} else {	281	} else {
285	c.removeAttribute(StyleConstants.Foreground);	282	c.removeAttribute(StyleConstants.Foreground);
286	}	283	}
287		284
288	color = ColorComboBox.getColor(cbWaveUnderlined);	285	color = ColorComboBoxSupport.getSelectedColor( (ColorComboBox)cbWaveUnderlined );
289	if (color != null) {	286	if (color != null) {
290	c.addAttribute(EditorStyleConstants.WaveUnderlineColor, color);	287	c.addAttribute(EditorStyleConstants.WaveUnderlineColor, color);
291	} else {	288	} else {
Lines 317-346 Link Here
317	if (inheritedForeground == null) {	314	if (inheritedForeground == null) {
318	inheritedForeground = Color.black;	315	inheritedForeground = Color.black;
319	}	316	}
320	ColorComboBox.setInheritedColor(cbForeground, inheritedForeground);	317	ColorComboBoxSupport.setInheritedColor((ColorComboBox)cbForeground, inheritedForeground);
321		318
322	Color inheritedBackground = (Color) defAs.getAttribute(StyleConstants.Background);	319	Color inheritedBackground = (Color) defAs.getAttribute(StyleConstants.Background);
323	if (inheritedBackground == null) {	320	if (inheritedBackground == null) {
324	inheritedBackground = Color.white;	321	inheritedBackground = Color.white;
325	}	322	}
326	ColorComboBox.setInheritedColor(cbBackground, inheritedBackground);	323	ColorComboBoxSupport.setInheritedColor((ColorComboBox)cbBackground, inheritedBackground);
327	}	324	}
328		325
329	// set values	326	// set values
330	Vector<AttributeSet> annotations = getAnnotations (currentScheme);	327	Vector<AttributeSet> annotations = getAnnotations (currentScheme);
331	AttributeSet c = annotations.get (index);	328	AttributeSet c = annotations.get (index);
332	ColorComboBox.setColor (	329	ColorComboBoxSupport.setSelectedColor( (ColorComboBox)cbForeground, (Color) c.getAttribute (StyleConstants.Foreground));
333	cbForeground,	330	ColorComboBoxSupport.setSelectedColor( (ColorComboBox)cbBackground, (Color) c.getAttribute (StyleConstants.Background));
334	(Color) c.getAttribute (StyleConstants.Foreground)	331	((ColorComboBox)cbWaveUnderlined).setSelectedColor((Color) c.getAttribute (EditorStyleConstants.WaveUnderlineColor));
335	);
336	ColorComboBox.setColor (
337	cbBackground,
338	(Color) c.getAttribute (StyleConstants.Background)
339	);
340	ColorComboBox.setColor (
341	cbWaveUnderlined,
342	(Color) c.getAttribute (EditorStyleConstants.WaveUnderlineColor)
343	);
344	listen = true;	332	listen = true;
345	}	333	}
346		334