Attachment #121111 for bug #134281

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

Lines 173-178 Link Here

(-)a/cnd.completion/nbproject/project.xml (+8 lines)
173	</run-dependency>	173	</run-dependency>
174	</dependency>	174	</dependency>
175	<dependency>	175	<dependency>
		176	<code-name-base>org.netbeans.swing.plaf</code-name-base>
		177	<build-prerequisite/>
		178	<compile-dependency/>
		179	<run-dependency>
		180	<specification-version>1.27</specification-version>
		181	</run-dependency>
		182	</dependency>
		183	<dependency>
176	<code-name-base>org.openide.awt</code-name-base>	184	<code-name-base>org.openide.awt</code-name-base>
177	<build-prerequisite/>	185	<build-prerequisite/>
178	<compile-dependency/>	186	<compile-dependency/>




import org.netbeans.spi.editor.completion.CompletionItem;
import org.netbeans.spi.editor.completion.CompletionTask;
import org.openide.util.Lookup;
import org.netbeans.swing.plaf.LFCustoms;
/**
 *
 * @author  Vladimir Voskresensky

        DOT_TO_ARROW,
        ARROW_TO_DOT,
    }

    private static boolean enableInstantSubstitution = true;
    protected int selectionStartOffset = -1;
    protected int selectionEndOffset = -1;
    protected int substituteOffset = -1;
    CsmObject associatedObject;
    private static final Color KEYWORD_COLOR = Color.lightGray;
    private static final Color TYPE_COLOR = Color.black;
    private int priority;
    private SubstitutionHint hint;


    void setHint(SubstitutionHint hint) {
        this.hint = hint;
    }

    protected SubstitutionHint getHint() {
        return this.hint;
    }

    protected static Color getTypeColor(CsmType type) {
        return type.isBuiltInBased(false) ? LFCustoms.shiftColor(KEYWORD_COLOR) : LFCustoms.getTextFgColor();
    }

    public void setSubstituteOffset(int substituteOffset) {

        Component comp = getPaintComponent(false);
        return comp != null ? comp.toString() : ""; //NOI18N
    }

    protected int convertCsmModifiers(CsmObject obj) {
        return CsmUtilities.getModifiers(obj);
    }

                if (type == null) {
                    // only var args parameters could have null types
                    assert (((CsmParameter) prm).isVarArgs()) : " non var arg " + prm + " of class " + prm.getClass().getName();
                    params.add(new ParamStr("", "", ((CsmParameter) prm).getName().toString(), prm.getText().toString(), true, LFCustoms.shiftColor(KEYWORD_COLOR))); //NOI18N
                    varArgIndex = i;
                } else {
                    String typeName = getTypeName(type, instantiateTypes);
                    params.add(new ParamStr(typeName, typeName, ((CsmParameter) prm).getName().toString(), prm.getText().toString(), false, LFCustoms.getTextFgColor() /*getTypeColor(type.getClassifier())*/));
                }
                i++;
            }

            List<String> ret = new ArrayList<String>();
            for (Iterator<ParamStr> it = getParams().iterator(); it.hasNext();) {
                StringBuilder sb = new StringBuilder();
                ParamStr ps = it.next();
                if (ps.isVarArg()) {
                    sb.append(ps.getSimpleTypeName());
                    sb.append("..."); // NOI18N

//            this.prm = prm;
//            this.typeColor = typeColor;
//        }
//
//        public String getTypeName() {
//            return type;
//        }
//
//        public String getSimpleTypeName() {
//            return simpleType;
//        }
//
//        public String getName() {
//            return prm;
//        }
//
//        public Color getTypeColor() {
//            return typeColor;
//        }

//            this.name = name;
//            this.typeColor = typeColor;
//        }
//
//        public String getName() {
//            return name;
//        }
//
//        public Color getTypeColor() {
//            return typeColor;
//        }

Lines 86-91 Link Here

(-)a/cnd.modelutil/nbproject/project.xml (+8 lines)
86	</run-dependency>	86	</run-dependency>
87	</dependency>	87	</dependency>
88	<dependency>	88	<dependency>
		89	<code-name-base>org.netbeans.swing.plaf</code-name-base>
		90	<build-prerequisite/>
		91	<compile-dependency/>
		92	<run-dependency>
		93	<specification-version>1.27</specification-version>
		94	</run-dependency>
		95	</dependency>
		96	<dependency>
89	<code-name-base>org.openide.awt</code-name-base>	97	<code-name-base>org.openide.awt</code-name-base>
90	<build-prerequisite/>	98	<build-prerequisite/>
91	<compile-dependency/>	99	<compile-dependency/>




import org.openide.text.CloneableEditorSupport;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.netbeans.swing.plaf.LFCustoms;

/**
 *

        }
        return displayText;
    }

    public static String getLineHtml(int startLine, int endLine, final int stToken, final int endToken, BaseDocument doc) throws BadLocationException {
        int startBold = stToken - startLine;
        int endBold = endToken - startLine;


    private static String getString(String key, CharSequence value) {
        return NbBundle.getMessage(CsmDisplayUtilities.class, key, value);
    }

    private static String getString(String key, CharSequence value1, CharSequence value2) {
        return NbBundle.getMessage(CsmDisplayUtilities.class, key, value1, value2);
    }

    private static String getString(String key, CharSequence value1, CharSequence value2, CharSequence value3, CharSequence value4) {
        return NbBundle.getMessage(CsmDisplayUtilities.class, key, new Object[] {value1, value2, value3, value4});
    }

    private final static boolean SKIP_COLORING = Boolean.getBoolean("cnd.test.skip.coloring");// NOI18N

    private static void appendHtml(StringBuilder buf, TokenSequence<?> ts) {

            buf.insert(0, "<s>"); // NOI18N
            buf.append("</s>"); // NOI18N
        }
        buf.insert(0, "<font color=" + getHTMLColor(LFCustoms.getForeground(set)) + ">"); //NOI18N
        buf.append("</font>"); //NOI18N
        return buf.toString();
    }

        String html_color = "#" + colorR + colorG + colorB; //NOI18N
        return html_color;
    }

    private static String trimStart(String s) {
        for (int x = 0; x < s.length(); x++) {
            if (Character.isWhitespace(s.charAt(x))) {




import javax.swing.BorderFactory;
import javax.swing.Icon;
import javax.swing.JPanel;
import org.netbeans.swing.plaf.LFCustoms;

/**
 *

 */

public abstract class CsmPaintComponent extends JPanel {

    DrawState drawState = new DrawState();

    protected Font drawFont;

    private static final int ICON_WIDTH = 16;
    private static final int ICON_TEXT_GAP = 5;

    private int fontHeight;

    private int ascent;

    private Map widths;

    private FontMetrics fontMetrics;

    protected boolean isSelected;

   // private String text;

    private ArrayList<PostfixString> postfixes;

    private static final String THROWS = " throws "; // NOI18N


    private static final String[] frequentWords = new String[] {
        "", " ", "[]", "(", ")", ", ", "String", THROWS // NOI18N
    };

    private final static Color KEYWORD_COLOR = Color.gray;
    private final static Color POSTFIX_COLOR = Color.lightGray;

    
    private Icon icon;

    protected int modifiers = 0;

    private static Border BORDER = BorderFactory.createEmptyBorder(0, 3, 0, 3);
    private static LayoutManager layout = new FlowLayout();
    public CsmPaintComponent(){
        super(layout, true);
        setBorder(BORDER);
        postfixes = new ArrayList<PostfixString>();
    }

    public void setSelected(boolean isSelected){
        this.isSelected = isSelected;
    }

    protected boolean isSelected(){
        return isSelected;
    }

    @Override
    public void paintComponent(Graphics g) {
        // clear background
        Color postfixColor = LFCustoms.shiftColor(POSTFIX_COLOR);
        g.setColor(getBackground());
        java.awt.Rectangle r = g.getClipBounds();
        g.fillRect(r.x, r.y, r.width, r.height);
        draw(g);

        if(!postfixes.isEmpty()) {
            drawString(g, " (", postfixColor); // NOI18N
            Iterator iter = postfixes.iterator();
            while(iter.hasNext()) {
                ((PostfixString) iter.next()).Draw(g);
                if(iter.hasNext()) {
                    drawString(g, ",  ", postfixColor); // NOI18N
                }
            }
            drawString(g, ")", postfixColor); // NOI18N
        }
    }

    public void appendPostfix(String text, Color c, int font) {
        postfixes.add(new PostfixString(text, c, font));
    }

    public void removePostfixes() {
        postfixes.clear();
    }

    public boolean hasPostfixes() {
        return !postfixes.isEmpty();
    }

    /** IMPORTANT:
     * when implemented => have to update toString!
     */
    abstract protected void draw(Graphics g);

    /**
     * returns string representation of paint item
     * IMPORTANT: have to be in sync with draw() method
     */
    @Override
    abstract public String toString();

    protected void setIcon(Icon icon){
        this.icon = icon;
    }

    protected Icon getIcon(){
        return icon;
    }


    /** Draw the icon if it is valid for the given type.
     * Here the initial drawing assignments are also done.
     */

            drawState.drawX = 0;
            drawState.drawY = 0;
        }

        if (icon != null) {
            if (g != null) {
                icon.paintIcon(this, g, drawState.drawX, drawState.drawY);

        drawState.drawHeight += drawState.drawY;
        drawState.drawY += ascent;
    }

    protected void drawString(Graphics g, CharSequence s){
        drawString(g, s, false);
    }

    /** Draw string using the foreground color */
    protected void drawString(Graphics g, CharSequence s, boolean strike) {
        if (g != null) {

        }
        drawStringToGraphics(g, s, null, strike);
    }


    /** Draw string with given color which is first possibly modified
     * by calling getColor() method to care about selection etc.
     */

        }
        drawStringToGraphics(g, s);
    }

    protected void drawString(Graphics g, CharSequence s, Color c, Font font, boolean strike) {
        if (g != null) {
            g.setColor(getColor(s, c));

        if (g != null) {
            g.setFont(drawFont);
        }

    }

    protected void drawTypeName(Graphics g, String s, Color c) {
        if (g == null) {
            drawString(g, "   "); // NOI18N

            drawString(g, s, c);
        }
    }

    protected void drawStringToGraphics(Graphics g, CharSequence s) {
        drawStringToGraphics(g, s, null, false);
    }

    protected void drawStringToGraphics(Graphics g, CharSequence s, Font font, boolean strike) {
        String str = s != null ? s.toString() : "";
        if (g != null) {

        }
        drawState.drawX += getWidth(str, font);
    }

    protected int getWidth(String s) {
        Integer i = (Integer)widths.get(s);
        if (i != null) {

            return fontMetrics.stringWidth(s);
        }
    }

    protected int getWidth(String s, Font font) {
        if (font == null) {
            return getWidth(s);
        }
        return getFontMetrics(font).stringWidth(s);
    }

    protected Color getColor(CharSequence s, Color defaultColor) {
        return isSelected ? getForeground()
        : defaultColor;
    }

    private void storeWidth(String s) {
        fontMetrics.stringWidth(s);
    }

    @Override
    public void setFont(Font font) {
        super.setFont(font);

        fontMetrics = this.getFontMetrics(font);
        fontHeight = fontMetrics.getHeight();
        ascent = fontMetrics.getAscent();

        }
        drawFont = font;
    }

    protected Font getDrawFont(){
        return drawFont;
    }

    @Override
    public Dimension getPreferredSize() {
        draw(null);

        }
        return new Dimension(drawState.drawX, drawState.drawHeight);
    }

    public void setModifiers(int modifiers){
        this.modifiers = modifiers;
    }

    public int getModifiers(){
        return modifiers;
    }

    DrawState getDrawState() {
        return drawState;
    }

    void setDrawState(DrawState drawState) {
        this.drawState = drawState;
    }

    //.................. INNER CLASSES .......................

    private class PostfixString {
        private String text;
        private Color c;
        private int fontStyle;

        public PostfixString(String text, Color c, int fontStyle) {
            this.text = text;
            this.c = c;
            this.fontStyle = fontStyle;
        }

        public PostfixString(String text, int fontStyle) {
            this(text, LFCustoms.shiftColor(CsmPaintComponent.POSTFIX_COLOR), fontStyle);
        }

        void Draw(Graphics g) {
            CsmPaintComponent.this.drawString(g, text, c, new Font(getDrawFont().getName(),
                                                                   getDrawFont().getStyle() | fontStyle,
                                                                   getDrawFont().getSize()),
                                               false);

        }
    }

    private static class DrawState {
        int drawX, drawY;
        int drawHeight;

        public DrawState() {
            drawX = drawY = drawHeight = 0;
        }
    }

    public static class NamespacePaintComponent extends CsmPaintComponent{

        private String pkgName;
        private boolean displayFullNamespacePath;
        private Color NAMESPACE_COLOR = LFCustoms.shiftColor(new Color(64,255,64));

        public NamespacePaintComponent(){
            super();
        }

        public void setNamespaceName(String pkgName){
            this.pkgName = pkgName;
        }

        public void setDisplayFullNamespacePath(boolean displayFullNamespacePath){
            this.displayFullNamespacePath = displayFullNamespacePath;
        }

        @Override
        protected void draw(Graphics g) {
            // IMPORTANT:

            }
            drawString(g, name,	    NAMESPACE_COLOR);
        }

        /**
         * returns string representation of paint item
         * IMPORTANT: have to be in sync with draw() method

            return pkgName;
        }
    }

    public static class NamespaceAliasPaintComponent extends CsmPaintComponent{

        private String aliasName;
        private Color NAMESPACE_COLOR = LFCustoms.shiftColor(new Color(64,255,64));

        public NamespaceAliasPaintComponent(){
            super();
        }

        public void setAliasName(String aliasName){
            this.aliasName = aliasName;
        }

        @Override
        protected void draw(Graphics g) {
            // IMPORTANT:

            drawIcon(g, getIcon());
            drawString(g, aliasName,	    NAMESPACE_COLOR);
        }

        /**
         * returns string representation of paint item
         * IMPORTANT: have to be in sync with draw() method

    }

    public static class EnumPaintComponent extends CsmPaintComponent {

        String formatEnumName;
        private Color ENUM_COLOR = LFCustoms.shiftColor(new Color(255,64,64));
        private boolean displayFQN;

        public void EnumPaintComponent(String formatEnumName){
            this.formatEnumName = formatEnumName;
        }

        protected Color getColor(){
            return ENUM_COLOR;
        }

        @Override
        protected void draw(Graphics g){
            // IMPORTANT:

            drawIcon(g, getIcon());
            drawString(g, formatEnumName, getColor(), null, strike);
        }

        public void setFormatEnumName(String formatEnumName){
            this.formatEnumName = formatEnumName;
        }

            return formatEnumName;
        }
    }

    public static class EnumeratorPaintComponent extends CsmPaintComponent {

        String formatEnumeratorName;
        private Color ENUMERATOR_COLOR = LFCustoms.shiftColor(new Color(64,64,255));
        private boolean displayFQN;

        public void EnumeratorPaintComponent(String formatEnumeratorName){
            this.formatEnumeratorName = formatEnumeratorName;
        }

        protected Color getColor(){
            return ENUMERATOR_COLOR;
        }

        @Override
        protected void draw(Graphics g){
            // IMPORTANT:

            drawIcon(g, getIcon());
            drawString(g, formatEnumeratorName, getColor(), null, strike);
        }

        public void setFormatEnumeratorName(String formatEnumeratorName){
            assert(formatEnumeratorName != null);
            this.formatEnumeratorName = formatEnumeratorName;

            return formatEnumeratorName;
        }
    }

    public static class ClassPaintComponent extends CsmPaintComponent{

        String formatClassName;
        private Color CLASS_COLOR = LFCustoms.shiftColor(new Color(255,64,64));
        private boolean displayFQN;

        public void setFormatClassName(String formatClassName){
            this.formatClassName = formatClassName;
        }

        protected Color getColor(){
            return CLASS_COLOR;
        }

        @Override
        protected void draw(Graphics g){
            // IMPORTANT:

            drawIcon(g, getIcon());
            drawString(g, formatClassName, getColor(), null, strike);
        }

        /**
         * returns string representation of paint item
         * IMPORTANT: have to be in sync with draw() method

        @Override
        public String toString() {
            return formatClassName;
        }
    }


    public static class TypedefPaintComponent extends CsmPaintComponent{

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

        public void setFormatTypedefName(String formatTypedefName){
            this.formatTypedefName = formatTypedefName;

        }

        protected Color getColor(){
            return TYPEDEF_COLOR;
        }

        @Override
        protected void draw(Graphics g){
            // IMPORTANT:

            drawIcon(g, getIcon());
            drawString(g, formatTypedefName, getColor(), null, strike);
        }

        /**
         * returns string representation of paint item
         * IMPORTANT: have to be in sync with draw() method

        @Override
        public String toString() {
            return formatTypedefName;
        }
    }

    public static class StructPaintComponent extends ClassPaintComponent{

        private Color STRUCT_COLOR = LFCustoms.shiftColor(new Color(255,64,64));

        @Override
        protected Color getColor(){
            return STRUCT_COLOR;
        }

        public StructPaintComponent(){
            super();
        }
    }

    public static class UnionPaintComponent extends ClassPaintComponent{

        private Color UNION_COLOR = LFCustoms.shiftColor(new Color(255,64,64));

        @Override
        protected Color getColor(){
            return UNION_COLOR;
        }

        public UnionPaintComponent(){
            super();
        }
    }

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

        private boolean drawTypeAsPrefix = false;

        public FieldPaintComponent() {
            super();
        }

        public Color getNameColor() {
            return FIELD_COLOR;
        }

        @Override
        public void setName(String fldName){
            this.fldName= fldName;
        }

        public void setTypeColor(Color typeColor){
            this.typeColor = typeColor;
        }

        public void setTypeName(String typeName){
            this.typeName = typeName;
        }

        public Color getTypeColor(){
            return this.typeColor;
        }

        public String getTypeName(){
            return this.typeName;
        }

        public void setDrawTypeAsPrefix(boolean asPrefix) {
            this.drawTypeAsPrefix = asPrefix;
        }

        @Override
        protected void draw(Graphics g){
            // IMPORTANT:

            boolean strike = false;
            //int level = CsmUtilities.getLevel(modifiers);
            drawIcon(g, getIcon());

            if (drawTypeAsPrefix) {
                drawString(g, getTypeName(), getTypeColor(), null, strike);
                drawString(g, " ", strike); // NOI18N
            }
            if ((modifiers & CsmUtilities.LOCAL_MEMBER_BIT) != 0){
                // it is local field, draw as bold

                buf.append(typeName);
            }
            return buf.toString();
        }
    }

    public static class LocalVariablePaintComponent extends FieldPaintComponent {
        private Color VARIABLE_COLOR = LFCustoms.shiftColor(new Color(255,64,64));

        public LocalVariablePaintComponent(){
            super();
            this.modifiers |= CsmUtilities.LOCAL_MEMBER_BIT | this.modifiers;
        }

        @Override
        public Color getNameColor() {
            return VARIABLE_COLOR;

            super.setModifiers(modifiers | CsmUtilities.LOCAL_MEMBER_BIT);
        }
    }

    public static class FileLocalVariablePaintComponent extends FieldPaintComponent {
        private Color VARIABLE_COLOR = LFCustoms.shiftColor(new Color(64,64,255));

        public FileLocalVariablePaintComponent(){
            super();
        }

        @Override
        public Color getNameColor() {
            return VARIABLE_COLOR;
        }
    }

    public static class GlobalVariablePaintComponent extends FieldPaintComponent {
        private Color VARIABLE_COLOR = LFCustoms.shiftColor(new Color(64,64,255));

        public GlobalVariablePaintComponent(){
            super();
        }

        @Override
        public Color getNameColor() {
            return VARIABLE_COLOR;
        }
    }

    public static class MacroPaintComponent extends CsmPaintComponent{
        private Color MACRO_NAME_COLOR = 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 params = null;
        private String name;


        public String getName(){
            return name;
        }

        @Override
        public void setName(String name){
            this.name = name;
        }

        public void setParams(List params){
            this.params = params;
        }

        protected List getParamList(){
            return params;
        }

            //macro params
            buf.append(toStringParameterList(getParamList()));
            return buf.toString();
        }
    }

    public static class TemplateParameterPaintComponent extends CsmPaintComponent{
        private Color PARAMETER_NAME_COLOR = LFCustoms.getTextFgColor();
        private List params = null;
        private String name;


        public String getName(){
            return name;
        }

        @Override
        public void setName(String name){
            this.name = name;
        }

        public void setParams(List params){
            this.params = params;
        }

        protected List getParamList(){
            return params;
        }

            //macro name
            buf.append(getName());
            return buf.toString();
        }
    }

    public static class LabelPaintComponent extends  CsmPaintComponent {
        private Color LABEL_NAME_COLOR = LFCustoms.getTextFgColor();
        private List params = null;
        private String name;


        public String getName(){
            return name;
        }

        @Override
        public void setName(String name){
            this.name = name;
        }

        public void setParams(List params){
            this.params = params;
        }

        protected List getParamList(){
            return params;
        }

            //macro name
            buf.append(getName());
            return buf.toString();
        }
    }

    public static class ConstructorPaintComponent extends CsmPaintComponent{

        private Color CONSTRUCTOR_COLOR = LFCustoms.shiftColor(Color.orange);
        private Color PARAMETER_NAME_COLOR = LFCustoms.shiftColor(new Color(227, 166, 74));//Color.magenta.darker();
        private List params = new ArrayList();
        private List excs = new ArrayList();
        private String name;

        public ConstructorPaintComponent(){
            super();
        }

        public int getMethodModifiers(){
            return modifiers;
        }

        @Override
        public String getName(){
            return name;
        }

        @Override
        public void setName(String name){
            this.name = name;
        }

        public void setParams(List params){
            this.params = params;
        }

        public void setExceptions(List excs){
            this.excs = excs;
        }

        protected List getParamList(){
            return params;
        }

        protected List getExceptionList(){
            return excs;
        }

        protected void drawParameter(Graphics g, ParamStr prm) {
            drawParameter(g, prm, false);
        }

        protected void drawParameter(Graphics g, ParamStr prm, boolean strike) {
            String parmName = prm.getName();
            String simpleTypeName = prm.getSimpleTypeName();

                drawString(g, simpleTypeName.substring(indexOfSqr), prm.getTypeColor(), null, strike);
            }
        }

        protected void drawParameterList(Graphics g, List prmList) {
            drawParameterList(g, prmList, false);
        }

        protected void drawParameterList(Graphics g, List prmList, boolean strike) {
            drawString(g, "(", strike); // NOI18N
            for (Iterator it = prmList.iterator(); it.hasNext();) {

            }
            drawString(g, ")", strike); // NOI18N
        }

        protected void drawExceptions(Graphics g, List exc, boolean strike) {
            if (exc.size() > 0) {
                drawString(g, THROWS, LFCustoms.shiftColor(KEYWORD_COLOR), null, strike);
                for (Iterator it = exc.iterator(); it.hasNext();) {
                    ExceptionStr ex = (ExceptionStr) it.next();
                    drawString(g, ex.getName(), ex.getTypeColor(), null, strike);
                    if (it.hasNext()) {
                        drawString(g, ", ", strike); // NOI18N
                    }

                }
            }
        }

        @Override
        protected void draw(Graphics g){
            // IMPORTANT:

            //constructor exceptions
            buf.append(toStringExceptions(getExceptionList()));
            return buf.toString();
        }

        protected String toStringParameter(ParamStr prm) {
            return prm.getText();
        }

        protected String toStringParameterList(List prmList) {
            StringBuilder buf = new StringBuilder();
            buf.append('('); // NOI18N

            buf.append(')'); // NOI18N
            return buf.toString();
        }

        protected String toStringExceptions(List exc) {
            StringBuilder buf = new StringBuilder();
            if (exc.size() > 0) {

                    if (it.hasNext()) {
                        buf.append(", "); // NOI18N
                    }

                }
            }
            return buf.toString();
        }
    }

    public static class MethodPaintComponent extends ConstructorPaintComponent {

        //private Color PARAMETER_NAME_COLOR = Color.magenta.darker();
        private Color METHOD_COLOR = LFCustoms.getTextFgColor();
        private String typeName;
        private Color typeColor;
        private boolean drawTypeAsPrefix = false;

        public MethodPaintComponent(){
            super();
        }

        public Color getNameColor() {
            return METHOD_COLOR;
        }

        public String getTypeName(){
            return typeName;
        }

        public Color getTypeColor(){
            return typeColor;
        }

        public void setTypeName(String typeName){
            this.typeName = typeName;
        }

        public void setTypeColor(Color typeColor){
            this.typeColor = typeColor;
        }

        public void setDrawTypeAsPrefix(boolean asPrefix) {
            this.drawTypeAsPrefix = asPrefix;
        }

        @Override
        protected void draw(Graphics g){
            // IMPORTANT:

            boolean strike = false;
            //int level = CsmUtilities.getLevel(getModifiers());
            drawIcon(g, getIcon());

            if (drawTypeAsPrefix) {
                drawString(g, getTypeName(), getTypeColor(), null, strike);
                drawString(g, " ", strike); // NOI18N
            }
            if ((getModifiers() & CsmUtilities.LOCAL_MEMBER_BIT) != 0){
                drawString(g, getName(), getNameColor() , new Font(getDrawFont().getName(), getDrawFont().getStyle() | Font.BOLD, getDrawFont().getSize()), strike);
            }else{

            StringBuilder buf = new StringBuilder();
            if (drawTypeAsPrefix) {
                //return type
                buf.append(getTypeName());
                buf.append(' '); // NOI18N
            }
            //method name

            if (!drawTypeAsPrefix) {
                //return type
                buf.append(' '); // NOI18N
                buf.append(getTypeName());
            }
            return buf.toString();
        }
    }

    public static class FileLocalFunctionPaintComponent extends MethodPaintComponent {
        private Color FUN_COLOR = LFCustoms.getTextFgColor();

        public FileLocalFunctionPaintComponent(){
            super();
        }

        @Override
        public Color getNameColor() {
            return FUN_COLOR;
        }
    }

    public static class GlobalFunctionPaintComponent extends MethodPaintComponent {
        private Color FUN_COLOR = LFCustoms.getTextFgColor();

        public GlobalFunctionPaintComponent(){
            super();
        }

        @Override
        public Color getNameColor() {
            return FUN_COLOR;
        }
    }

    public static class CsmPaintComponentWrapper extends CsmPaintComponent {
        private CsmPaintComponent comp;
        private boolean drawTypeAsPrefix = true;

        public CsmPaintComponentWrapper() {
            super();
        }

        public void setCsmComponent(CsmPaintComponent comp) {
            this.comp = comp;
        }


                        ((CsmPaintComponent.FieldPaintComponent)comp).setDrawTypeAsPrefix(true);
                    } else if (comp instanceof CsmPaintComponent.MethodPaintComponent) {
                        ((CsmPaintComponent.MethodPaintComponent)comp).setDrawTypeAsPrefix(true);
                    }
                }
                comp.draw(g);
                if (drawTypeAsPrefix) {
                    if (comp instanceof CsmPaintComponent.FieldPaintComponent) {
                        ((CsmPaintComponent.FieldPaintComponent)comp).setDrawTypeAsPrefix(false);
                    } else if (comp instanceof CsmPaintComponent.MethodPaintComponent) {
                        ((CsmPaintComponent.MethodPaintComponent)comp).setDrawTypeAsPrefix(false);
                    }
                }
                setDrawState(comp.getDrawState());
            }
        }

        @Override
        public void setFont(Font font) {
            super.setFont(font);

                comp.setFont(font);
            }
        }

        @Override
        public String toString() {
            if (comp != null) {
                return comp.toString();
            }
            return "";
        }
    }

    public static class StringPaintComponent extends CsmPaintComponent {

        private String str;

        public void setString(String str){
            this.str = str;
        }

        @Override
        protected void draw(Graphics g){
            drawIcon(g, null);
            drawString(g, str, LFCustoms.getTextFgColor());
        }

        @Override
        public String toString() {
            return str;
        }
    }
}

Lines 50-55 Link Here

(-)a/core.output2/nbproject/project.xml (+8 lines)
50	<code-name-base>org.netbeans.core.output2</code-name-base>	50	<code-name-base>org.netbeans.core.output2</code-name-base>
51	<module-dependencies>	51	<module-dependencies>
52	<dependency>	52	<dependency>
		53	<code-name-base>org.netbeans.swing.plaf</code-name-base>
		54	<build-prerequisite/>
		55	<compile-dependency/>
		56	<run-dependency>
		57	<specification-version>1.27</specification-version>
		58	</run-dependency>
		59	</dependency>
		60	<dependency>
53	<code-name-base>org.openide.actions</code-name-base>	61	<code-name-base>org.openide.actions</code-name-base>
54	<build-prerequisite/>	62	<build-prerequisite/>
55	<compile-dependency/>	63	<compile-dependency/>




import org.openide.util.Mutex;
import org.openide.windows.IOColors;
import org.openide.windows.OutputListener;
import org.netbeans.swing.plaf.LFCustoms;
/**
 * Abstract Lines implementation with handling for getLine wrap calculations, etc.
 */

        longestLineLen = 0;
        listener = null;
        dirty = false;
        curDefColors = getDefColors().clone();
    }

    private boolean dirty;

    }

    /** initial default colors */
    private static Color[] DEF_COLORS = null;

    /** current default colors */
    Color[] curDefColors;

    static Color[] getDefColors() {
        if (DEF_COLORS != null) {
            return DEF_COLORS;
        }
        Color out = UIManager.getColor("nb.output.foreground"); //NOI18N
        if (out == null) {
            out = UIManager.getColor("textText");


        Color err = UIManager.getColor("nb.output.err.foreground"); //NOI18N
        if (err == null) {
            err = LFCustoms.shiftColor(Color.red);
        }

        Color hyperlink = UIManager.getColor("nb.output.link.foreground"); //NOI18N
        if (hyperlink == null) {
            hyperlink = LFCustoms.shiftColor(Color.blue);
        }

        Color hyperlinkImp = UIManager.getColor("nb.output.link.foreground.important"); //NOI18N

            hyperlinkImp = hyperlink;
        }

        return DEF_COLORS = new Color[]{out, err, hyperlink, hyperlinkImp};
    }

    public void setDefColor(IOColors.OutputType type, Color color) {




    private Boolean focusTaken = null;
    private boolean closed = false;
    private final String name;

    private Action[] actions;

    private NbWriter out = null;

    private IOTabImpl ioTab;
    private IOColorsImpl ioColors;

    /** Creates a new instance of NbIO
     * @param name The name of the IO
     * @param toolbarActions an optional set of toolbar actions
     * @param iowin parent container accessor (null for default)

        this.actions = toolbarActions;
        this.ioContainer = ioContainer != null ? ioContainer : IOContainer.getDefault();
    }

    /** Package private constructor for unit tests */
    NbIO (String name) {
        this.name = name;
    }

    public void closeInputOutput() {
        if (Controller.LOG) Controller.log("CLOSE INPUT OUTPUT CALLED FOR " + this);
        if (out != null) {

        }
        post (this, IOEvent.CMD_CLOSE, true);
    }

    String getName() {
        return name;
    }

        }
        NbIOProvider.dispose(this);
    }

    public OutputWriter getOut() {
        synchronized (this) {
            if (out == null) {

        }
        return out;
    }

    /** Called by the view when polling */
    OutWriter out() {
        return out == null ? null : out.out();

    public boolean isErrSeparated() {
        return false;
    }

    public boolean isFocusTaken() {
        return Boolean.TRUE.equals(focusTaken);
    }

    boolean isStreamClosed() {
        return out == null ? true : streamClosed;
    }

    public void select() {
        if (Controller.LOG) Controller.log (this + ": select");
        post (this, IOEvent.CMD_SELECT, true);
    }

    public void setErrSeparated(boolean value) {
        //do nothing
    }

    public void setErrVisible(boolean value) {
        //do nothing
    }

    public void setFocusTaken(boolean value) {
        focusTaken = value ? Boolean.TRUE : Boolean.FALSE;
        post (this, IOEvent.CMD_FOCUS_TAKEN, value);
    }

    public void setInputVisible(boolean value) {
        if (Controller.LOG) Controller.log(NbIO.this + ": SetInputVisible");
        post (this, IOEvent.CMD_INPUT_VISIBLE, value);
    }

    public void setOutputVisible(boolean value) {
        //do nothing
    }

    Action[] getToolbarActions() {
        return actions;
    }

    public void reset() {
        if (Controller.LOG) Controller.log (this + ": reset");
        closed = false;

        }
        post (this, IOEvent.CMD_RESET, true);
    }

    private static void post (NbIO io, int command, boolean val) {
        IOEvent evt = new IOEvent (io, command, val);
        post (evt);

            eq.postEvent(evt);
        }
    }

    @Override public String toString() {
        return "NbIO@" + System.identityHashCode(this) + " " + getName();
    }

        private StringBuffer buffer() {
            return (StringBuffer) lock;
        }

        public void pushText (String txt) {
            if (Controller.LOG) Controller.log (NbIO.this + ": Input text: " + txt);
            synchronized (lock) {

                lock.notifyAll();
            }
        }

        private boolean inputClosed = false;
        public void eof() {
            synchronized (lock) {

                }
            }
        }

        private void checkPristine() throws IOException {
            if (SwingUtilities.isEventDispatchThread()) {
                throw new IOException ("Cannot call read() from the event thread, it will deadlock");

                pristine = false;
            }
        }

        public int read(char cbuf[], int off, int len) throws IOException {
             if (Controller.LOG) Controller.log  (NbIO.this + ":Input read: " + off + " len " + len);
            checkPristine();

                return realLen;
            }
        }

        @Override
        public int read() throws IOException {
            if (Controller.LOG) Controller.log (NbIO.this + ": Input read one char");

                return buffer().length() > 0;
            }
        }

        @Override
        public long skip(long n) throws IOException {
            if (Controller.LOG) Controller.log (NbIO.this + ": Input skip " + n);

                lock.notifyAll();
            }
        }

        public boolean isClosed() {
            return inputClosed;
        }

    }

    Color getColor(IOColors.OutputType type) {
        return ioColors != null ? ioColors.getColor(type) : AbstractLines.getDefColors()[type.ordinal()];
    }

    private class IOTabImpl extends IOTab {


        @Override
        protected Color getColor(OutputType type) {
            return clrs[type.ordinal()] != null ? clrs[type.ordinal()] : AbstractLines.getDefColors()[type.ordinal()];
        }

        @Override

Lines 337-342 Link Here

(-)a/java.editor/nbproject/project.xml (+8 lines)
337	</run-dependency>	337	</run-dependency>
338	</dependency>	338	</dependency>
339	<dependency>	339	<dependency>
		340	<code-name-base>org.netbeans.swing.plaf</code-name-base>
		341	<build-prerequisite/>
		342	<compile-dependency/>
		343	<run-dependency>
		344	<specification-version>1.27</specification-version>
		345	</run-dependency>
		346	</dependency>
		347	<dependency>
340	<code-name-base>org.openide.awt</code-name-base>	348	<code-name-base>org.openide.awt</code-name-base>
341	<build-prerequisite/>	349	<build-prerequisite/>
342	<compile-dependency/>	350	<compile-dependency/>




import org.openide.util.ImageUtilities;
import org.openide.util.NbBundle;
import org.openide.xml.XMLUtil;
import org.netbeans.swing.plaf.LFCustoms;

/**
 *
 * @author Dusan Balek
 */
public abstract class JavaCompletionItem implements CompletionItem {

    protected static int SMART_TYPE = 1000;
    private static final String GENERATE_TEXT = NbBundle.getMessage(JavaCompletionItem.class, "generate_Lbl");
    private static final Logger LOGGER = Logger.getLogger(JavaCompletionItem.class.getName());

    public static final JavaCompletionItem createKeywordItem(String kwd, String postfix, int substitutionOffset, boolean smartType) {
        return new KeywordItem(kwd, 0, postfix, substitutionOffset, smartType);
    }

    public static final JavaCompletionItem createPackageItem(String pkgFQN, int substitutionOffset, boolean inPackageStatement) {
        return new PackageItem(pkgFQN, substitutionOffset, inPackageStatement);
    }

                throw new IllegalArgumentException("kind=" + elem.getKind());
        }
    }

    public static final JavaCompletionItem createArrayItem(CompilationInfo info, ArrayType type, int substitutionOffset, ReferencesCount referencesCount, Elements elements, WhiteListQuery.WhiteList whiteList) {
        int dim = 0;
        TypeMirror tm = type;

        }
        throw new IllegalArgumentException("array element kind=" + tm.getKind());
    }

    public static final JavaCompletionItem createTypeParameterItem(TypeParameterElement elem, int substitutionOffset) {
        return new TypeParameterItem(elem, substitutionOffset);
    }

                throw new IllegalArgumentException("kind=" + elem.getKind());
        }
    }

    public static final JavaCompletionItem createVariableItem(CompilationInfo info, String varName, int substitutionOffset, boolean newVarName, boolean smartType) {
        return new VariableItem(info, null, varName, substitutionOffset, newVarName, smartType, -1);
    }

                throw new IllegalArgumentException("kind=" + elem.getKind());
        }
    }

    public static final JavaCompletionItem createThisOrSuperConstructorItem(CompilationInfo info, ExecutableElement elem, ExecutableType type, int substitutionOffset, boolean isDeprecated, String name, WhiteListQuery.WhiteList whiteList) {
        if (elem.getKind() == ElementKind.CONSTRUCTOR)
            return new ConstructorItem(info, elem, type, substitutionOffset, isDeprecated, false, name, whiteList);

    public static final JavaCompletionItem createDefaultConstructorItem(TypeElement elem, int substitutionOffset, boolean smartType) {
        return new DefaultConstructorItem(elem, substitutionOffset, smartType);
    }

    public static final JavaCompletionItem createParametersItem(CompilationInfo info, ExecutableElement elem, ExecutableType type, int substitutionOffset, boolean isDeprecated, int activeParamIndex, String name) {
        return new ParametersItem(info, elem, type, substitutionOffset, isDeprecated, activeParamIndex, name);
    }

    public static final JavaCompletionItem createAnnotationItem(CompilationInfo info, TypeElement elem, DeclaredType type, int substitutionOffset, ReferencesCount referencesCount, boolean isDeprecated, WhiteListQuery.WhiteList whiteList) {
        return new AnnotationItem(info, elem, type, substitutionOffset, referencesCount, isDeprecated, true, whiteList);
    }

    public static final JavaCompletionItem createAttributeItem(CompilationInfo info, ExecutableElement elem, ExecutableType type, int substitutionOffset, boolean isDeprecated) {
        return new AttributeItem(info, elem, type, substitutionOffset, isDeprecated);
    }

    public static final JavaCompletionItem createAttributeValueItem(CompilationInfo info, String value, String documentation, TypeElement element, int substitutionOffset, ReferencesCount referencesCount, WhiteListQuery.WhiteList whiteList) {
        return new AttributeValueItem(info, value, documentation, element, substitutionOffset, referencesCount, whiteList);
    }

        defaultAction(component);
        return true;
    }

    public CompletionTask createDocumentationTask() {
        return null;
    }

    public CompletionTask createToolTipTask() {
        return null;
    }

    public int getPreferredWidth(Graphics g, Font defaultFont) {
        return CompletionUtilities.getPreferredWidth(getLeftHtmlText(), getRightHtmlText(), g, defaultFont);
    }

    public void render(Graphics g, Font defaultFont, Color defaultColor, Color backgroundColor, int width, int height, boolean selected) {
        CompletionUtilities.renderHtml(getIcon(), getLeftHtmlText(), getRightHtmlText(), g, defaultFont, defaultColor, width, height, selected);
    }

    protected ImageIcon getIcon() {
        return null;
    }

    protected String getLeftHtmlText() {
        return null;
    }

    protected String getRightHtmlText() {
        return null;
    }

            }
        });
    }

    static abstract class WhiteListJavaCompletionItem<T extends Element> extends JavaCompletionItem {

        private static final String WARNING = "org/netbeans/modules/java/editor/resources/warning_badge.gif";   //NOI18N

            return super.getIcon();
        }
    }

    static class KeywordItem extends JavaCompletionItem {

        private static final String JAVA_KEYWORD = "org/netbeans/modules/java/editor/resources/javakw_16.png"; //NOI18N
        private static final String KEYWORD_COLOR = "<font color=#000099>"; //NOI18N
        private static ImageIcon icon;

        private String kwd;
        private int dim;
        private String postfix;

            this.postfix = postfix;
            this.smartType = smartType;
        }

        public int getSortPriority() {
            return smartType ? 600 - SMART_TYPE : 600;
        }

        public CharSequence getSortText() {
            return kwd;
        }

        public CharSequence getInsertPrefix() {
            return kwd;
        }

        protected ImageIcon getIcon(){
            if (icon == null) icon = ImageUtilities.loadImageIcon(JAVA_KEYWORD, false);
            return icon;
        }

        protected String getLeftHtmlText() {
            if (leftText == null) {
                StringBuilder sb = new StringBuilder();

            }
            return leftText;
        }

        @Override
        protected void substituteText (final JTextComponent c, final int offset, int len, String toAdd, final boolean assignToVar) {
            if (dim == 0) {

            for(int i = 0; i < dim; i++) {
                sb.append("[${PAR"); //NOI18N
                sb.append(cnt++);
                sb.append(" instanceof=\"int\" default=\"\"}]"); //NOI18N
            }
            final int length = len;
            doc.runAtomic (new Runnable () {

                ctm.createTemporary(sb.append(text).toString()).insert(c);
            }
        }

        public String toString() {
            return kwd;
        }
    }

    static class PackageItem extends JavaCompletionItem {

        private static final String PACKAGE = "org/netbeans/modules/java/editor/resources/package.gif"; // NOI18N
        private static final String PACKAGE_COLOR = "<font color=#005600>"; //NOI18N
        private static ImageIcon icon;

        private boolean inPackageStatement;
        private String simpleName;
        private String sortText;

            this.simpleName = idx < 0 ? pkgFQN : pkgFQN.substring(idx + 1);
            this.sortText = this.simpleName + "#" + pkgFQN; //NOI18N
        }

        public int getSortPriority() {
            return 900;
        }

        public CharSequence getSortText() {
            return sortText;
        }

        public CharSequence getInsertPrefix() {
            return simpleName;
        }

        protected ImageIcon getIcon(){
            if (icon == null) icon = ImageUtilities.loadImageIcon(PACKAGE, false);
            return icon;
        }

        protected String getLeftHtmlText() {
            if (leftText == null) {
                StringBuilder sb = new StringBuilder();

        protected void substituteText(JTextComponent c, int offset, int len, String toAdd, final boolean assingToVar) {
            super.substituteText(c, offset, len, inPackageStatement || toAdd != null ? toAdd : ".", assingToVar); //NOI18N
        }

        public String toString() {
            return simpleName;
        }
    }

    static class ClassItem extends WhiteListJavaCompletionItem<TypeElement> {

        private static final String CLASS = "org/netbeans/modules/editor/resources/completion/class_16.png"; //NOI18N
        private static final String CLASS_COLOR = "<font color=#560000>"; //NOI18N
        private static final String PKG_COLOR = "<font color=#808080>"; //NOI18N
        private static ImageIcon icon;

        protected TypeMirrorHandle<DeclaredType> typeHandle;
        private int dim;
        private boolean isDeprecated;

        private CharSequence sortText;
        private String leftText;
        private boolean autoImport;

        private ClassItem(CompilationInfo info, TypeElement elem, DeclaredType type, int dim, int substitutionOffset, ReferencesCount referencesCount, boolean isDeprecated, boolean insideNew, boolean addTypeVars, boolean addSimpleName, boolean smartType, boolean autoImport, WhiteListQuery.WhiteList whiteList) {
            super(substitutionOffset, ElementHandle.create(elem), whiteList);
            this.typeHandle = TypeMirrorHandle.create(type);

            }
            this.autoImport = autoImport;
        }

        public int getSortPriority() {
            return smartType ? 800 - SMART_TYPE : 800;
        }

        public CharSequence getSortText() {
            return sortText;
        }

        public CharSequence getInsertPrefix() {
            return simpleName;
        }

        public boolean instantSubstitution(JTextComponent component) {
            return false;
        }

        public CompletionTask createDocumentationTask() {
            return typeHandle.getKind() == TypeKind.DECLARED ? JavaCompletionProvider.createDocTask(ElementHandle.from(typeHandle)) : null;
        }

            }
            return leftText;
        }

        protected String getColor() {
            return CLASS_COLOR;
        }

                                    Iterator<? extends TypeMirror> tas = type != null ? type.getTypeArguments().iterator() : null;
                                    if (tas != null && tas.hasNext()) {
                                        sb.append('<'); //NOI18N
                                        if (!insideNew || elem.getModifiers().contains(Modifier.ABSTRACT)
                                            || controller.getSourceVersion().compareTo(SourceVersion.RELEASE_7) < 0) {
                                            while (tas.hasNext()) {
                                                TypeMirror ta = tas.next();

                }
            }, NbBundle.getMessage(JavaCompletionItem.class, "JCI-import_resolve"), cancel, false); //NOI18N
        }

        public String toString() {
            return simpleName;
        }
    }

    static class InterfaceItem extends ClassItem {

        private static final String INTERFACE = "org/netbeans/modules/editor/resources/completion/interface.png"; // NOI18N
        private static final String INTERFACE_COLOR = "<font color=#404040>"; //NOI18N
        private static ImageIcon icon;

        private InterfaceItem(CompilationInfo info, TypeElement elem, DeclaredType type, int dim, int substitutionOffset, ReferencesCount referencesCount, boolean isDeprecated, boolean insideNew, boolean addTypeVars, boolean addSimpleName, boolean smartType, boolean autoImport, WhiteListQuery.WhiteList whiteList) {
            super(info, elem, type, dim, substitutionOffset, referencesCount, isDeprecated, insideNew, addTypeVars, addSimpleName, smartType, autoImport, whiteList);
        }

        protected ImageIcon getBaseIcon(){
            if (icon == null) icon = ImageUtilities.loadImageIcon(INTERFACE, false);
            return icon;
        }

        protected String getColor() {
            return INTERFACE_COLOR;
        }
    }

    static class EnumItem extends ClassItem {

        private static final String ENUM = "org/netbeans/modules/editor/resources/completion/enum.png"; // NOI18N
        private static ImageIcon icon;

        private EnumItem(CompilationInfo info, TypeElement elem, DeclaredType type, int dim, int substitutionOffset, ReferencesCount referencesCount, boolean isDeprecated, boolean insideNew, boolean addSimpleName, boolean smartType, boolean autoImport, WhiteListQuery.WhiteList whiteList) {
            super(info, elem, type, dim, substitutionOffset, referencesCount, isDeprecated, insideNew, false, addSimpleName, smartType, autoImport, whiteList);
        }

        protected ImageIcon getBaseIcon(){
            if (icon == null) icon = ImageUtilities.loadImageIcon(ENUM, false);
            return icon;
        }
    }

    static class AnnotationTypeItem extends ClassItem {

        private static final String ANNOTATION = "org/netbeans/modules/editor/resources/completion/annotation_type.png"; // NOI18N
        private static ImageIcon icon;

        private AnnotationTypeItem(CompilationInfo info, TypeElement elem, DeclaredType type, int dim, int substitutionOffset, ReferencesCount referencesCount, boolean isDeprecated, boolean insideNew, boolean addSimpleName, boolean smartType, boolean autoImport, WhiteListQuery.WhiteList whiteList) {
            super(info, elem, type, dim, substitutionOffset, referencesCount, isDeprecated, insideNew, false, addSimpleName, smartType, autoImport, whiteList);
        }

        protected ImageIcon getBaseIcon(){
            if (icon == null) icon = ImageUtilities.loadImageIcon(ANNOTATION, false);
            return icon;
        }
    }

    static class TypeParameterItem extends JavaCompletionItem {

        private static final String TYPE_PARAMETER_COLOR = "<font color=#000000>"; //NOI18N

        private String simpleName;
        private String leftText;

            super(substitutionOffset);
            this.simpleName = elem.getSimpleName().toString();
        }

        public int getSortPriority() {
            return 700;
        }

        public CharSequence getSortText() {
            return simpleName;
        }

        public CharSequence getInsertPrefix() {
            return simpleName;
        }

        protected String getLeftHtmlText() {
            if (leftText == null)
                leftText = LFCustoms.getTextFgColorHTML() + simpleName + COLOR_END;
            return leftText;
        }

        public String toString() {
            return simpleName;
        }
    }

    static class VariableItem extends JavaCompletionItem {

        private static final String LOCAL_VARIABLE = "org/netbeans/modules/editor/resources/completion/localVariable.gif"; //NOI18N
        private static final String PARAMETER_COLOR = "<font color=#00007c>"; //NOI18N
        private static ImageIcon icon;

        private String rightText;
        private int assignToVarPos;
        private String assignToVarText;

        private VariableItem(CompilationInfo info, TypeMirror type, String varName, int substitutionOffset, boolean newVarName, boolean smartType, int assignToVarPos) {
            super(substitutionOffset);
            this.varName = varName;

            this.assignToVarPos = assignToVarPos;
            this.assignToVarText = assignToVarPos < 0 ? null : getAssignToVarText(info, type, varName);
        }

        public int getSortPriority() {
            return smartType ? 200 - SMART_TYPE : 200;
        }

        public CharSequence getSortText() {
            return varName;
        }

        public CharSequence getInsertPrefix() {
            return varName;
        }

                leftText = PARAMETER_COLOR + BOLD + varName + BOLD_END + COLOR_END;
            return leftText;
        }

        protected String getRightHtmlText() {
            if (rightText == null)
                rightText = escape(typeName);
            return rightText;
        }

        protected ImageIcon getIcon(){
            if (icon == null) icon = ImageUtilities.loadImageIcon(LOCAL_VARIABLE, false);
            return icon;
        }

        @Override

   }

    static class FieldItem extends WhiteListJavaCompletionItem<VariableElement> {

        private static final String FIELD_PUBLIC = "org/netbeans/modules/editor/resources/completion/field_16.png"; //NOI18N
        private static final String FIELD_PROTECTED = "org/netbeans/modules/editor/resources/completion/field_protected_16.png"; //NOI18N
        private static final String FIELD_PACKAGE = "org/netbeans/modules/editor/resources/completion/field_package_private_16.png"; //NOI18N
        private static final String FIELD_PRIVATE = "org/netbeans/modules/editor/resources/completion/field_private_16.png"; //NOI18N
        private static final String FIELD_ST_PUBLIC = "org/netbeans/modules/editor/resources/completion/field_static_16.png"; //NOI18N
        private static final String FIELD_ST_PROTECTED = "org/netbeans/modules/editor/resources/completion/field_static_protected_16.png"; //NOI18N
        private static final String FIELD_ST_PACKAGE = "org/netbeans/modules/editor/resources/completion/field_static_package_private_16.png"; //NOI18N
        private static final String FIELD_ST_PRIVATE = "org/netbeans/modules/editor/resources/completion/field_static_private_16.png"; //NOI18N
        private static final String FIELD_COLOR = "<font color=#008618>"; //NOI18N
        private static ImageIcon icon[][] = new ImageIcon[2][4];

        private boolean isInherited;
        private boolean isDeprecated;
        private boolean smartType;

        private CharSequence enclSortText;
        private int assignToVarPos;
        private String assignToVarText;

        private FieldItem(CompilationInfo info, VariableElement elem, TypeMirror type, int substitutionOffset, ReferencesCount referencesCount, boolean isInherited, boolean isDeprecated, boolean smartType, int assignToVarPos, WhiteListQuery.WhiteList whiteList) {
            super(substitutionOffset, ElementHandle.create(elem), whiteList);
            this.isInherited = isInherited;

            this.assignToVarPos = assignToVarPos;
            this.assignToVarText = assignToVarPos < 0 ? null : getAssignToVarText(info, type, this.simpleName);
        }

        public int getSortPriority() {
            return smartType ? 300 - SMART_TYPE : 300;
        }

        public CharSequence getSortText() {
            return simpleName + "#" + enclSortText; //NOI18N
        }

        public CharSequence getInsertPrefix() {
            return simpleName;
        }

                rightText = escape(typeName);
            return rightText;
        }

        protected ImageIcon getBaseIcon(){
            int level = getProtectionLevel(modifiers);
            boolean isStatic = modifiers.contains(Modifier.STATIC);
            ImageIcon cachedIcon = icon[isStatic?1:0][level];
            if (cachedIcon != null)
                return cachedIcon;

            String iconPath = FIELD_PUBLIC;
            if (isStatic) {

            }
            ImageIcon newIcon = ImageUtilities.loadImageIcon(iconPath, false);
            icon[isStatic?1:0][level] = newIcon;
            return newIcon;
        }

        @Override

                        tmp.insert(c);
                    }
                }
            } catch (BadLocationException ble) {
            }
        }


            return sb.toString();
        }
    }

    static class MethodItem extends WhiteListJavaCompletionItem<ExecutableElement> {

        private static final String METHOD_PUBLIC = "org/netbeans/modules/editor/resources/completion/method_16.png"; //NOI18N
        private static final String METHOD_PROTECTED = "org/netbeans/modules/editor/resources/completion/method_protected_16.png"; //NOI18N
        private static final String METHOD_PACKAGE = "org/netbeans/modules/editor/resources/completion/method_package_private_16.png"; //NOI18N
        private static final String METHOD_PRIVATE = "org/netbeans/modules/editor/resources/completion/method_private_16.png"; //NOI18N
        private static final String METHOD_ST_PUBLIC = "org/netbeans/modules/editor/resources/completion/method_static_16.png"; //NOI18N
        private static final String METHOD_ST_PROTECTED = "org/netbeans/modules/editor/resources/completion/method_static_protected_16.png"; //NOI18N
        private static final String METHOD_ST_PRIVATE = "org/netbeans/modules/editor/resources/completion/method_static_private_16.png"; //NOI18N
        private static final String METHOD_ST_PACKAGE = "org/netbeans/modules/editor/resources/completion/method_static_package_private_16.png"; //NOI18N
        private static final String METHOD_COLOR = "<font color=#000000>"; //NOI18N
        private static final String PARAMETER_NAME_COLOR = "<font color=#a06001>"; //NOI18N
        private static ImageIcon icon[][] = new ImageIcon[2][4];


        private CharSequence enclSortText;
        private int assignToVarPos;
        private String assignToVarText;

        private MethodItem(CompilationInfo info, ExecutableElement elem, ExecutableType type, int substitutionOffset, ReferencesCount referencesCount, boolean isInherited, boolean isDeprecated, boolean inImport, boolean addSemicolon, boolean smartType, int assignToVarPos, WhiteListQuery.WhiteList whiteList) {
            super(substitutionOffset, ElementHandle.create(elem), whiteList);
            this.isInherited = isInherited;

            this.assignToVarPos = type.getReturnType().getKind() == TypeKind.VOID ? -1 : assignToVarPos;
            this.assignToVarText = this.assignToVarPos < 0 ? null : getAssignToVarText(info, type.getReturnType(), this.simpleName);
        }

        public int getSortPriority() {
            return smartType ? 500 - SMART_TYPE : 500;
        }

        public CharSequence getSortText() {
            if (sortText == null) {
                StringBuilder sortParams = new StringBuilder();

            }
            return sortText;
        }

        public CharSequence getInsertPrefix() {
            return simpleName;
        }

        protected String getLeftHtmlText() {
            if (leftText == null) {
                StringBuilder lText = new StringBuilder();
                lText.append(LFCustoms.getTextFgColorHTML());
                if (!isInherited)
                    lText.append(BOLD);
                if (isDeprecated || isBlackListed())

                rightText = escape(typeName);
            return rightText;
        }

        public CompletionTask createDocumentationTask() {
            return JavaCompletionProvider.createDocTask(getElementHandle());
        }

            ImageIcon cachedIcon = icon[isStatic?1:0][level];
            if (cachedIcon != null)
                return cachedIcon;

            String iconPath = METHOD_PUBLIC;
            if (isStatic) {
                switch (level) {
                    case PRIVATE_LEVEL:

            }
            ImageIcon newIcon = ImageUtilities.loadImageIcon(iconPath, false);
            icon[isStatic?1:0][level] = newIcon;
            return newIcon;
        }

        @Override
        protected void substituteText(final JTextComponent c, final int offset, int len, String toAdd, final boolean assignToVar) {
            try {

                                                AutoImport.resolveImport(controller, controller.getTreeUtilities().pathFor(embeddedOffset), ee.getEnclosingElement().asType());
                                        }
                                    });
                                } catch (ParseException pe) {
                                }
                            }
                        }, NbBundle.getMessage(JavaCompletionItem.class, "JCI-import_resolve"), cancel, false); //NOI18N

                            Position semiPosition = semiPos > -1 ? doc.createPosition(semiPos) : null;
                            String textToReplace = doc.getText(pos.getOffset(), length);
                            if (textToReplace.contentEquals(getInsertPrefix() + sb.toString())) {
                                c.setCaretPosition(c.getCaretPosition() + sb.length());
                                sb.delete(0, sb.length());
                            } else {
                                if (length > 0)

                                                AutoImport.resolveImport(controller, controller.getTreeUtilities().pathFor(embeddedOffset), ee.getEnclosingElement().asType());
                                        }
                                    });
                                } catch (ParseException pe) {
                                }
                            }
                        }, NbBundle.getMessage(JavaCompletionItem.class, "JCI-import_resolve"), cancel, false); //NOI18N

                }
            } catch (BadLocationException ex) {
            }
        }

        public String toString() {
            StringBuilder sb = new StringBuilder();

            sb.append(')');
            return sb.toString();
        }
    }

    static class OverrideMethodItem extends MethodItem {

        private static final String IMPL_BADGE_PATH = "org/netbeans/modules/java/editor/resources/implement_badge.png";
        private static final String OVRD_BADGE_PATH = "org/netbeans/modules/java/editor/resources/override_badge.png";

        private static final String OVERRIDE_TEXT = NbBundle.getMessage(JavaCompletionItem.class, "override_Lbl");
        private static final String IMPLEMENT_TEXT = NbBundle.getMessage(JavaCompletionItem.class, "implement_Lbl");

        private static ImageIcon implementBadge = ImageUtilities.loadImageIcon(IMPL_BADGE_PATH, false);
        private static ImageIcon overrideBadge = ImageUtilities.loadImageIcon(OVRD_BADGE_PATH, false);
        private static ImageIcon merged_icon[][] = new ImageIcon[2][4];


        private boolean implement;
        private String leftText;

        private OverrideMethodItem(CompilationInfo info, ExecutableElement elem, ExecutableType type, int substitutionOffset, boolean implement, WhiteListQuery.WhiteList whiteList) {
            super(info, elem, type, substitutionOffset, null, false, false, false, false, false, -1, whiteList);
            this.implement = implement;
        }

        protected String getLeftHtmlText() {
            if (leftText == null) {
                leftText = super.getLeftHtmlText() + " - ";

            }
            return leftText;
        }

        @Override
        protected ImageIcon getBaseIcon() {
            int level = getProtectionLevel(modifiers);

            if ( merged != null ) {
                return merged;
            }
            ImageIcon superIcon = super.getBaseIcon();
            merged = new ImageIcon( ImageUtilities.mergeImages(
                superIcon.getImage(),
                implement ? implementBadge.getImage() : overrideBadge.getImage(),
                16 - 8,
                16 - 8) );

            merged_icon[implement? 0 : 1][level] = merged;
            return merged;
        }


        @Override
        protected void substituteText(final JTextComponent c, final int offset, final int len, String toAdd, final boolean assignToVar) {
            final BaseDocument doc = (BaseDocument)c.getDocument();

    }

    static class GetterSetterMethodItem extends JavaCompletionItem {

        private static final String METHOD_PUBLIC = "org/netbeans/modules/editor/resources/completion/method_16.png"; //NOI18N
        private static final String GETTER_BADGE_PATH = "org/netbeans/modules/java/editor/resources/getter_badge.png"; //NOI18N
        private static final String SETTER_BADGE_PATH = "org/netbeans/modules/java/editor/resources/setter_badge.png"; //NOI18N
        private static final String METHOD_COLOR = "<font color=#000000>"; //NOI18N
        private static final String PARAMETER_NAME_COLOR = "<font color=#a06001>"; //NOI18N

        private static ImageIcon superIcon;
        private static ImageIcon[] merged_icons = new ImageIcon[2];

        protected ElementHandle<VariableElement> elementHandle;
        private boolean setter;
        private String simpleName;

        private String sortText;
        private String leftText;
        private String rightText;

        private GetterSetterMethodItem(CompilationInfo info, VariableElement elem, TypeMirror type, int substitutionOffset, boolean setter) {
            super(substitutionOffset);
            this.elementHandle = ElementHandle.create(elem);
            this.setter = setter;
            this.simpleName = elem.getSimpleName().toString();
            if (setter)

                this.name = (elem.asType().getKind() == TypeKind.BOOLEAN ? "is" : "get") + GeneratorUtils.getCapitalizedName(simpleName); //NOI18N
            this.typeName = Utilities.getTypeName(info, type, false).toString();
        }

        public int getSortPriority() {
            return 500;
        }

        public CharSequence getSortText() {
            if (sortText == null) {
                StringBuilder sortParams = new StringBuilder();

            }
            return sortText;
        }

        public CharSequence getInsertPrefix() {
            return name;
        }

        @Override
        protected String getLeftHtmlText() {
            if (leftText == null) {
                StringBuilder lText = new StringBuilder();
                lText.append(LFCustoms.getTextFgColorHTML());
                lText.append(BOLD);
                lText.append(name);
                lText.append(BOLD_END);

            }
            return leftText;
        }

        @Override
        protected String getRightHtmlText() {
            if (rightText == null)
                rightText = setter ? "void" : escape(typeName);
            return rightText;
        }

        @Override
        protected ImageIcon getIcon() {
            if (merged_icons[setter ? 1 : 0] == null) {

            }
            return merged_icons[setter ? 1 : 0];
        }

        @Override
        protected void substituteText(final JTextComponent c, final int offset, final int len, String toAdd, final boolean assignToVar) {
            final BaseDocument doc = (BaseDocument)c.getDocument();

                    public void run(ResultIterator resultIterator) throws Exception {
                        WorkingCopy copy = WorkingCopy.get(resultIterator.getParserResult());
                        copy.toPhase(Phase.ELEMENTS_RESOLVED);
                        VariableElement ve = elementHandle.resolve(copy);
                        if (ve == null)
                            return;
                        final int embeddedOffset = copy.getSnapshot().getEmbeddedOffset(pos.getOffset());

    }

    static class ConstructorItem extends WhiteListJavaCompletionItem<ExecutableElement> {

        private static final String CONSTRUCTOR_PUBLIC = "org/netbeans/modules/editor/resources/completion/constructor_16.png"; //NOI18N
        private static final String CONSTRUCTOR_PROTECTED = "org/netbeans/modules/editor/resources/completion/constructor_protected_16.png"; //NOI18N
        private static final String CONSTRUCTOR_PACKAGE = "org/netbeans/modules/editor/resources/completion/constructor_package_private_16.png"; //NOI18N

        private boolean insertName;
        private String sortText;
        private String leftText;

        private ConstructorItem(CompilationInfo info, ExecutableElement elem, ExecutableType type, int substitutionOffset, boolean isDeprecated, boolean smartType, String name, WhiteListQuery.WhiteList whiteList) {
            super(substitutionOffset, ElementHandle.create(elem), whiteList);
            this.isDeprecated = isDeprecated;

            }
            this.isAbstract = !insertName && elem.getEnclosingElement().getModifiers().contains(Modifier.ABSTRACT);
        }

        public int getSortPriority() {
            return insertName ? 550 : smartType ? 650 - SMART_TYPE : 650;
        }

        public CharSequence getSortText() {
            if (sortText == null) {
                StringBuilder sortParams = new StringBuilder();

            }
            return sortText;
        }

        public CharSequence getInsertPrefix() {
            return simpleName;
        }

        protected String getLeftHtmlText() {
            if (leftText == null) {
                StringBuilder lText = new StringBuilder();

            ImageIcon cachedIcon = icon[level];
            if (cachedIcon != null)
                return cachedIcon;

            String iconPath = CONSTRUCTOR_PUBLIC;
            switch (level) {
                case PRIVATE_LEVEL:
                    iconPath = CONSTRUCTOR_PRIVATE;

            }
            ImageIcon newIcon = ImageUtilities.loadImageIcon(iconPath, false);
            icon[level] = newIcon;
            return newIcon;
        }

        @Override
        protected void substituteText(final JTextComponent c, int offset, int len, String toAdd, final boolean assignToVar) {
            if (!insertName) {

                            TreePath path = copy.getTreeUtilities().pathFor(embeddedOffset);
                            while (path.getLeaf() != path.getCompilationUnit()) {
                                Tree tree = path.getLeaf();
                                Tree parentTree = path.getParentPath().getLeaf();
                                if (parentTree.getKind() == Tree.Kind.NEW_CLASS && TreeUtilities.CLASS_TREE_KINDS.contains(tree.getKind())) {
                                    GeneratorUtils.generateAllAbstractMethodImplementations(copy, path);
                                    break;
                                }
                                path = path.getParentPath();
                            }
                        }

                    Completion.get().showToolTip();
                }
            }
        }

        public String toString() {
            StringBuilder sb = new StringBuilder();

            return sb.toString();
        }
    }

    static class DefaultConstructorItem extends JavaCompletionItem {

        private static final String CONSTRUCTOR = "org/netbeans/modules/java/editor/resources/new_constructor_16.png"; //NOI18N
        private static final String CONSTRUCTOR_COLOR = "<font color=#b28b00>"; //NOI18N
        private static ImageIcon icon;

        private boolean smartType;
        private String simpleName;
        private boolean isAbstract;

                sortText = simpleName + "#0#"; //NOI18N
            return sortText;
        }

        protected String getLeftHtmlText() {
            if (leftText == null)
                leftText = CONSTRUCTOR_COLOR + simpleName + "()" + COLOR_END; //NOI18N
            return leftText;
        }

        protected ImageIcon getIcon() {
            if (icon == null) icon = ImageUtilities.loadImageIcon(CONSTRUCTOR, false);
            return icon;
        }

        @Override

                            TreePath path = copy.getTreeUtilities().pathFor(embeddedOffset);
                            while (path.getLeaf() != path.getCompilationUnit()) {
                                Tree tree = path.getLeaf();
                                Tree parentTree = path.getParentPath().getLeaf();
                                if (parentTree.getKind() == Tree.Kind.NEW_CLASS && TreeUtilities.CLASS_TREE_KINDS.contains(tree.getKind())) {
                                    GeneratorUtils.generateAllAbstractMethodImplementations(copy, path);
                                    break;
                                }
                                path = path.getParentPath();
                            }
                        }

                }
            }
        }

        public String toString() {
            return simpleName + "()";
        }
    }

    static class ParametersItem extends JavaCompletionItem {

        private static final String PARAMETERS_COLOR = "<font color=#808080>"; //NOI18N
        private static final String ACTIVE_PARAMETER_COLOR = "<font color=#000000>"; //NOI18N

        protected ElementHandle<ExecutableElement> elementHandle;
        private boolean isDeprecated;

        public CharSequence getInsertPrefix() {
            return ""; //NOI18N
        }

        protected String getLeftHtmlText() {
            if (leftText == null) {
                StringBuilder lText = new StringBuilder();

                for (int i = 0; i < params.size(); i++) {
                    ParamDesc paramDesc = params.get(i);
                    if (i == activeParamsIndex)
                        lText.append(COLOR_END).append(LFCustoms.getTextFgColorHTML()).append(BOLD);
                    lText.append(escape(paramDesc.typeName));
                    lText.append(' ');
                    lText.append(paramDesc.name);
                    if (i < params.size() - 1)
                        lText.append(", "); //NOI18N
                    else
                        lText.append(BOLD_END).append(COLOR_END).append(PARAMETERS_COLOR);
                }
                lText.append(')');
                lText.append(COLOR_END);

            }
            return leftText;
        }

        protected String getRightHtmlText() {
            if (rightText == null)
                rightText = PARAMETERS_COLOR + escape(typeName) + COLOR_END;
            return rightText;
        }

        public CompletionTask createDocumentationTask() {
            return JavaCompletionProvider.createDocTask(elementHandle);
        }

        public boolean instantSubstitution(JTextComponent component) {
            return false;
        }

        protected void substituteText(final JTextComponent c, final int offset, int len, String toAdd, final boolean assignToVar) {
            String add = ")"; //NOI18N
            if (toAdd != null && !add.startsWith(toAdd))
                add += toAdd;
            if (params.isEmpty()) {
                super.substituteText(c, offset, len, add, assignToVar);
            } else {
                final BaseDocument doc = (BaseDocument)c.getDocument();
                String text = ""; //NOI18N
                final int semiPos = add.endsWith(";") ? findPositionForSemicolon(c) : -2; //NOI18N

                    Completion.get().showToolTip();
                }
            }
        }

        public String toString() {
            StringBuilder sb = new StringBuilder();

            return sb.toString();
        }
    }

    static class AnnotationItem extends AnnotationTypeItem {

        private AnnotationItem(CompilationInfo info, TypeElement elem, DeclaredType type, int substitutionOffset, ReferencesCount referencesCount, boolean isDeprecated, boolean smartType, WhiteListQuery.WhiteList whiteList) {
            super(info, elem, type, 0, substitutionOffset, referencesCount, isDeprecated, false, false, smartType, false, whiteList);
        }

            }, NbBundle.getMessage(JavaCompletionItem.class, "JCI-import_resolve"), cancel, false); //NOI18N
        }
    }

    static class AttributeItem extends JavaCompletionItem {

        private static final String ATTRIBUTE = "org/netbeans/modules/java/editor/resources/attribute_16.png"; // NOI18N
        private static final String ATTRIBUTE_COLOR = "<font color=#404040>"; //NOI18N
        private static ImageIcon icon;

        private ElementHandle<ExecutableElement> elementHandle;
        private boolean isDeprecated;
        private String simpleName;

            AnnotationValue value = elem.getDefaultValue();
            this.defaultValue = value != null ? value.toString() : null;
        }

        public int getSortPriority() {
            return 100;
        }

        public CharSequence getSortText() {
            return simpleName;
        }

        public CharSequence getInsertPrefix() {
            return simpleName;
        }


        protected ImageIcon getIcon(){
            if (icon == null) icon = ImageUtilities.loadImageIcon(ATTRIBUTE, false);
            return icon;
        }

        protected String getLeftHtmlText() {
            if (leftText == null) {
                StringBuilder sb = new StringBuilder();

            }
            return leftText;
        }

        protected String getRightHtmlText() {
            if (rightText == null)
                rightText = escape(typeName);
            return rightText;
        }

        @Override
        protected void substituteText(JTextComponent c, int offset, int len, String toAdd, boolean assignToVar) {
            super.substituteText(c, offset, len, toAdd != null ? toAdd : "=", assignToVar); //NOI18N


        public String toString() {
            return simpleName;
        }
    }

    static class AttributeValueItem extends WhiteListJavaCompletionItem<TypeElement> {

            return delegate != null ? delegate.getInsertPrefix() : value; //NOI18N
        }

        public CompletionTask createDocumentationTask() {
            return documentation == null ? null : new CompletionTask() {

                private CompletionDocumentation cd = new CompletionDocumentation() {

                        return null;
                    }
                };

                @Override
                public void query(CompletionResultSet resultSet) {
                    resultSet.setDocumentation(cd);

    }

    static class StaticMemberItem extends WhiteListJavaCompletionItem<Element> {

        private static final String FIELD_ST_PUBLIC = "org/netbeans/modules/editor/resources/completion/field_static_16.png"; //NOI18N
        private static final String FIELD_ST_PROTECTED = "org/netbeans/modules/editor/resources/completion/field_static_protected_16.png"; //NOI18N
        private static final String FIELD_ST_PACKAGE = "org/netbeans/modules/editor/resources/completion/field_static_package_private_16.png"; //NOI18N

        private static final String METHOD_COLOR = "<font color=#7c0000>"; //NOI18N
        private static final String PARAMETER_NAME_COLOR = "<font color=#b200b2>"; //NOI18N
        private static ImageIcon icon[][] = new ImageIcon[2][4];

        private TypeMirrorHandle<DeclaredType> typeHandle;
        private boolean isDeprecated;
        private String typeName;

        private String sortText;
        private String leftText;
        private String rightText;

        private StaticMemberItem(CompilationInfo info, DeclaredType type, Element memberElem, TypeMirror memberType, int substitutionOffset, boolean isDeprecated, WhiteListQuery.WhiteList whiteList) {
            super(substitutionOffset, ElementHandle.create(memberElem), whiteList);
            type = (DeclaredType) info.getTypes().erasure(type);

                }
            }
        }

        public int getSortPriority() {
            return (params == null ? 700 : 750) - SMART_TYPE;
        }

        public CharSequence getSortText() {
            if (sortText == null) {
                if (params == null) {

            }
            return sortText;
        }

        public CharSequence getInsertPrefix() {
            return typeName + "." + memberName; //NOI18N
        }

                rightText = escape(memberTypeName);
            return rightText;
        }

        protected ImageIcon getBaseIcon(){
            int level = getProtectionLevel(modifiers);
            boolean isField = getElementHandle().getKind().isField();
            ImageIcon cachedIcon = icon[isField ? 0 : 1][level];
            if (cachedIcon != null)
                return cachedIcon;

            String iconPath = null;
            if (isField) {

                return null;
            ImageIcon newIcon = ImageUtilities.loadImageIcon(iconPath, false);
            icon[isField ? 0 : 1][level] = newIcon;
            return newIcon;
        }

        @Override

            return sb.toString();
        }
    }

    static class InitializeAllConstructorItem extends JavaCompletionItem {

        private static final String CONSTRUCTOR_PUBLIC = "org/netbeans/modules/java/editor/resources/new_constructor_16.png"; //NOI18N
        private static final String CONSTRUCTOR_COLOR = "<font color=#b28b00>"; //NOI18N
        private static final String PARAMETER_NAME_COLOR = "<font color=#b200b2>"; //NOI18N
        private static ImageIcon icon;

        private List<ElementHandle<VariableElement>> fieldHandles;
        private ElementHandle<TypeElement> parentHandle;
        private ElementHandle<ExecutableElement> superConstructorHandle;

        private List<ParamDesc> params;
        private String sortText;
        private String leftText;

        private InitializeAllConstructorItem(CompilationInfo info, Iterable<? extends VariableElement> fields, ExecutableElement superConstructor, TypeElement parent, int substitutionOffset) {
            super(substitutionOffset);
            this.fieldHandles = new ArrayList<ElementHandle<VariableElement>>();

            if (superConstructor != null) {
                this.superConstructorHandle = ElementHandle.create(superConstructor);
                for (VariableElement ve : superConstructor.getParameters()) {
                    this.params.add(new ParamDesc(null, Utilities.getTypeName(info, ve.asType(), false).toString(), ve.getSimpleName().toString()));
                }
            } else {
                this.superConstructorHandle = null;
            }
            this.simpleName = parent.getSimpleName().toString();
        }

        public int getSortPriority() {
            return 400;
        }

        public CharSequence getSortText() {
            if (sortText == null) {
                StringBuilder sortParams = new StringBuilder();

            }
            return sortText;
        }

        protected String getLeftHtmlText() {
            if (leftText == null) {
                StringBuilder lText = new StringBuilder();

            }
            return leftText;
        }

        protected ImageIcon getIcon() {
            if (icon == null)
                icon = ImageUtilities.loadImageIcon(CONSTRUCTOR_PUBLIC, false);
            return icon;
        }

        public CharSequence getInsertPrefix() {
            return simpleName;
        }

        @Override
        protected void substituteText(final JTextComponent c, final int offset, final int len, String toAdd, final boolean assignToVar) {
            final BaseDocument doc = (BaseDocument)c.getDocument();

                                    break;
                            }
                            ExecutableElement superConstructor = superConstructorHandle != null ? superConstructorHandle.resolve(copy) : null;

                            TreeMaker make = copy.getTreeMaker();
                            ClassTree clazz = (ClassTree) tp.getLeaf();
                            GeneratorUtilities gu = GeneratorUtilities.get(copy);
                            ClassTree decl = make.insertClassMember(clazz, idx, gu.createConstructor(parent, fieldElements, superConstructor)); //NOI18N

                            copy.rewrite(clazz, decl);
                        }
                    }

            sb.append(GENERATE_TEXT);
            return sb.toString();
        }

        public boolean instantSubstitution(JTextComponent component) {
            return false; //no instant substitution for create constructor item
        }

    private static final int PROTECTED_LEVEL = 2;
    private static final int PACKAGE_LEVEL = 1;
    private static final int PRIVATE_LEVEL = 0;

    private static int getProtectionLevel(Set<Modifier> modifiers) {
        if(modifiers.contains(Modifier.PUBLIC))
            return PUBLIC_LEVEL;

            return PRIVATE_LEVEL;
        return PACKAGE_LEVEL;
    }

    private static String escape(String s) {
        if (s != null) {
            try {

        }
        return s;
    }

    private static int findPositionForSemicolon(JTextComponent c) {
        final int[] ret = new int[] {-2};
        final int offset = c.getSelectionEnd();

                            while (t == null && tp != null) {
                                switch(tp.getLeaf().getKind()) {
                                    case EXPRESSION_STATEMENT:
                                    case IMPORT:
                                        t = tp.getLeaf();
                                        break;
                                    case RETURN:

                                    if (ts.token().id() == JavaTokenId.SEMICOLON) {
                                        ret[0] = -1;
                                    } else if (ts.moveNext()) {
                                        ret[0] = ts.token().id() == JavaTokenId.LINE_COMMENT || ts.token().id() == JavaTokenId.WHITESPACE && ts.token().text().toString().contains("\n") ? ts.offset() : offset;
                                    } else {
                                        ret[0] = ts.offset() + ts.token().length();
                                    }

        }, NbBundle.getMessage(JavaCompletionItem.class, "JCI-find_semicolon_pos"), cancel, false); //NOI18N
        return ret[0];
    }

    private static TokenSequence<JavaTokenId> findLastNonWhitespaceToken(CompilationInfo info, int startPos, int endPos) {
        TokenSequence<JavaTokenId> ts = info.getTokenHierarchy().tokenSequence(JavaTokenId.language());
        ts.move(endPos);

        }
        return null;
    }

    private static String getAssignToVarText(CompilationInfo info, TypeMirror type, String name) {
        name = adjustName(name);
        StringBuilder sb = new StringBuilder();

        sb.append("\"} = "); //NOI18N
        return sb.toString();
    }

    private static String adjustName(String name) {
        if (name == null)
            return null;

        String shortName = null;

        if (name.startsWith("get") && name.length() > 3) { //NOI18N
            shortName = name.substring(3);
        }

        if (name.startsWith("is") && name.length() > 2) { //NOI18N
            shortName = name.substring(2);
        }

        if (shortName != null) {
            return firstToLower(shortName);
        }

        if (SourceVersion.isKeyword(name)) {
            return "a" + Character.toUpperCase(name.charAt(0)) + name.substring(1); //NOI18N
        } else {
            return name;
        }
    }

    private static String firstToLower(String name) {
        if (name.length() == 0)
            return null;

        }

        result.append(last);

        if (SourceVersion.isKeyword(result)) {
            return "a" + name; //NOI18N
        } else {
            return result.toString();
        }
    }

    static class ParamDesc {
        private String fullTypeName;
        private String typeName;
        private String name;

        public ParamDesc(String fullTypeName, String typeName, String name) {
            this.fullTypeName = fullTypeName;
            this.typeName = typeName;




    <apidef name="plaf">Look And Feel Customization</apidef>
</apidefs>
<changes>
    <change id="lfcustoms-color-functions">
        <api name="plaf"/>
        <summary>New functions for getting foreground text color and color shifting</summary>
        <version major="1" minor="27"/>
        <date day="14" month="6" year="2012"/>
        <author login="wbrana"/>
        <compatibility
            addition="yes"
            binary="compatible" deletion="no" deprecation="no"
            modification="no" semantic="compatible" source="compatible"
        />
        <description>
            <p>
                new functions:<br/>
                <code>
                    static String getHexString(int color)<br/>
                    static String getTextFgColorHTML()<br/>
                    static Color getTextFgColor()<br/>
                    static Color shiftColor(Color color)<br/>
                    static Color getForeground(AttributeSet a)<br/>
                </code>
            </p>
        </description>
        <class package="org.netbeans.swing.plaf" name="LFCustoms"/>
    </change>
    <change id="branding.of.lfcustoms">
        <api name="plaf"/>
        <summary>It is now possible to customize application-specific UIManager keys and values.</summary>

Lines 1-6 Link Here

(-)a/o.n.swing.plaf/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module-Localizing-Bundle: org/netbeans/swing/plaf/Bundle.properties	2	OpenIDE-Module-Localizing-Bundle: org/netbeans/swing/plaf/Bundle.properties
3	OpenIDE-Module: org.netbeans.swing.plaf	3	OpenIDE-Module: org.netbeans.swing.plaf
4	OpenIDE-Module-Specification-Version: 1.26	4	OpenIDE-Module-Specification-Version: 1.27
5	AutoUpdate-Show-In-Client: false	5	AutoUpdate-Show-In-Client: false
6		6

Lines 44-49 Link Here

(-)a/o.n.swing.plaf/src/org/netbeans/swing/plaf/LFCustoms.java (-6 / +124 lines)
44		44
45	package org.netbeans.swing.plaf;	45	package org.netbeans.swing.plaf;
46		46
		47	import java.awt.Color;
		48	import java.util.logging.Logger;
		49	import javax.swing.UIManager;
		50	import javax.swing.plaf.ColorUIResource;
		51	import javax.swing.text.AttributeSet;
		52
47	/** Look and feel customizations interface.	53	/** Look and feel customizations interface.
48	* For various look and feels, there is a need to customize colors,	54	* For various look and feels, there is a need to customize colors,
49	* borders etc. to provide 'native-like' UI.	55	* borders etc. to provide 'native-like' UI.
Lines 78-83 Link Here
78	private Object[] guaranteedKeysAndValues = null;	84	private Object[] guaranteedKeysAndValues = null;
79	protected static final String WORKPLACE_FILL = "nb_workplace_fill"; //NOI18N	85	protected static final String WORKPLACE_FILL = "nb_workplace_fill"; //NOI18N
80		86
		87	/** convert color
		88	* @return hexadecimal value
		89	* @since 1.27
		90	*/
		91	public static String getHexString(int color) {
		92	String result = Integer.toHexString(color).toUpperCase();
		93	if (result.length() == 1) {
		94	return '0'+result;
		95	}
		96	return result;
		97	}
		98
		99	/** cached window text foreground color as html code */
		100	private static String textFgColorHTML = "";
		101
		102	/** @return window text foreground color as html code
		103	* @since 1.27
		104	*/
		105	public static String getTextFgColorHTML() {
		106	synchronized(LFCustoms.class) {
		107	if (textFgColorHTML.isEmpty()) {
		108	Object o = UIManager.getLookAndFeel().getDefaults().get("windowText");
		109	if (o instanceof ColorUIResource) {
		110	ColorUIResource resource = (ColorUIResource)o;
		111	textFgColorHTML = "<font color=#" + getHexString(resource.getRed()) + getHexString(resource.getGreen()) + getHexString(resource.getBlue())+">";
		112	} else {
		113	textFgColorHTML = "<font color=#000000>";
		114	Logger.getLogger(LFCustoms.class.getName()).warning("BUG: getTextFgColorHTML: color isn't available");
		115	}
		116	}
		117	return textFgColorHTML;
		118	}
		119	}
		120
		121	/** cached window text foreground color */
		122	private static Color textFgColor = null;
		123
		124	/** @return window text foreground color
		125	* @since 1.27
		126	*/
		127	public static Color getTextFgColor() {
		128	synchronized(LFCustoms.class) {
		129	if (textFgColor == null) {
		130	Object o = UIManager.getLookAndFeel().getDefaults().get("windowText");
		131	if (o instanceof ColorUIResource) {
		132	textFgColor = (Color) o;
		133	} else {
		134	textFgColor = Color.BLACK;
		135	Logger.getLogger(LFCustoms.class.getName()).warning("BUG: getTextFgColor: color isn't available");
		136	}
		137	}
		138	return textFgColor;
		139	}
		140	}
		141
		142	/** shift color value
		143	* @since 1.27
		144	*/
		145	private static final int shiftValue = 64;
		146
		147	/** convert color component
		148	* @return brighter color component
		149	* @since 1.27
		150	*/
151	private static int brighter (int color) {
152	int result = color + shiftValue;
153	if (result > 255) {
154	return 255;
155	} else {
156	return result;
157	}
158	}
159
160	/** convert color component
161	* @return darker color component
162	* @since 1.27
163	*/
164	private static int darker(int color) {
165	int result = color - shiftValue;
166	if (result < 0) {
167	return 0;
168	} else {
169	return result;
170	}
171	}
172
173	/** convert color to brighter one if window foreground text color is bright color
174	* or convert color to darker one if window foreground text color is dark color
175	* @return converted color
176	* @since 1.27
177	*/
178	public static Color shiftColor(Color color) {
179	Color textFgColor = getTextFgColor();
180	if ((textFgColor.getRed() > 127) \|\| (textFgColor.getGreen() > 127) \|\| (textFgColor.getBlue() > 127)) {
181	return new Color(brighter(color.getRed()), brighter(color.getGreen()), brighter(color.getBlue()));
182	}
183	return new Color(darker(color.getRed()), darker(color.getGreen()), darker(color.getBlue()));
184	}
185
186	/** get foreground text color from AttributeSet
187	* or get window foreground text color if AttributeSet doesn't define foreground text color
188	* @return foreground text color
189	* @since 1.27
190	*/
191	public static Color getForeground(AttributeSet a) {
192	Color fg = (Color) a.getAttribute(javax.swing.text.StyleConstants.Foreground);
193	if (fg == null) {
194	fg = getTextFgColor();
195	}
196	return fg;
197	}
198
81	//TODO: A nice idea would be to replace these classes with XML files - minor rewrite of NbTheme to do it	199	//TODO: A nice idea would be to replace these classes with XML files - minor rewrite of NbTheme to do it
82		200
83	/** Fetch and cache keys and values */	201	/** Fetch and cache keys and values */
Lines 108-114 Link Here
108	}	226	}
109		227
110	/**	228	/**
111	* Get all keys this LFCustoms installs in UIManager. This is used to	229	* Get all keys this LFCustoms installs in UIManager. This is used to
112	* delete unneeded elements from UIManager if the look and feel is changed	230	* delete unneeded elements from UIManager if the look and feel is changed
113	* on the fly (for example, the user switches Windows from Classic to XP	231	* on the fly (for example, the user switches Windows from Classic to XP
114	* look).	232	* look).
Lines 151-157 Link Here
151	}	269	}
152	return result;	270	return result;
153	}	271	}
154		272
155	/**	273	/**
156	* LFCustoms implementations which use UIBootstrapValue.Lazy should return	274	* LFCustoms implementations which use UIBootstrapValue.Lazy should return
157	* any keys that it will install here, so they can be merged into the list	275	* any keys that it will install here, so they can be merged into the list
Lines 223-229 Link Here
223	* custom font size is specified, the core will put this into UIDefaults.	341	* custom font size is specified, the core will put this into UIDefaults.
224	* We then read it out if present and use it to set up a custom font size. */	342	* We then read it out if present and use it to set up a custom font size. */
225	protected static final String CUSTOM_FONT_SIZE = "customFontSize"; //NOI18N	343	protected static final String CUSTOM_FONT_SIZE = "customFontSize"; //NOI18N
226		344
227	//Default font size - some classes use this to handle creating appropriate	345	//Default font size - some classes use this to handle creating appropriate
228	//custom fonts based on this value	346	//custom fonts based on this value
229	protected static final String DEFAULT_FONT_SIZE = "nbDefaultFontSize"; //NOI18N	347	protected static final String DEFAULT_FONT_SIZE = "nbDefaultFontSize"; //NOI18N
Lines 326-334 Link Here
326	public static final String SUBFONT = "subFont"; //NOI18N	444	public static final String SUBFONT = "subFont"; //NOI18N
327	public static final String LISTFONT = "List.font"; //NOI18N	445	public static final String LISTFONT = "List.font"; //NOI18N
328	public static final String TREEFONT = "Tree.font"; //NOI18N	446	public static final String TREEFONT = "Tree.font"; //NOI18N
329	public static final String PANELFONT = "Panel.font"; //NOI18N	447	public static final String PANELFONT = "Panel.font"; //NOI18N
330	public static final String SPINNERFONT = "Spinner.font"; //NOI18N	448	public static final String SPINNERFONT = "Spinner.font"; //NOI18N
331		449
332	// keys used by the progressbar api module.	450	// keys used by the progressbar api module.
333	public static final String PROGRESS_CANCEL_BUTTON_ICON = "nb.progress.cancel.icon";	451	public static final String PROGRESS_CANCEL_BUTTON_ICON = "nb.progress.cancel.icon";
334	public static final String PROGRESS_CANCEL_BUTTON_ROLLOVER_ICON = "nb.progress.cancel.icon.mouseover";	452	public static final String PROGRESS_CANCEL_BUTTON_ROLLOVER_ICON = "nb.progress.cancel.icon.mouseover";

