Attachment #163014 for bug #269079

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 269079
Collapse All | Expand All

Lines 96-103 Link Here

(-)a/cnd.completion/src/org/netbeans/modules/cnd/completion/keywords/CsmKeywordCompletionItem.java (-2 / +4 lines)
96	if (CndUtils.isUnitTestMode()) {	96	if (CndUtils.isUnitTestMode()) {
97	coloredItemText = sortItemText;	97	coloredItemText = sortItemText;
98	} else {	98	} else {
99	AttributeSet keywordsColor = MimeLookup.getLookup(MimePath.get(MIMENames.CPLUSPLUS_MIME_TYPE)).lookup(FontColorSettings.class).getTokenFontColors("keyword"); //NOI18N	99	//AttributeSet keywordsColor = MimeLookup.getLookup(MimePath.get(MIMENames.CPLUSPLUS_MIME_TYPE)).lookup(FontColorSettings.class).getTokenFontColors("keyword"); //NOI18N
100	coloredItemText = CsmDisplayUtilities.addHTMLColor(sortItemText, keywordsColor);	100	//coloredItemText = CsmDisplayUtilities.addHTMLColor(sortItemText, keywordsColor);
		101	coloredItemText = CsmDisplayUtilities.addHTMLColor(sortItemText, new Color(0,0,230), true);
		102
101	}	103	}
102	return new CsmKeywordCompletionItem(substitutionOffset, NbCsmCompletionQuery.KEYWORDS_PRIORITY, sortItemText, appendItemText, coloredItemText, true, firstCompletion);	104	return new CsmKeywordCompletionItem(substitutionOffset, NbCsmCompletionQuery.KEYWORDS_PRIORITY, sortItemText, appendItemText, coloredItemText, true, firstCompletion);
103	}	105	}