Lines 214-219 Link Here

(-)a/refactoring.java/nbproject/project.xml (+8 lines)
214	</run-dependency>	214	</run-dependency>
215	</dependency>	215	</dependency>
216	<dependency>	216	<dependency>
		217	<code-name-base>org.netbeans.swing.plaf</code-name-base>
		218	<build-prerequisite/>
		219	<compile-dependency/>
		220	<run-dependency>
		221	<specification-version>1.27</specification-version>
		222	</run-dependency>
		223	</dependency>
		224	<dependency>
217	<code-name-base>org.openide.actions</code-name-base>	225	<code-name-base>org.openide.actions</code-name-base>
218	<build-prerequisite/>	226	<build-prerequisite/>
219	<compile-dependency/>	227	<compile-dependency/>




import org.netbeans.api.lexer.TokenHierarchy;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.modules.refactoring.java.api.MemberInfo;
import org.netbeans.swing.plaf.LFCustoms;
import org.openide.util.Lookup;
import org.openide.xml.XMLUtil;


            buf.insert(0, "<s>"); // NOI18N
            buf.append("</s>"); // NOI18N
        }
        buf.insert(0, "<font color=" + getHTMLColor(LFCustoms.getForeground(set)) + ">"); //NOI18N
        buf.append("</font>"); //NOI18N
        return buf.toString();
    }

        temp = temp.replace(">", "&gt;"); // NOI18N
        return temp;
    }

    static String format(Element element) {
        return format(element, false, false);
    }

    static String format(Element element, boolean forSignature, boolean FQNs) {
        StringBuilder stringBuilder = new StringBuilder();
        format(element, stringBuilder, forSignature, FQNs);

                    }
                }
            }

            if (forSignature) {
                switch (element.getKind()) {
                    case CLASS:

                        break;
                }
            }

            TypeElement typeElement = (TypeElement) element;
            stringBuilder.append(FQNs
                ? typeElement.getQualifiedName().toString()


            if (forSignature) {
                stringBuilder.append(toString(modifiers));

                if (modifiers.size() > 0) {
                    if (stringBuilder.length() > 0) {
                        stringBuilder.append(" ");

                            stringBuilder.append("\"");
                        } else if (annotationValueValue instanceof Character) {
                            stringBuilder.append("\'");
                        }
                        stringBuilder.append(String.valueOf(annotationValueValue));
                        if (annotationValueValue instanceof String) {
                            stringBuilder.append("\"");
                        } else if (annotationValueValue instanceof Character) {
                            stringBuilder.append("\'");
                        }
                    }
                }
            } else {

                        stringBuilder.append("\"");
                    } else if (fieldValue instanceof Character) {
                        stringBuilder.append("\'");
                    }
                    stringBuilder.append(String.valueOf(fieldValue));
                    if (fieldValue instanceof String) {
                        stringBuilder.append("\"");
                    } else if (fieldValue instanceof Character) {
                        stringBuilder.append("\'");
                    }
                }
            } else {
                stringBuilder.append(":");

                formatTypeMirror(fieldElement.asType(), stringBuilder, FQNs);
            }

            break;

        case ENUM_CONSTANT:

            break;
        }
    }

    static void formatTypeMirror(TypeMirror typeMirror,
        StringBuilder stringBuilder, boolean FQNs) {
        if (typeMirror == null) {

            return;
        }

        boolean first = true;
        if (typeParameters.size() > 0) {
            stringBuilder.append("<");
            first = true;


        return modifiers;
    }

    static String getClassName(String className) {
        return getClassName(className, false);
    }

    static String getClassName(String className, boolean FQNs) {
        // Handle generic type names i.e. strip off parameters
        int firstLessThan = className.indexOf('<');


        return className;
    }

    // Tree movement
    static void firstRow(JTree tree) {
        int rowCount = tree.getRowCount();

            scrollTreeToSelectedRow(tree);
        }
    }

    static void previousRow(JTree tree) {
        int rowCount = tree.getRowCount();
        if (rowCount > 0) {

            scrollTreeToSelectedRow(tree);
        }
    }

    static void nextRow(JTree tree) {
        int rowCount = tree.getRowCount();
        if (rowCount > 0) {

            scrollTreeToSelectedRow(tree);
        }
    }

    static void lastRow(JTree tree) {
        int rowCount = tree.getRowCount();
        if (rowCount > 0) {

            scrollTreeToSelectedRow(tree);
        }
    }

    static void scrollTreeToSelectedRow(final JTree tree) {
        final int selectedRow = tree.getLeadSelectionRow();
        if (selectedRow >=0) {

            );
        }
    }

    static String escape(String s) {
        if (s != null) {
            try {

        }
        return null;
    }

    private static final String TYPE_COLOR = "#707070";
    private static final String INHERITED_COLOR = "#7D694A";


                }
                sb.append(print(e.getReturnType(), html));
                if (html) {
                    sb.append("</font>"); // NOI18N
                }
            }
        }

            sb.append(" :: "); // NOI18N
            if (scName != null) {
                if (html) {
                    sb.append("<font color=" + TYPE_COLOR + ">"); // NOI18N
                }
                sb.append(scName);
                if (html) {

                for (Iterator<? extends TypeMirror> it = ifaces.iterator(); it.hasNext();) {
                    TypeMirror typeMirror = it.next();
                    if (html) {
                        sb.append("<font color=" + TYPE_COLOR + ">"); // NOI18N
                    }
                    sb.append(print(typeMirror, html));
                    if (html) {

Return to bug 134281

Lines 67-73 Link Here

(-)a/core.output2/src/org/netbeans/core/output2/AbstractLines.java (-7 / +10 lines)
67	import org.openide.util.Mutex;	67	import org.openide.util.Mutex;
68	import org.openide.windows.IOColors;	68	import org.openide.windows.IOColors;
69	import org.openide.windows.OutputListener;	69	import org.openide.windows.OutputListener;
70		70	import org.netbeans.swing.plaf.LFCustoms;
71	/**	71	/**
72	* Abstract Lines implementation with handling for getLine wrap calculations, etc.	72	* Abstract Lines implementation with handling for getLine wrap calculations, etc.
73	*/	73	*/
Lines 313-319 Link Here
313	longestLineLen = 0;	313	longestLineLen = 0;
314	listener = null;	314	listener = null;
315	dirty = false;	315	dirty = false;
316	curDefColors = DEF_COLORS.clone();	316	curDefColors = getDefColors().clone();
317	}	317	}
318		318
319	private boolean dirty;	319	private boolean dirty;
Lines 827-838 Link Here
827	}	827	}
828		828
829	/** initial default colors */	829	/** initial default colors */
830	static final Color[] DEF_COLORS;	830	private static Color[] DEF_COLORS = null;
831		831
832	/** current default colors */	832	/** current default colors */
833	Color[] curDefColors;	833	Color[] curDefColors;
834		834
835	static {	835	static Color[] getDefColors() {
		836	if (DEF_COLORS != null) {
		837	return DEF_COLORS;
		838	}
836	Color out = UIManager.getColor("nb.output.foreground"); //NOI18N	839	Color out = UIManager.getColor("nb.output.foreground"); //NOI18N
837	if (out == null) {	840	if (out == null) {
838	out = UIManager.getColor("textText");	841	out = UIManager.getColor("textText");
Lines 843-854 Link Here
843		846
844	Color err = UIManager.getColor("nb.output.err.foreground"); //NOI18N	847	Color err = UIManager.getColor("nb.output.err.foreground"); //NOI18N
845	if (err == null) {	848	if (err == null) {
846	err = new Color(164, 0, 0);	849	err = LFCustoms.shiftColor(Color.red);
847	}	850	}
848		851
849	Color hyperlink = UIManager.getColor("nb.output.link.foreground"); //NOI18N	852	Color hyperlink = UIManager.getColor("nb.output.link.foreground"); //NOI18N
850	if (hyperlink == null) {	853	if (hyperlink == null) {
851	hyperlink = Color.BLUE.darker();	854	hyperlink = LFCustoms.shiftColor(Color.blue);
852	}	855	}
853		856
854	Color hyperlinkImp = UIManager.getColor("nb.output.link.foreground.important"); //NOI18N	857	Color hyperlinkImp = UIManager.getColor("nb.output.link.foreground.important"); //NOI18N
Lines 856-862 Link Here
856	hyperlinkImp = hyperlink;	859	hyperlinkImp = hyperlink;
857	}	860	}
858		861
859	DEF_COLORS = new Color[]{out, err, hyperlink, hyperlinkImp};	862	return DEF_COLORS = new Color[]{out, err, hyperlink, hyperlinkImp};
860	}	863	}
861		864
862	public void setDefColor(IOColors.OutputType type, Color color) {	865	public void setDefColor(IOColors.OutputType type, Color color) {

Lines 66-71 Link Here

(-)a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/UIUtilities.java (-25 / +26 lines)
66	import org.netbeans.api.lexer.TokenHierarchy;	66	import org.netbeans.api.lexer.TokenHierarchy;
67	import org.netbeans.api.lexer.TokenSequence;	67	import org.netbeans.api.lexer.TokenSequence;
68	import org.netbeans.modules.refactoring.java.api.MemberInfo;	68	import org.netbeans.modules.refactoring.java.api.MemberInfo;
		69	import org.netbeans.swing.plaf.LFCustoms;
69	import org.openide.util.Lookup;	70	import org.openide.util.Lookup;
70	import org.openide.xml.XMLUtil;	71	import org.openide.xml.XMLUtil;
71		72
Lines 279-285 Link Here
279	buf.insert(0, "<s>"); // NOI18N	280	buf.insert(0, "<s>"); // NOI18N
280	buf.append("</s>"); // NOI18N	281	buf.append("</s>"); // NOI18N
281	}	282	}
282	buf.insert(0, "<font color=" + getHTMLColor(StyleConstants.getForeground(set)) + ">"); //NOI18N	283	buf.insert(0, "<font color=" + getHTMLColor(LFCustoms.getForeground(set)) + ">"); //NOI18N
283	buf.append("</font>"); //NOI18N	284	buf.append("</font>"); //NOI18N
284	return buf.toString();	285	return buf.toString();
285	}	286	}
Lines 300-310 Link Here
300	temp = temp.replace(">", ">"); // NOI18N	301	temp = temp.replace(">", ">"); // NOI18N
301	return temp;	302	return temp;
302	}	303	}
303		304
304	static String format(Element element) {	305	static String format(Element element) {
305	return format(element, false, false);	306	return format(element, false, false);
306	}	307	}
307		308
308	static String format(Element element, boolean forSignature, boolean FQNs) {	309	static String format(Element element, boolean forSignature, boolean FQNs) {
309	StringBuilder stringBuilder = new StringBuilder();	310	StringBuilder stringBuilder = new StringBuilder();
310	format(element, stringBuilder, forSignature, FQNs);	311	format(element, stringBuilder, forSignature, FQNs);
Lines 342-348 Link Here
342	}	343	}
343	}	344	}
344	}	345	}
345		346
346	if (forSignature) {	347	if (forSignature) {
347	switch (element.getKind()) {	348	switch (element.getKind()) {
348	case CLASS:	349	case CLASS:
Lines 359-365 Link Here
359	break;	360	break;
360	}	361	}
361	}	362	}
362		363
363	TypeElement typeElement = (TypeElement) element;	364	TypeElement typeElement = (TypeElement) element;
364	stringBuilder.append(FQNs	365	stringBuilder.append(FQNs
365	? typeElement.getQualifiedName().toString()	366	? typeElement.getQualifiedName().toString()
Lines 402-408 Link Here
402		403
403	if (forSignature) {	404	if (forSignature) {
404	stringBuilder.append(toString(modifiers));	405	stringBuilder.append(toString(modifiers));
405		406
406	if (modifiers.size() > 0) {	407	if (modifiers.size() > 0) {
407	if (stringBuilder.length() > 0) {	408	if (stringBuilder.length() > 0) {
408	stringBuilder.append(" ");	409	stringBuilder.append(" ");
Lines 445-457 Link Here
445	stringBuilder.append("\"");	446	stringBuilder.append("\"");
446	} else if (annotationValueValue instanceof Character) {	447	} else if (annotationValueValue instanceof Character) {
447	stringBuilder.append("\'");	448	stringBuilder.append("\'");
448	}	449	}
449	stringBuilder.append(String.valueOf(annotationValueValue));	450	stringBuilder.append(String.valueOf(annotationValueValue));
450	if (annotationValueValue instanceof String) {	451	if (annotationValueValue instanceof String) {
451	stringBuilder.append("\"");	452	stringBuilder.append("\"");
452	} else if (annotationValueValue instanceof Character) {	453	} else if (annotationValueValue instanceof Character) {
453	stringBuilder.append("\'");	454	stringBuilder.append("\'");
454	}	455	}
455	}	456	}
456	}	457	}
457	} else {	458	} else {
Lines 520-539 Link Here
520	stringBuilder.append("\"");	521	stringBuilder.append("\"");
521	} else if (fieldValue instanceof Character) {	522	} else if (fieldValue instanceof Character) {
522	stringBuilder.append("\'");	523	stringBuilder.append("\'");
523	}	524	}
524	stringBuilder.append(String.valueOf(fieldValue));	525	stringBuilder.append(String.valueOf(fieldValue));
525	if (fieldValue instanceof String) {	526	if (fieldValue instanceof String) {
526	stringBuilder.append("\"");	527	stringBuilder.append("\"");
527	} else if (fieldValue instanceof Character) {	528	} else if (fieldValue instanceof Character) {
528	stringBuilder.append("\'");	529	stringBuilder.append("\'");
529	}	530	}
530	}	531	}
531	} else {	532	} else {
532	stringBuilder.append(":");	533	stringBuilder.append(":");
533		534
534	formatTypeMirror(fieldElement.asType(), stringBuilder, FQNs);	535	formatTypeMirror(fieldElement.asType(), stringBuilder, FQNs);
535	}	536	}
536		537
537	break;	538	break;
538		539
539	case ENUM_CONSTANT:	540	case ENUM_CONSTANT:
Lines 550-556 Link Here
550	break;	551	break;
551	}	552	}
552	}	553	}
553		554
554	static void formatTypeMirror(TypeMirror typeMirror,	555	static void formatTypeMirror(TypeMirror typeMirror,
555	StringBuilder stringBuilder, boolean FQNs) {	556	StringBuilder stringBuilder, boolean FQNs) {
556	if (typeMirror == null) {	557	if (typeMirror == null) {
Lines 640-646 Link Here
640	return;	641	return;
641	}	642	}
642		643
643	boolean first = true;	644	boolean first = true;
644	if (typeParameters.size() > 0) {	645	if (typeParameters.size() > 0) {
645	stringBuilder.append("<");	646	stringBuilder.append("<");
646	first = true;	647	first = true;
Lines 805-815 Link Here
805		806
806	return modifiers;	807	return modifiers;
807	}	808	}
808		809
809	static String getClassName(String className) {	810	static String getClassName(String className) {
810	return getClassName(className, false);	811	return getClassName(className, false);
811	}	812	}
812		813
813	static String getClassName(String className, boolean FQNs) {	814	static String getClassName(String className, boolean FQNs) {
814	// Handle generic type names i.e. strip off parameters	815	// Handle generic type names i.e. strip off parameters
815	int firstLessThan = className.indexOf('<');	816	int firstLessThan = className.indexOf('<');
Lines 845-851 Link Here
845		846
846	return className;	847	return className;
847	}	848	}
848		849
849	// Tree movement	850	// Tree movement
850	static void firstRow(JTree tree) {	851	static void firstRow(JTree tree) {
851	int rowCount = tree.getRowCount();	852	int rowCount = tree.getRowCount();
Lines 854-860 Link Here
854	scrollTreeToSelectedRow(tree);	855	scrollTreeToSelectedRow(tree);
855	}	856	}
856	}	857	}
857		858
858	static void previousRow(JTree tree) {	859	static void previousRow(JTree tree) {
859	int rowCount = tree.getRowCount();	860	int rowCount = tree.getRowCount();
860	if (rowCount > 0) {	861	if (rowCount > 0) {
Lines 871-877 Link Here
871	scrollTreeToSelectedRow(tree);	872	scrollTreeToSelectedRow(tree);
872	}	873	}
873	}	874	}
874		875
875	static void nextRow(JTree tree) {	876	static void nextRow(JTree tree) {
876	int rowCount = tree.getRowCount();	877	int rowCount = tree.getRowCount();
877	if (rowCount > 0) {	878	if (rowCount > 0) {
Lines 886-892 Link Here
886	scrollTreeToSelectedRow(tree);	887	scrollTreeToSelectedRow(tree);
887	}	888	}
888	}	889	}
889		890
890	static void lastRow(JTree tree) {	891	static void lastRow(JTree tree) {
891	int rowCount = tree.getRowCount();	892	int rowCount = tree.getRowCount();
892	if (rowCount > 0) {	893	if (rowCount > 0) {
Lines 894-900 Link Here
894	scrollTreeToSelectedRow(tree);	895	scrollTreeToSelectedRow(tree);
895	}	896	}
896	}	897	}
897		898
898	static void scrollTreeToSelectedRow(final JTree tree) {	899	static void scrollTreeToSelectedRow(final JTree tree) {
899	final int selectedRow = tree.getLeadSelectionRow();	900	final int selectedRow = tree.getLeadSelectionRow();
900	if (selectedRow >=0) {	901	if (selectedRow >=0) {
Lines 907-913 Link Here
907	);	908	);
908	}	909	}
909	}	910	}
910		911
911	static String escape(String s) {	912	static String escape(String s) {
912	if (s != null) {	913	if (s != null) {
913	try {	914	try {
Lines 917-923 Link Here
917	}	918	}
918	return null;	919	return null;
919	}	920	}
920		921
921	private static final String TYPE_COLOR = "#707070";	922	private static final String TYPE_COLOR = "#707070";
922	private static final String INHERITED_COLOR = "#7D694A";	923	private static final String INHERITED_COLOR = "#7D694A";
923		924
Lines 981-987 Link Here
981	}	982	}
982	sb.append(print(e.getReturnType(), html));	983	sb.append(print(e.getReturnType(), html));
983	if (html) {	984	if (html) {
984	sb.append("</font>"); // NOI18N	985	sb.append("</font>"); // NOI18N
985	}	986	}
986	}	987	}
987	}	988	}
Lines 1168-1174 Link Here
1168	sb.append(" :: "); // NOI18N	1169	sb.append(" :: "); // NOI18N
1169	if (scName != null) {	1170	if (scName != null) {
1170	if (html) {	1171	if (html) {
1171	sb.append("<font color=" + TYPE_COLOR + ">"); // NOI18N	1172	sb.append("<font color=" + TYPE_COLOR + ">"); // NOI18N
1172	}	1173	}
1173	sb.append(scName);	1174	sb.append(scName);
1174	if (html) {	1175	if (html) {
Lines 1182-1188 Link Here
1182	for (Iterator<? extends TypeMirror> it = ifaces.iterator(); it.hasNext();) {	1183	for (Iterator<? extends TypeMirror> it = ifaces.iterator(); it.hasNext();) {
1183	TypeMirror typeMirror = it.next();	1184	TypeMirror typeMirror = it.next();
1184	if (html) {	1185	if (html) {
1185	sb.append("<font color=" + TYPE_COLOR + ">"); // NOI18N	1186	sb.append("<font color=" + TYPE_COLOR + ">"); // NOI18N
1186	}	1187	}
1187	sb.append(print(typeMirror, html));	1188	sb.append(print(typeMirror, html));
1188	if (html) {	1189	if (html) {

Lines 103-109 Link Here

(-)a/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmResultItem.java (-17 / +16 lines)
103	import org.netbeans.spi.editor.completion.CompletionItem;	103	import org.netbeans.spi.editor.completion.CompletionItem;
104	import org.netbeans.spi.editor.completion.CompletionTask;	104	import org.netbeans.spi.editor.completion.CompletionTask;
105	import org.openide.util.Lookup;	105	import org.openide.util.Lookup;
106		106	import org.netbeans.swing.plaf.LFCustoms;
107	/**	107	/**
108	*	108	*
109	* @author Vladimir Voskresensky	109	* @author Vladimir Voskresensky
Lines 116-129 Link Here
116	DOT_TO_ARROW,	116	DOT_TO_ARROW,
117	ARROW_TO_DOT,	117	ARROW_TO_DOT,
118	}	118	}
119		119
120	private static boolean enableInstantSubstitution = true;	120	private static boolean enableInstantSubstitution = true;
121	protected int selectionStartOffset = -1;	121	protected int selectionStartOffset = -1;
122	protected int selectionEndOffset = -1;	122	protected int selectionEndOffset = -1;
123	protected int substituteOffset = -1;	123	protected int substituteOffset = -1;
124	CsmObject associatedObject;	124	CsmObject associatedObject;
125	private static final Color KEYWORD_COLOR = Color.gray;	125	private static final Color KEYWORD_COLOR = Color.lightGray;
126	private static final Color TYPE_COLOR = Color.black;
127	private int priority;	126	private int priority;
128	private SubstitutionHint hint;	127	private SubstitutionHint hint;
129		128
Lines 141-153 Link Here
141	void setHint(SubstitutionHint hint) {	140	void setHint(SubstitutionHint hint) {
142	this.hint = hint;	141	this.hint = hint;
143	}	142	}
144		143
145	protected SubstitutionHint getHint() {	144	protected SubstitutionHint getHint() {
146	return this.hint;	145	return this.hint;
147	}	146	}
148		147
149	protected static Color getTypeColor(CsmType type) {	148	protected static Color getTypeColor(CsmType type) {
150	return type.isBuiltInBased(false) ? KEYWORD_COLOR : TYPE_COLOR;	149	return type.isBuiltInBased(false) ? LFCustoms.shiftColor(KEYWORD_COLOR) : LFCustoms.getTextFgColor();
151	}	150	}
152		151
153	public void setSubstituteOffset(int substituteOffset) {	152	public void setSubstituteOffset(int substituteOffset) {
Lines 271-277 Link Here
271	Component comp = getPaintComponent(false);	270	Component comp = getPaintComponent(false);
272	return comp != null ? comp.toString() : ""; //NOI18N	271	return comp != null ? comp.toString() : ""; //NOI18N
273	}	272	}
274		273
275	protected int convertCsmModifiers(CsmObject obj) {	274	protected int convertCsmModifiers(CsmObject obj) {
276	return CsmUtilities.getModifiers(obj);	275	return CsmUtilities.getModifiers(obj);
277	}	276	}
Lines 981-991 Link Here
981	if (type == null) {	980	if (type == null) {
982	// only var args parameters could have null types	981	// only var args parameters could have null types
983	assert (((CsmParameter) prm).isVarArgs()) : " non var arg " + prm + " of class " + prm.getClass().getName();	982	assert (((CsmParameter) prm).isVarArgs()) : " non var arg " + prm + " of class " + prm.getClass().getName();
984	params.add(new ParamStr("", "", ((CsmParameter) prm).getName().toString(), prm.getText().toString(), true, KEYWORD_COLOR)); //NOI18N	983	params.add(new ParamStr("", "", ((CsmParameter) prm).getName().toString(), prm.getText().toString(), true, LFCustoms.shiftColor(KEYWORD_COLOR))); //NOI18N
985	varArgIndex = i;	984	varArgIndex = i;
986	} else {	985	} else {
987	String typeName = getTypeName(type, instantiateTypes);	986	String typeName = getTypeName(type, instantiateTypes);
988	params.add(new ParamStr(typeName, typeName, ((CsmParameter) prm).getName().toString(), prm.getText().toString(), false, TYPE_COLOR /getTypeColor(type.getClassifier())/));	987	params.add(new ParamStr(typeName, typeName, ((CsmParameter) prm).getName().toString(), prm.getText().toString(), false, LFCustoms.getTextFgColor() /getTypeColor(type.getClassifier())/));
989	}	988	}
990	i++;	989	i++;
991	}	990	}
Lines 1048-1054 Link Here
1048	List<String> ret = new ArrayList<String>();	1047	List<String> ret = new ArrayList<String>();
1049	for (Iterator<ParamStr> it = getParams().iterator(); it.hasNext();) {	1048	for (Iterator<ParamStr> it = getParams().iterator(); it.hasNext();) {
1050	StringBuilder sb = new StringBuilder();	1049	StringBuilder sb = new StringBuilder();
1051	ParamStr ps = it.next();	1050	ParamStr ps = it.next();
1052	if (ps.isVarArg()) {	1051	if (ps.isVarArg()) {
1053	sb.append(ps.getSimpleTypeName());	1052	sb.append(ps.getSimpleTypeName());
1054	sb.append("..."); // NOI18N	1053	sb.append("..."); // NOI18N
Lines 1765-1783 Link Here
1765	// this.prm = prm;	1764	// this.prm = prm;
1766	// this.typeColor = typeColor;	1765	// this.typeColor = typeColor;
1767	// }	1766	// }
1768	//	1767	//
1769	// public String getTypeName() {	1768	// public String getTypeName() {
1770	// return type;	1769	// return type;
1771	// }	1770	// }
1772	//	1771	//
1773	// public String getSimpleTypeName() {	1772	// public String getSimpleTypeName() {
1774	// return simpleType;	1773	// return simpleType;
1775	// }	1774	// }
1776	//	1775	//
1777	// public String getName() {	1776	// public String getName() {
1778	// return prm;	1777	// return prm;
1779	// }	1778	// }
1780	//	1779	//
1781	// public Color getTypeColor() {	1780	// public Color getTypeColor() {
1782	// return typeColor;	1781	// return typeColor;
1783	// }	1782	// }
Lines 1789-1799 Link Here
1789	// this.name = name;	1788	// this.name = name;
1790	// this.typeColor = typeColor;	1789	// this.typeColor = typeColor;
1791	// }	1790	// }
1792	//	1791	//
1793	// public String getName() {	1792	// public String getName() {
1794	// return name;	1793	// return name;
1795	// }	1794	// }
1796	//	1795	//
1797	// public Color getTypeColor() {	1796	// public Color getTypeColor() {
1798	// return typeColor;	1797	// return typeColor;
1799	// }	1798	// }

Lines 89-94 Link Here

(-)a/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/CsmDisplayUtilities.java (-9 / +10 lines)
89	import org.openide.text.CloneableEditorSupport;	89	import org.openide.text.CloneableEditorSupport;
90	import org.openide.util.Lookup;	90	import org.openide.util.Lookup;
91	import org.openide.util.NbBundle;	91	import org.openide.util.NbBundle;
		92	import org.netbeans.swing.plaf.LFCustoms;
92		93
93	/**	94	/**
94	*	95	*
Lines 138-144 Link Here
138	}	139	}
139	return displayText;	140	return displayText;
140	}	141	}
141		142
142	public static String getLineHtml(int startLine, int endLine, final int stToken, final int endToken, BaseDocument doc) throws BadLocationException {	143	public static String getLineHtml(int startLine, int endLine, final int stToken, final int endToken, BaseDocument doc) throws BadLocationException {
143	int startBold = stToken - startLine;	144	int startBold = stToken - startLine;
144	int endBold = endToken - startLine;	145	int endBold = endToken - startLine;
Lines 327-342 Link Here
327		328
328	private static String getString(String key, CharSequence value) {	329	private static String getString(String key, CharSequence value) {
329	return NbBundle.getMessage(CsmDisplayUtilities.class, key, value);	330	return NbBundle.getMessage(CsmDisplayUtilities.class, key, value);
330	}	331	}
331		332
332	private static String getString(String key, CharSequence value1, CharSequence value2) {	333	private static String getString(String key, CharSequence value1, CharSequence value2) {
333	return NbBundle.getMessage(CsmDisplayUtilities.class, key, value1, value2);	334	return NbBundle.getMessage(CsmDisplayUtilities.class, key, value1, value2);
334	}	335	}
335		336
336	private static String getString(String key, CharSequence value1, CharSequence value2, CharSequence value3, CharSequence value4) {	337	private static String getString(String key, CharSequence value1, CharSequence value2, CharSequence value3, CharSequence value4) {
337	return NbBundle.getMessage(CsmDisplayUtilities.class, key, new Object[] {value1, value2, value3, value4});	338	return NbBundle.getMessage(CsmDisplayUtilities.class, key, new Object[] {value1, value2, value3, value4});
338	}	339	}
339		340
340	private final static boolean SKIP_COLORING = Boolean.getBoolean("cnd.test.skip.coloring");// NOI18N	341	private final static boolean SKIP_COLORING = Boolean.getBoolean("cnd.test.skip.coloring");// NOI18N
341		342
342	private static void appendHtml(StringBuilder buf, TokenSequence<?> ts) {	343	private static void appendHtml(StringBuilder buf, TokenSequence<?> ts) {
Lines 405-411 Link Here
405	buf.insert(0, "<s>"); // NOI18N	406	buf.insert(0, "<s>"); // NOI18N
406	buf.append("</s>"); // NOI18N	407	buf.append("</s>"); // NOI18N
407	}	408	}
408	buf.insert(0, "<font color=" + getHTMLColor(StyleConstants.getForeground(set)) + ">"); //NOI18N	409	buf.insert(0, "<font color=" + getHTMLColor(LFCustoms.getForeground(set)) + ">"); //NOI18N
409	buf.append("</font>"); //NOI18N	410	buf.append("</font>"); //NOI18N
410	return buf.toString();	411	return buf.toString();
411	}	412	}
Lines 420-426 Link Here
420	String html_color = "#" + colorR + colorG + colorB; //NOI18N	421	String html_color = "#" + colorR + colorG + colorB; //NOI18N
421	return html_color;	422	return html_color;
422	}	423	}
423		424
424	private static String trimStart(String s) {	425	private static String trimStart(String s) {
425	for (int x = 0; x < s.length(); x++) {	426	for (int x = 0; x < s.length(); x++) {
426	if (Character.isWhitespace(s.charAt(x))) {	427	if (Character.isWhitespace(s.charAt(x))) {

Lines 75-81 Link Here

(-)a/core.output2/src/org/netbeans/core/output2/NbIO.java (-27 / +27 lines)
75	private Boolean focusTaken = null;	75	private Boolean focusTaken = null;
76	private boolean closed = false;	76	private boolean closed = false;
77	private final String name;	77	private final String name;
78		78
79	private Action[] actions;	79	private Action[] actions;
80		80
81	private NbWriter out = null;	81	private NbWriter out = null;
Lines 84-90 Link Here
84	private IOTabImpl ioTab;	84	private IOTabImpl ioTab;
85	private IOColorsImpl ioColors;	85	private IOColorsImpl ioColors;
86		86
87	/** Creates a new instance of NbIO	87	/** Creates a new instance of NbIO
88	* @param name The name of the IO	88	* @param name The name of the IO
89	* @param toolbarActions an optional set of toolbar actions	89	* @param toolbarActions an optional set of toolbar actions
90	* @param iowin parent container accessor (null for default)	90	* @param iowin parent container accessor (null for default)
Lines 94-105 Link Here
94	this.actions = toolbarActions;	94	this.actions = toolbarActions;
95	this.ioContainer = ioContainer != null ? ioContainer : IOContainer.getDefault();	95	this.ioContainer = ioContainer != null ? ioContainer : IOContainer.getDefault();
96	}	96	}
97		97
98	/** Package private constructor for unit tests */	98	/** Package private constructor for unit tests */
99	NbIO (String name) {	99	NbIO (String name) {
100	this.name = name;	100	this.name = name;
101	}	101	}
102		102
103	public void closeInputOutput() {	103	public void closeInputOutput() {
104	if (Controller.LOG) Controller.log("CLOSE INPUT OUTPUT CALLED FOR " + this);	104	if (Controller.LOG) Controller.log("CLOSE INPUT OUTPUT CALLED FOR " + this);
105	if (out != null) {	105	if (out != null) {
Lines 108-114 Link Here
108	}	108	}
109	post (this, IOEvent.CMD_CLOSE, true);	109	post (this, IOEvent.CMD_CLOSE, true);
110	}	110	}
111		111
112	String getName() {	112	String getName() {
113	return name;	113	return name;
114	}	114	}
Lines 139-145 Link Here
139	}	139	}
140	NbIOProvider.dispose(this);	140	NbIOProvider.dispose(this);
141	}	141	}
142		142
143	public OutputWriter getOut() {	143	public OutputWriter getOut() {
144	synchronized (this) {	144	synchronized (this) {
145	if (out == null) {	145	if (out == null) {
Lines 149-155 Link Here
149	}	149	}
150	return out;	150	return out;
151	}	151	}
152		152
153	/** Called by the view when polling */	153	/** Called by the view when polling */
154	OutWriter out() {	154	OutWriter out() {
155	return out == null ? null : out.out();	155	return out == null ? null : out.out();
Lines 166-203 Link Here
166	public boolean isErrSeparated() {	166	public boolean isErrSeparated() {
167	return false;	167	return false;
168	}	168	}
169		169
170	public boolean isFocusTaken() {	170	public boolean isFocusTaken() {
171	return Boolean.TRUE.equals(focusTaken);	171	return Boolean.TRUE.equals(focusTaken);
172	}	172	}
173		173
174	boolean isStreamClosed() {	174	boolean isStreamClosed() {
175	return out == null ? true : streamClosed;	175	return out == null ? true : streamClosed;
176	}	176	}
177		177
178	public void select() {	178	public void select() {
179	if (Controller.LOG) Controller.log (this + ": select");	179	if (Controller.LOG) Controller.log (this + ": select");
180	post (this, IOEvent.CMD_SELECT, true);	180	post (this, IOEvent.CMD_SELECT, true);
181	}	181	}
182		182
183	public void setErrSeparated(boolean value) {	183	public void setErrSeparated(boolean value) {
184	//do nothing	184	//do nothing
185	}	185	}
186		186
187	public void setErrVisible(boolean value) {	187	public void setErrVisible(boolean value) {
188	//do nothing	188	//do nothing
189	}	189	}
190		190
191	public void setFocusTaken(boolean value) {	191	public void setFocusTaken(boolean value) {
192	focusTaken = value ? Boolean.TRUE : Boolean.FALSE;	192	focusTaken = value ? Boolean.TRUE : Boolean.FALSE;
193	post (this, IOEvent.CMD_FOCUS_TAKEN, value);	193	post (this, IOEvent.CMD_FOCUS_TAKEN, value);
194	}	194	}
195		195
196	public void setInputVisible(boolean value) {	196	public void setInputVisible(boolean value) {
197	if (Controller.LOG) Controller.log(NbIO.this + ": SetInputVisible");	197	if (Controller.LOG) Controller.log(NbIO.this + ": SetInputVisible");
198	post (this, IOEvent.CMD_INPUT_VISIBLE, value);	198	post (this, IOEvent.CMD_INPUT_VISIBLE, value);
199	}	199	}
200		200
201	public void setOutputVisible(boolean value) {	201	public void setOutputVisible(boolean value) {
202	//do nothing	202	//do nothing
203	}	203	}
Lines 218-224 Link Here
218	Action[] getToolbarActions() {	218	Action[] getToolbarActions() {
219	return actions;	219	return actions;
220	}	220	}
221		221
222	public void reset() {	222	public void reset() {
223	if (Controller.LOG) Controller.log (this + ": reset");	223	if (Controller.LOG) Controller.log (this + ": reset");
224	closed = false;	224	closed = false;
Lines 230-236 Link Here
230	}	230	}
231	post (this, IOEvent.CMD_RESET, true);	231	post (this, IOEvent.CMD_RESET, true);
232	}	232	}
233		233
234	private static void post (NbIO io, int command, boolean val) {	234	private static void post (NbIO io, int command, boolean val) {
235	IOEvent evt = new IOEvent (io, command, val);	235	IOEvent evt = new IOEvent (io, command, val);
236	post (evt);	236	post (evt);
Lines 251-257 Link Here
251	eq.postEvent(evt);	251	eq.postEvent(evt);
252	}	252	}
253	}	253	}
254		254
255	@Override public String toString() {	255	@Override public String toString() {
256	return "NbIO@" + System.identityHashCode(this) + " " + getName();	256	return "NbIO@" + System.identityHashCode(this) + " " + getName();
257	}	257	}
Lines 296-302 Link Here
296	private StringBuffer buffer() {	296	private StringBuffer buffer() {
297	return (StringBuffer) lock;	297	return (StringBuffer) lock;
298	}	298	}
299		299
300	public void pushText (String txt) {	300	public void pushText (String txt) {
301	if (Controller.LOG) Controller.log (NbIO.this + ": Input text: " + txt);	301	if (Controller.LOG) Controller.log (NbIO.this + ": Input text: " + txt);
302	synchronized (lock) {	302	synchronized (lock) {
Lines 304-310 Link Here
304	lock.notifyAll();	304	lock.notifyAll();
305	}	305	}
306	}	306	}
307		307
308	private boolean inputClosed = false;	308	private boolean inputClosed = false;
309	public void eof() {	309	public void eof() {
310	synchronized (lock) {	310	synchronized (lock) {
Lines 315-321 Link Here
315	}	315	}
316	}	316	}
317	}	317	}
318		318
319	private void checkPristine() throws IOException {	319	private void checkPristine() throws IOException {
320	if (SwingUtilities.isEventDispatchThread()) {	320	if (SwingUtilities.isEventDispatchThread()) {
321	throw new IOException ("Cannot call read() from the event thread, it will deadlock");	321	throw new IOException ("Cannot call read() from the event thread, it will deadlock");
Lines 325-331 Link Here
325	pristine = false;	325	pristine = false;
326	}	326	}
327	}	327	}
328		328
329	public int read(char cbuf[], int off, int len) throws IOException {	329	public int read(char cbuf[], int off, int len) throws IOException {
330	if (Controller.LOG) Controller.log (NbIO.this + ":Input read: " + off + " len " + len);	330	if (Controller.LOG) Controller.log (NbIO.this + ":Input read: " + off + " len " + len);
331	checkPristine();	331	checkPristine();
Lines 348-354 Link Here
348	return realLen;	348	return realLen;
349	}	349	}
350	}	350	}
351		351
352	@Override	352	@Override
353	public int read() throws IOException {	353	public int read() throws IOException {
354	if (Controller.LOG) Controller.log (NbIO.this + ": Input read one char");	354	if (Controller.LOG) Controller.log (NbIO.this + ": Input read one char");
Lines 382-388 Link Here
382	return buffer().length() > 0;	382	return buffer().length() > 0;
383	}	383	}
384	}	384	}
385		385
386	@Override	386	@Override
387	public long skip(long n) throws IOException {	387	public long skip(long n) throws IOException {
388	if (Controller.LOG) Controller.log (NbIO.this + ": Input skip " + n);	388	if (Controller.LOG) Controller.log (NbIO.this + ": Input skip " + n);
Lines 415-421 Link Here
415	lock.notifyAll();	415	lock.notifyAll();
416	}	416	}
417	}	417	}
418		418
419	public boolean isClosed() {	419	public boolean isClosed() {
420	return inputClosed;	420	return inputClosed;
421	}	421	}
Lines 430-436 Link Here
430	}	430	}
431		431
432	Color getColor(IOColors.OutputType type) {	432	Color getColor(IOColors.OutputType type) {
433	return ioColors != null ? ioColors.getColor(type) : AbstractLines.DEF_COLORS[type.ordinal()];	433	return ioColors != null ? ioColors.getColor(type) : AbstractLines.getDefColors()[type.ordinal()];
434	}	434	}
435		435
436	private class IOTabImpl extends IOTab {	436	private class IOTabImpl extends IOTab {
Lines 521-527 Link Here
521		521
522	@Override	522	@Override
523	protected Color getColor(OutputType type) {	523	protected Color getColor(OutputType type) {
524	return clrs[type.ordinal()] != null ? clrs[type.ordinal()] : AbstractLines.DEF_COLORS[type.ordinal()];	524	return clrs[type.ordinal()] != null ? clrs[type.ordinal()] : AbstractLines.getDefColors()[type.ordinal()];
525	}	525	}
526		526
527	@Override	527	@Override

Lines 49-54 Link Here

(-)a/o.n.swing.plaf/apichanges.xml (+25 lines)
49	<apidef name="plaf">Look And Feel Customization</apidef>	49	<apidef name="plaf">Look And Feel Customization</apidef>
50	</apidefs>	50	</apidefs>
51	<changes>	51	<changes>
		52	<change id="lfcustoms-color-functions">
		53	<api name="plaf"/>
		54	<summary>New functions for getting foreground text color and color shifting</summary>
		55	<version major="1" minor="27"/>
		56	<date day="14" month="6" year="2012"/>
		57	<author login="wbrana"/>
		58	<compatibility
		59	addition="yes"
		60	binary="compatible" deletion="no" deprecation="no"
		61	modification="no" semantic="compatible" source="compatible"
		62	/>
		63	<description>
		64	<p>
		65	new functions:<br/>
		66	<code>
		67	static String getHexString(int color)<br/>
		68	static String getTextFgColorHTML()<br/>
		69	static Color getTextFgColor()<br/>
		70	static Color shiftColor(Color color)<br/>
		71	static Color getForeground(AttributeSet a)<br/>
		72	</code>
		73	</p>
		74	</description>
		75	<class package="org.netbeans.swing.plaf" name="LFCustoms"/>
		76	</change>
52	<change id="branding.of.lfcustoms">	77	<change id="branding.of.lfcustoms">
53	<api name="plaf"/>	78	<api name="plaf"/>
54	<summary>It is now possible to customize application-specific UIManager keys and values.</summary>	79	<summary>It is now possible to customize application-specific UIManager keys and values.</summary>