import java.awt.Graphics;
import java.awt.event.KeyEvent;
import javax.swing.ImageIcon;
import javax.swing.text.AttributeSet;
import javax.swing.text.BadLocationException;
import javax.swing.text.JTextComponent;
import org.netbeans.api.editor.completion.Completion;

            if (CndUtils.isUnitTestMode()) {
                coloredItemText = noNewLine;
            } else {
                //coloredItemText = CsmDisplayUtilities.addHTMLColor(noNewLine, CsmFontColorManager.instance().getColorAttributes(MIMENames.CPLUSPLUS_MIME_TYPE, FontColorProvider.Entity.PREPROCESSOR_DIRECTIVE));
                coloredItemText = CsmDisplayUtilities.addHTMLColor(noNewLine, new Color(0,155,0), true);
            }
        } else {
            appendItemText = "";

            if (CndUtils.isUnitTestMode()) {
                coloredItemText = sortItemText;
            } else {
                //coloredItemText = CsmDisplayUtilities.addHTMLColor(sortItemText, CsmFontColorManager.instance().getColorAttributes(MIMENames.CPLUSPLUS_MIME_TYPE, FontColorProvider.Entity.PREPROCESSOR_DIRECTIVE));
                coloredItemText = CsmDisplayUtilities.addHTMLColor(sortItemText, new Color(0,155,0), true);
            }
        }
        return new CsmPreprocessorDirectiveCompletionItem(substitutionOffset, PRIORITY, sortItemText, appendItemText, coloredItemText, true);




        return buf.toString();
    }

    public static String addHTMLColor(String string, Color color, boolean bold) {
        if (color == null) {
            return string;
        }
        if (string.trim().length() == 0) {
            return string.replace(" ", "&nbsp;").replace("\n", "<br>"); //NOI18N
        }
        StringBuilder buf = new StringBuilder(string);
        if (bold) {
            buf.insert(0, "<b>"); //NOI18N
            buf.append("</b>"); //NOI18N
        }
        buf.insert(0, "<font color=" + getHTMLColor(color) + ">"); //NOI18N
        buf.append("</font>"); //NOI18N
        return buf.toString();
    }

    public static String getHTMLColor(Color c) {
        String colorR = "0" + Integer.toHexString(c.getRed()); //NOI18N
        colorR = colorR.substring(colorR.length() - 2);




    public static class TypedefPaintComponent extends CsmPaintComponent{

        String formatTypedefName;
        private final Color TYPEDEF_COLOR = new Color(46,146,199);//CsmFontColorManager.instance().getColor(FontColorProvider.Entity.TYPEDEF); //new Color(64,64,255).darker().darker().darker();
        //private boolean displayFQN;

        public void setFormatTypedefName(String formatTypedefName){

    }

    public static class FieldPaintComponent extends CsmPaintComponent{
        private Color FIELD_COLOR = new Color(64, 198, 88);//CsmFontColorManager.instance().getColor(FontColorProvider.Entity.CLASS_FIELD);//new Color(64,64,255).darker();
        protected String typeName;
        protected Color typeColor;
        protected String fldName;

    }

    public static class MacroPaintComponent extends CsmPaintComponent{
        private Color MACRO_NAME_COLOR = new Color(46,146,199);//CsmFontColorManager.instance().getColor(FontColorProvider.Entity.DEFINED_MACRO);//new Color(64,255,64).darker().darker();
        private Color MACRO_PARAMETER_NAME_COLOR = LFCustoms.shiftColor(new Color(227, 166, 74));//Color.magenta.darker();
        private List<CharSequence> params = null;
        private String name;

Return to bug 269079

Lines 233-238 Link Here

(-)a/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/CsmDisplayUtilities.java (+17 lines)
233	return buf.toString();	233	return buf.toString();
234	}	234	}
235		235
		236	public static String addHTMLColor(String string, Color color, boolean bold) {
		237	if (color == null) {
		238	return string;
		239	}
		240	if (string.trim().length() == 0) {
		241	return string.replace(" ", " ").replace("\n", "<br>"); //NOI18N
		242	}
		243	StringBuilder buf = new StringBuilder(string);
		244	if (bold) {
		245	buf.insert(0, "<b>"); //NOI18N
		246	buf.append("</b>"); //NOI18N
		247	}
		248	buf.insert(0, "<font color=" + getHTMLColor(color) + ">"); //NOI18N
		249	buf.append("</font>"); //NOI18N
		250	return buf.toString();
		251	}
		252
236	public static String getHTMLColor(Color c) {	253	public static String getHTMLColor(Color c) {
237	String colorR = "0" + Integer.toHexString(c.getRed()); //NOI18N	254	String colorR = "0" + Integer.toHexString(c.getRed()); //NOI18N
238	colorR = colorR.substring(colorR.length() - 2);	255	colorR = colorR.substring(colorR.length() - 2);

Lines 562-568 Link Here

(-)a/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/CsmPaintComponent.java (-3 / +3 lines)
562	public static class TypedefPaintComponent extends CsmPaintComponent{	562	public static class TypedefPaintComponent extends CsmPaintComponent{
563		563
564	String formatTypedefName;	564	String formatTypedefName;
565	private final Color TYPEDEF_COLOR = CsmFontColorManager.instance().getColor(FontColorProvider.Entity.TYPEDEF); //new Color(64,64,255).darker().darker().darker();	565	private final Color TYPEDEF_COLOR = new Color(46,146,199);//CsmFontColorManager.instance().getColor(FontColorProvider.Entity.TYPEDEF); //new Color(64,64,255).darker().darker().darker();
566	//private boolean displayFQN;	566	//private boolean displayFQN;
567		567
568	public void setFormatTypedefName(String formatTypedefName){	568	public void setFormatTypedefName(String formatTypedefName){
Lines 622-628 Link Here
622	}	622	}
623		623
624	public static class FieldPaintComponent extends CsmPaintComponent{	624	public static class FieldPaintComponent extends CsmPaintComponent{
625	private Color FIELD_COLOR = CsmFontColorManager.instance().getColor(FontColorProvider.Entity.CLASS_FIELD);//new Color(64,64,255).darker();	625	private Color FIELD_COLOR = new Color(64, 198, 88);//CsmFontColorManager.instance().getColor(FontColorProvider.Entity.CLASS_FIELD);//new Color(64,64,255).darker();
626	protected String typeName;	626	protected String typeName;
627	protected Color typeColor;	627	protected Color typeColor;
628	protected String fldName;	628	protected String fldName;
Lines 751-757 Link Here
751	}	751	}
752		752
753	public static class MacroPaintComponent extends CsmPaintComponent{	753	public static class MacroPaintComponent extends CsmPaintComponent{
754	private Color MACRO_NAME_COLOR = CsmFontColorManager.instance().getColor(FontColorProvider.Entity.DEFINED_MACRO);//new Color(64,255,64).darker().darker();	754	private Color MACRO_NAME_COLOR = new Color(46,146,199);//CsmFontColorManager.instance().getColor(FontColorProvider.Entity.DEFINED_MACRO);//new Color(64,255,64).darker().darker();
755	private Color MACRO_PARAMETER_NAME_COLOR = LFCustoms.shiftColor(new Color(227, 166, 74));//Color.magenta.darker();	755	private Color MACRO_PARAMETER_NAME_COLOR = LFCustoms.shiftColor(new Color(227, 166, 74));//Color.magenta.darker();
756	private List<CharSequence> params = null;	756	private List<CharSequence> params = null;
757	private String name;	757	private String name;

Lines 35-40 Link Here

(-)a/cnd.completion/src/org/netbeans/modules/cnd/completion/preprocessor/CsmPreprocessorDirectiveCompletionItem.java (-2 / +5 lines)
35	import java.awt.Graphics;	35	import java.awt.Graphics;
36	import java.awt.event.KeyEvent;	36	import java.awt.event.KeyEvent;
37	import javax.swing.ImageIcon;	37	import javax.swing.ImageIcon;
		38	import javax.swing.text.AttributeSet;
38	import javax.swing.text.BadLocationException;	39	import javax.swing.text.BadLocationException;
39	import javax.swing.text.JTextComponent;	40	import javax.swing.text.JTextComponent;
40	import org.netbeans.api.editor.completion.Completion;	41	import org.netbeans.api.editor.completion.Completion;
Lines 86-92 Link Here
86	if (CndUtils.isUnitTestMode()) {	87	if (CndUtils.isUnitTestMode()) {
87	coloredItemText = noNewLine;	88	coloredItemText = noNewLine;
88	} else {	89	} else {
89	coloredItemText = CsmDisplayUtilities.addHTMLColor(noNewLine, CsmFontColorManager.instance().getColorAttributes(MIMENames.CPLUSPLUS_MIME_TYPE, FontColorProvider.Entity.PREPROCESSOR_DIRECTIVE));	90	//coloredItemText = CsmDisplayUtilities.addHTMLColor(noNewLine, CsmFontColorManager.instance().getColorAttributes(MIMENames.CPLUSPLUS_MIME_TYPE, FontColorProvider.Entity.PREPROCESSOR_DIRECTIVE));
		91	coloredItemText = CsmDisplayUtilities.addHTMLColor(noNewLine, new Color(0,155,0), true);
90	}	92	}
91	} else {	93	} else {
92	appendItemText = "";	94	appendItemText = "";
Lines 94-100 Link Here
94	if (CndUtils.isUnitTestMode()) {	96	if (CndUtils.isUnitTestMode()) {
95	coloredItemText = sortItemText;	97	coloredItemText = sortItemText;
96	} else {	98	} else {
97	coloredItemText = CsmDisplayUtilities.addHTMLColor(sortItemText, CsmFontColorManager.instance().getColorAttributes(MIMENames.CPLUSPLUS_MIME_TYPE, FontColorProvider.Entity.PREPROCESSOR_DIRECTIVE));	99	//coloredItemText = CsmDisplayUtilities.addHTMLColor(sortItemText, CsmFontColorManager.instance().getColorAttributes(MIMENames.CPLUSPLUS_MIME_TYPE, FontColorProvider.Entity.PREPROCESSOR_DIRECTIVE));
		100	coloredItemText = CsmDisplayUtilities.addHTMLColor(sortItemText, new Color(0,155,0), true);
98	}	101	}
99	}	102	}
100	return new CsmPreprocessorDirectiveCompletionItem(substitutionOffset, PRIORITY, sortItemText, appendItemText, coloredItemText, true);	103	return new CsmPreprocessorDirectiveCompletionItem(substitutionOffset, PRIORITY, sortItemText, appendItemText, coloredItemText, true);