Attachment #133687 for bug #228870

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

Lines 150-156 Link Here

(-)a/beans/nbproject/project.xml (-1 / +1 lines)
150	<build-prerequisite/>	150	<build-prerequisite/>
151	<compile-dependency/>	151	<compile-dependency/>
152	<run-dependency>	152	<run-dependency>
153	<specification-version>0.95</specification-version>	153	<specification-version>0.122</specification-version>
154	</run-dependency>	154	</run-dependency>
155	</dependency>	155	</dependency>
156	<dependency>	156	<dependency>




import javax.swing.text.StyledDocument;
import org.netbeans.api.editor.guards.GuardedSection;
import org.netbeans.api.editor.guards.GuardedSectionManager;
import org.netbeans.api.java.source.CodeStyle;
import org.netbeans.api.java.source.CompilationController;
import org.netbeans.api.java.source.CompilationInfo;
import org.netbeans.api.java.source.JavaSource;

import org.netbeans.api.java.source.TreeUtilities;
import org.netbeans.api.java.source.WorkingCopy;
import org.netbeans.editor.GuardedException;
import org.netbeans.editor.Utilities;
import org.netbeans.modules.editor.indent.api.Reformat;
import org.netbeans.spi.editor.codegen.CodeGenerator;
import org.openide.DialogDescriptor;


    public void perform(FileObject file, JTextComponent pane) {
        JButton ok = new JButton(NbBundle.getMessage(AddPropertyCodeGenerator.class, "LBL_ButtonOK"));
        CodeStyle cs = CodeStyle.getDefault(pane.getDocument());
        if(cs == null) {
            cs = CodeStyle.getDefault(file);
        }
        final AddPropertyPanel addPropertyPanel = new AddPropertyPanel(file, className, cs, existingFields, pcsName, vcsName, ok);
        String caption = NbBundle.getMessage(AddPropertyCodeGenerator.class, "CAP_AddProperty");
        String cancel = NbBundle.getMessage(AddPropertyCodeGenerator.class, "LBL_ButtonCancel");
        DialogDescriptor dd = new DialogDescriptor(addPropertyPanel,caption, true, new Object[] {ok,cancel}, ok, DialogDescriptor.DEFAULT_ALIGN, null, null);
        if (DialogDisplayer.getDefault().notify(dd) == ok) {
            insertCode2(file, pane, addPropertyPanel.getAddPropertyConfig(), cs);
        }
    }


     * @see <a href=http://www.netbeans.org/issues/show_bug.cgi?id=162853>162853</a>
     * @see <a href=http://www.netbeans.org/issues/show_bug.cgi?id=162630>162630</a>
     */
    static void insertCode2(final FileObject file, final JTextComponent pane, final AddPropertyConfig config, CodeStyle cs) {
            final Document doc = pane.getDocument();
            final Reformat r = Reformat.get(pane.getDocument());
            final String code = new AddPropertyGenerator().generate(config, cs);
            final Position[] bounds = new Position[2];
            
            final int offset[] = new int[1];

Lines 50-55 Link Here

(-)a/beans/src/org/netbeans/modules/beans/addproperty/AddPropertyGenerator.java (-21 / +24 lines)
50	import javax.script.ScriptEngine;	50	import javax.script.ScriptEngine;
51	import javax.script.ScriptEngineManager;	51	import javax.script.ScriptEngineManager;
52	import javax.script.ScriptException;	52	import javax.script.ScriptException;
		53	import org.netbeans.api.java.source.CodeStyle;
		54	import org.netbeans.api.java.source.CodeStyleUtils;
53	import org.openide.filesystems.FileObject;	55	import org.openide.filesystems.FileObject;
54	import org.openide.filesystems.FileUtil;	56	import org.openide.filesystems.FileUtil;
55	import org.openide.util.Exceptions;	57	import org.openide.util.Exceptions;
Lines 60-74 Link Here
60	*/	62	*/
61	public class AddPropertyGenerator {	63	public class AddPropertyGenerator {
62		64
63	public String generate(AddPropertyConfig addPropertyConfig) {	65	public String generate(AddPropertyConfig addPropertyConfig, CodeStyle cs) {
64	ScriptEngine scriptEngine = getScriptEngine();	66	ScriptEngine scriptEngine = getScriptEngine();
65	if (scriptEngine != null) {	67	if (scriptEngine != null) {
66	FileObject template = getTemplateFileObject(addPropertyConfig.getTEMPLATE_PATH());	68	FileObject template = getTemplateFileObject(addPropertyConfig.getTEMPLATE_PATH());
67	if (template != null && template.isValid()) {	69	if (template != null && template.isValid()) {
68	final String type = addPropertyConfig.getType().trim();	70	final String type = addPropertyConfig.getType().trim();
69	final String name = addPropertyConfig.getName().trim();	71	final String name = addPropertyConfig.getName().trim();
		72	final String fieldName = CodeStyleUtils.addPrefixSuffix(name,
		73	addPropertyConfig.isStatic() ? cs.getStaticFieldNamePrefix() : cs.getFieldNamePrefix(),
		74	addPropertyConfig.isStatic() ? cs.getStaticFieldNameSuffix() : cs.getFieldNameSuffix());
		75	final String paramName = CodeStyleUtils.addPrefixSuffix(name,
		76	cs.getParameterNamePrefix(),
		77	cs.getParameterNameSuffix());
		78	final String paramIndex = CodeStyleUtils.addPrefixSuffix("index", //NOI18N
		79	cs.getParameterNamePrefix(),
		80	cs.getParameterNameSuffix());
		81	final String propName = CodeStyleUtils.addPrefixSuffix(
		82	addPropertyConfig.getPopName().trim(),
		83	cs.getStaticFieldNamePrefix(),
		84	cs.getStaticFieldNameSuffix());
70	final String initializer = addPropertyConfig.getInitializer().trim();	85	final String initializer = addPropertyConfig.getInitializer().trim();
71	String access = "";	86	String access;
72	switch (addPropertyConfig.getAccess()) {	87	switch (addPropertyConfig.getAccess()) {
73	case PRIVATE:	88	case PRIVATE:
74	access = "private "; // NOI18N	89	access = "private "; // NOI18N
Lines 93-100 Link Here
93	scriptContext.setAttribute("type", type, ScriptContext.ENGINE_SCOPE); // NOI18N	108	scriptContext.setAttribute("type", type, ScriptContext.ENGINE_SCOPE); // NOI18N
94	scriptContext.setAttribute("className", addPropertyConfig.getClassName(), ScriptContext.ENGINE_SCOPE); // NOI18N	109	scriptContext.setAttribute("className", addPropertyConfig.getClassName(), ScriptContext.ENGINE_SCOPE); // NOI18N
95	scriptContext.setAttribute("name", name, ScriptContext.ENGINE_SCOPE); // NOI18N	110	scriptContext.setAttribute("name", name, ScriptContext.ENGINE_SCOPE); // NOI18N
		111	scriptContext.setAttribute("fieldName", fieldName, ScriptContext.ENGINE_SCOPE); // NOI18N
		112	scriptContext.setAttribute("paramName", paramName, ScriptContext.ENGINE_SCOPE); // NOI18N
		113	scriptContext.setAttribute("paramIndex", paramIndex, ScriptContext.ENGINE_SCOPE); // NOI18N
96	scriptContext.setAttribute("initializer", initializer, ScriptContext.ENGINE_SCOPE); // NOI18N	114	scriptContext.setAttribute("initializer", initializer, ScriptContext.ENGINE_SCOPE); // NOI18N
97	scriptContext.setAttribute("capitalizedName", capitalize(name).toString(), ScriptContext.ENGINE_SCOPE); // NOI18N	115	scriptContext.setAttribute("capitalizedName", CodeStyleUtils.getCapitalizedName(name), ScriptContext.ENGINE_SCOPE); // NOI18N
		116	scriptContext.setAttribute("getterName", CodeStyleUtils.computeGetterName(fieldName, type.equalsIgnoreCase("boolean"), addPropertyConfig.isStatic(), cs), ScriptContext.ENGINE_SCOPE); // NOI18N
		117	scriptContext.setAttribute("setterName", CodeStyleUtils.computeSetterName(fieldName, addPropertyConfig.isStatic(), cs), ScriptContext.ENGINE_SCOPE); // NOI18N
98	scriptContext.setAttribute("static", Boolean.valueOf(addPropertyConfig.isStatic()), ScriptContext.ENGINE_SCOPE); // NOI18N	118	scriptContext.setAttribute("static", Boolean.valueOf(addPropertyConfig.isStatic()), ScriptContext.ENGINE_SCOPE); // NOI18N
99	scriptContext.setAttribute("final", Boolean.valueOf(addPropertyConfig.isFinale()), ScriptContext.ENGINE_SCOPE); // NOI18N	119	scriptContext.setAttribute("final", Boolean.valueOf(addPropertyConfig.isFinale()), ScriptContext.ENGINE_SCOPE); // NOI18N
100	AddPropertyConfig.GENERATE generateGetterSetter = addPropertyConfig.getGenerateGetterSetter();	120	AddPropertyConfig.GENERATE generateGetterSetter = addPropertyConfig.getGenerateGetterSetter();
Lines 106-112 Link Here
106	ScriptContext.ENGINE_SCOPE);	126	ScriptContext.ENGINE_SCOPE);
107	scriptContext.setAttribute("generateJavadoc", Boolean.valueOf(addPropertyConfig.isGenerateJavadoc()), ScriptContext.ENGINE_SCOPE); // NOI18N	127	scriptContext.setAttribute("generateJavadoc", Boolean.valueOf(addPropertyConfig.isGenerateJavadoc()), ScriptContext.ENGINE_SCOPE); // NOI18N
108	scriptContext.setAttribute("bound", Boolean.valueOf(addPropertyConfig.isBound()), ScriptContext.ENGINE_SCOPE); // NOI18N	128	scriptContext.setAttribute("bound", Boolean.valueOf(addPropertyConfig.isBound()), ScriptContext.ENGINE_SCOPE); // NOI18N
109	scriptContext.setAttribute("PROP_NAME", addPropertyConfig.getPopName().trim(), ScriptContext.ENGINE_SCOPE); // NOI18N	129	scriptContext.setAttribute("PROP_NAME", propName, ScriptContext.ENGINE_SCOPE); // NOI18N
110	scriptContext.setAttribute("vetoable", Boolean.valueOf(addPropertyConfig.isVetoable()), ScriptContext.ENGINE_SCOPE); // NOI18N	130	scriptContext.setAttribute("vetoable", Boolean.valueOf(addPropertyConfig.isVetoable()), ScriptContext.ENGINE_SCOPE); // NOI18N
111	scriptContext.setAttribute("indexed", Boolean.valueOf(addPropertyConfig.isIndexed()), ScriptContext.ENGINE_SCOPE); // NOI18N	131	scriptContext.setAttribute("indexed", Boolean.valueOf(addPropertyConfig.isIndexed()), ScriptContext.ENGINE_SCOPE); // NOI18N
112	scriptContext.setAttribute("propertyChangeSupport", addPropertyConfig.getPropertyChangeSupportName(), ScriptContext.ENGINE_SCOPE); // NOI18N	132	scriptContext.setAttribute("propertyChangeSupport", addPropertyConfig.getPropertyChangeSupportName(), ScriptContext.ENGINE_SCOPE); // NOI18N
Lines 153-173 Link Here
153	private static ScriptEngine getScriptEngine() {	173	private static ScriptEngine getScriptEngine() {
154	return new ScriptEngineManager().getEngineByName("freemarker"); // NOI18N	174	return new ScriptEngineManager().getEngineByName("freemarker"); // NOI18N
155	}	175	}
156
157	private static StringBuilder capitalize(String string) {
158	StringBuilder sb = new StringBuilder(string);
159	while (sb.length() > 1 && sb.charAt(0) == '_') { //NOI18N
160	sb.deleteCharAt(0);
161	}
162
163	//Beans naming convention, #165241
164	if (sb.length() > 1 && Character.isUpperCase(sb.charAt(1))) {
165	return sb;
166	}
167
168	if (sb.length() > 0) {
169	sb.setCharAt(0, Character.toUpperCase(sb.charAt(0)));
170	}
171	return sb;
172	}
173	}	176	}

Lines 1-4 Link Here

(-)a/beans/src/org/netbeans/modules/beans/addproperty/AddPropertyPanel.form (-1 / +1 lines)
1	<?xml version="1.1" encoding="UTF-8" ?>	1	<?xml version="1.0" encoding="UTF-8" ?>
2		2
3	<Form version="1.5" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">	3	<Form version="1.5" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
4	<NonVisualComponents>	4	<NonVisualComponents>




import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import org.netbeans.api.java.source.ClasspathInfo;
import org.netbeans.api.java.source.CodeStyle;
import org.netbeans.api.java.source.ElementHandle;
import org.netbeans.api.java.source.ui.TypeElementFinder;
import org.openide.filesystems.FileObject;

    private DocumentListener propNameTextFieldDocumentListener;
    private FileObject file;
    private String className;
    private final CodeStyle cs;
    private List<String> existingFields;
    private String[] pcsName;
    private String[] vcsName;
    private JButton okButton;
    
    public AddPropertyPanel(FileObject file, String className, CodeStyle cs, List<String> existingFields, String[] pcsName, String[] vcsName, JButton okButton) {
        this.file = file;
        this.className = className;
        this.cs = cs;
        this.existingFields = existingFields;
        this.pcsName = pcsName;
        this.vcsName = vcsName;

            }
        }
        
        final String previewTemplate = new AddPropertyGenerator().generate(getAddPropertyConfig(), cs);
        previewEditorPane.setText(previewTemplate);
        
        String error = resolveError();




    <#assign vetoableChangeSupport="vetoableChangeSupport">
</#if>

    ${access}<#if static >static </#if><#if final >final </#if>${type}<#if indexed >[]</#if> ${fieldName}<#if final > = ${initializer}<#else><#if initializer != "" > = ${initializer}</#if></#if>;
<#if bound >

    public static final String ${PROP_NAME} = "${name}";

     * @return the value of ${name}
     */
</#if>
    public <#if static >static </#if>${type}<#if indexed >[]</#if> ${getterName}() {
        return ${fieldName};
    }
</#if>
<#if generateSetter >

    /**
     * Set the value of ${name}
     *
     * @param ${paramName} new value of ${name}
<#if vetoable>
     * @throws java.beans.PropertyVetoException
</#if>
     */
</#if>
    public <#if static >static </#if>void ${setterName}(${type}<#if indexed >[]</#if> ${paramName})<#if vetoable> throws java.beans.PropertyVetoException</#if> {
<#if bound >
        ${type}<#if indexed >[]</#if> old${capitalizedName} = this.${fieldName};
<#if vetoable> 
        ${vetoableChangeSupport}.fireVetoableChange(${PROP_NAME}, old${capitalizedName}, ${paramName});
</#if>
</#if>
        <#if static >${className}.<#else>this.</#if>${fieldName} = ${paramName};
<#if bound >
        ${propertyChangeSupport}.firePropertyChange(${PROP_NAME}, old${capitalizedName}, ${paramName});
</#if>
    }
</#if>

    /**
     * Get the value of ${name} at specified index
     *
     * @param ${paramIndex} the index of ${name}
     * @return the value of ${name} at specified index
     */
</#if>
    public <#if static >static </#if>${type} ${getterName}(int ${paramIndex}) {
        return <#if !static >this.</#if>${fieldName}[${paramIndex}];
    }
</#if>
<#if generateSetter >

    /**
     * Set the value of ${name} at specified index.
     *
     * @param ${paramIndex} the index of ${name}
     * @param ${paramName} new value of ${name} at specified index
<#if vetoable>
     * @throws java.beans.PropertyVetoException
</#if>
     */
</#if>
    public <#if static >static </#if>void ${setterName}(int ${paramIndex}, ${type} ${paramName})<#if vetoable> throws java.beans.PropertyVetoException</#if> {
<#if bound >
        ${type} old${capitalizedName} = this.${fieldName}[${paramIndex}];
<#if vetoable> 
        ${vetoableChangeSupport}.fireVetoableChange(${PROP_NAME}, old${capitalizedName}, ${paramName});
</#if>
</#if>
        <#if !static >this.</#if>${fieldName}[${paramIndex}] = ${paramName};
<#if bound >
        ${propertyChangeSupport}.fireIndexedPropertyChange(${PROP_NAME}, ${paramIndex}, old${capitalizedName}, ${paramName});
</#if>
    }
</#if>

Lines 231-237 Link Here

(-)a/java.editor/nbproject/project.xml (-1 / +1 lines)
231	<build-prerequisite/>	231	<build-prerequisite/>
232	<compile-dependency/>	232	<compile-dependency/>
233	<run-dependency>	233	<run-dependency>
234	<specification-version>0.121</specification-version>	234	<specification-version>0.122</specification-version>
235	</run-dependency>	235	</run-dependency>
236	</dependency>	236	</dependency>
237	<dependency>	237	<dependency>

Lines 868-874 Link Here

(-)a/java.editor/src/org/netbeans/modules/editor/java/JavaCodeTemplateProcessor.java (-1 / +1 lines)
868	};	868	};
869	}	869	}
870	};	870	};
871	Iterator<String> names = Utilities.varNamesSuggestions(type, suggestedName, null, cInfo.getTypes(), cInfo.getElements(), loc, isConst).iterator();	871	Iterator<String> names = Utilities.varNamesSuggestions(type, suggestedName, null, cInfo.getTypes(), cInfo.getElements(), loc, isConst, null, null, null).iterator();
872	if (names.hasNext())	872	if (names.hasNext())
873	return names.next();	873	return names.next();
874	}	874	}




import java.awt.Graphics;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.io.IOException;
import java.net.URL;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;

        }
    }

    public static JavaCompletionItem createGetterSetterMethodItem(CompilationInfo info, VariableElement elem, TypeMirror type, int substitutionOffset, String name, boolean setter) {
        switch (elem.getKind()) {
            case ENUM_CONSTANT:
            case FIELD:
                return new GetterSetterMethodItem(info, elem, type, substitutionOffset, name, setter);
            default:
                throw new IllegalArgumentException("kind=" + elem.getKind());
        }


        protected ElementHandle<VariableElement> elementHandle;
        private boolean setter;
        private String paramName;
        private String name;
        private String typeName;
        private String sortText;
        private String leftText;
        private String rightText;

        private GetterSetterMethodItem(CompilationInfo info, VariableElement elem, TypeMirror type, int substitutionOffset, String name, boolean setter) {
            super(substitutionOffset);
            this.elementHandle = ElementHandle.create(elem);
            this.setter = setter;
            CodeStyle cs = null;
            try {
                cs = CodeStyle.getDefault(info.getDocument());
            } catch (IOException ex) {
                this.name = (elem.asType().getKind() == TypeKind.BOOLEAN ? "is" : "get") + GeneratorUtils.getCapitalizedName(simpleName); //NOI18N
            }
            if (cs == null) {
                cs = CodeStyle.getDefault(info.getFileObject());
            }
            boolean isStatic = elem.getModifiers().contains(Modifier.STATIC);
            String simpleName = CodeStyleUtils.removePrefixSuffix(elem.getSimpleName(),
                isStatic ? cs.getStaticFieldNamePrefix() : cs.getFieldNamePrefix(),
                isStatic ? cs.getStaticFieldNameSuffix() : cs.getFieldNameSuffix());
            this.paramName = CodeStyleUtils.addPrefixSuffix(
                    simpleName,
                    cs.getParameterNamePrefix(),
                    cs.getParameterNameSuffix());
            this.name = name;
            this.typeName = Utilities.getTypeName(info, type, false).toString();
        }


                    lText.append(escape(typeName));
                    lText.append(' ');
                    lText.append(PARAMETER_NAME_COLOR);
                    lText.append(paramName);
                    lText.append(COLOR_END);
                }
                lText.append(") - "); //NOI18N

            if (setter) {
                sb.append(typeName);
                sb.append(' ');
                sb.append(paramName);
            }
            sb.append(") - "); //NOI18N
            sb.append(GENERATE_TEXT);




        
        private ElementHandle element;
        private boolean hasTask;
        private CodeStyle codeStyle;
        
        private JavaCompletionQuery(int queryType, int caretOffset, boolean hasTask) {
            this.queryType = queryType;

        @Override
        protected void prepareQuery(JTextComponent component) {
            this.component = component;
            this.codeStyle = CodeStyle.getDefault(component.getDocument());
            if (queryType == TOOLTIP_QUERY_TYPE) {
                this.toolTip = new MethodParamsTipPaintComponent(component);
            }

            }
            controller.toPhase(Phase.ELEMENTS_RESOLVED);
            boolean isConst = parent.getKind() == Tree.Kind.VARIABLE && ((VariableTree)parent).getModifiers().getFlags().containsAll(EnumSet.of(FINAL, STATIC));
            boolean preferLong = false;
            String csPrefix = null;
            String csSuffix = null;
            if(codeStyle != null) {
                preferLong = codeStyle.preferLongerNames();
                if(env.getScope().getEnclosingMethod() == null) {
                    if(exPath.getParentPath().getParentPath().getLeaf().getKind() == Tree.Kind.METHOD) {
                        csPrefix = codeStyle.getParameterNamePrefix();
                        csSuffix = codeStyle.getParameterNameSuffix();
                    } else if(((VariableTree)parent).getModifiers().getFlags().contains(STATIC)) {
                        csPrefix = codeStyle.getStaticFieldNamePrefix();
                        csSuffix = codeStyle.getStaticFieldNameSuffix();
                    } else {
                        csPrefix = codeStyle.getFieldNamePrefix();
                        csSuffix = codeStyle.getFieldNameSuffix();
                    }
                } else {
                    csPrefix = codeStyle.getLocalVarNamePrefix();
                    csSuffix = codeStyle.getLocalVarNameSuffix();
                }
            }
            if (et.getKind() == Tree.Kind.ANNOTATED_TYPE) {
                et = ((AnnotatedTypeTree)et).getUnderlyingType();
                exPath = new TreePath(exPath, et);

                                !illegalForwardRefs.contains(e);
                    }
                };
                for (String name : Utilities.varNamesSuggestions(tm, null, prefix, controller.getTypes(), controller.getElements(), controller.getElementUtilities().getLocalMembersAndVars(scope, acceptor), isConst, csPrefix, csSuffix, preferLong))
                    results.add(JavaCompletionItem.createVariableItem(env.getController(), name, anchorOffset, true, false));
                return;
            }

                                            !illegalForwardRefs.contains(e);
                                }
                            };
                            for (String name : Utilities.varNamesSuggestions(tm, null, prefix, controller.getTypes(), controller.getElements(),
                                    controller.getElementUtilities().getLocalMembersAndVars(scope, acceptor), isConst,
                                    csPrefix, csSuffix, preferLong))
                                results.add(JavaCompletionItem.createVariableItem(env.getController(), name, anchorOffset, true, false));
                        }
                        VariableElement ve = getFieldOrVar(env, e.getSimpleName().toString());

                                            !illegalForwardRefs.contains(e);
                                }
                            };
                            for (String name : Utilities.varNamesSuggestions(controller.getTypes().getDeclaredType(te), null, prefix, controller.getTypes(),
                                    controller.getElements(), controller.getElementUtilities().getLocalMembersAndVars(scope, acceptor), isConst,
                                    csPrefix, csSuffix, preferLong))
                                results.add(JavaCompletionItem.createVariableItem(env.getController(), name, anchorOffset, true, false));
                        }
                        break;

                                    !illegalForwardRefs.contains(e);
                        }
                    };
                    for (String name : Utilities.varNamesSuggestions(tm, null, prefix, controller.getTypes(), controller.getElements(), controller.getElementUtilities().getLocalMembersAndVars(scope, acceptor), isConst, csPrefix, csSuffix, preferLong))
                        results.add(JavaCompletionItem.createVariableItem(env.getController(), name, anchorOffset, true, false));
                    break;
                case ENUM_CONSTANT:

                for (VariableElement variableElement : ElementFilter.fieldsIn(members)) {
                    Name name = variableElement.getSimpleName();
                    if (!name.contentEquals(ERROR)) {
                        boolean isStatic = variableElement.getModifiers().contains(Modifier.STATIC);
                        String setterName = CodeStyleUtils.computeSetterName(name, isStatic, codeStyle);
                        String getterName = CodeStyleUtils.computeGetterName(name, variableElement.asType().getKind() == TypeKind.BOOLEAN, isStatic, codeStyle);
                        if ((prefix == null || startsWith(env, getterName)) && !GeneratorUtils.hasGetter(controller, te, variableElement, methods, codeStyle)) {
                            results.add(JavaCompletionItem.createGetterSetterMethodItem(env.getController(), variableElement, asMemberOf(variableElement, clsType, types), anchorOffset, getterName, false));
                        }
                        if ((prefix == null || startsWith(env, setterName)) && !(variableElement.getModifiers().contains(Modifier.FINAL) || GeneratorUtils.hasSetter(controller, te, variableElement, methods, codeStyle))) {
                            results.add(JavaCompletionItem.createGetterSetterMethodItem(env.getController(), variableElement, asMemberOf(variableElement, clsType, types), anchorOffset, setterName, true));
                        }
                    }
                }




import org.netbeans.api.editor.mimelookup.MimeLookup;
import org.netbeans.api.editor.settings.SimpleValueNames;
import org.netbeans.api.java.lexer.JavaTokenId;
import org.netbeans.api.java.source.CodeStyleUtils;
import org.netbeans.api.java.source.CompilationInfo;
import org.netbeans.api.java.source.ElementHandle;
import org.netbeans.api.java.source.SourceUtils;

        return refs;
    }
    
    public static List<String> varNamesSuggestions(TypeMirror type, String suggestedName, String prefix, Types types, Elements elements, Iterable<? extends Element> locals, boolean isConst, String namePrefix, String nameSuffix, Boolean preferLong) {
        List<String> result = new ArrayList<String>();
        if (type == null && suggestedName == null)
            return result;

            }
            int cnt = 1;
            String baseName = name;
            name = CodeStyleUtils.addPrefixSuffix(name, namePrefix, nameSuffix);
            while (isClashing(name, type, locals)) {
                if (isPrimitive) {
                    char c = name.charAt(namePrefix != null?namePrefix.length():0);
                    name = CodeStyleUtils.addPrefixSuffix(Character.toString(++c), namePrefix, nameSuffix);
                    if (c == 'z' || c == 'Z') //NOI18N
                        isPrimitive = false;
                } else {
                    name = CodeStyleUtils.addPrefixSuffix(baseName + cnt++, namePrefix, nameSuffix);
                }
            }
            result.add(name);





import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.java.source.CodeStyle;
import org.netbeans.api.java.source.CodeStyleUtils;
import org.netbeans.api.java.source.Comment;
import org.netbeans.api.java.source.CompilationInfo;
import org.netbeans.api.java.source.ElementUtilities;

        }
    }
    
    public static boolean hasGetter(CompilationInfo info, TypeElement typeElement, VariableElement field, Map<String, List<ExecutableElement>> methods, CodeStyle cs) {
        CharSequence name = field.getSimpleName();
        assert name.length() > 0;
        TypeMirror type = field.asType();
        boolean isStatic = field.getModifiers().contains(Modifier.STATIC);
        String getterName = CodeStyleUtils.computeGetterName(name, type.getKind() == TypeKind.BOOLEAN, isStatic, cs);
        Types types = info.getTypes();
        List<ExecutableElement> candidates = methods.get(getterName);
        if (candidates != null) {
            for (ExecutableElement candidate : candidates) {
                if ((!candidate.getModifiers().contains(Modifier.ABSTRACT) || candidate.getEnclosingElement() == typeElement)

        return false;
    }
    
    public static boolean hasSetter(CompilationInfo info, TypeElement typeElement, VariableElement field, Map<String, List<ExecutableElement>> methods, CodeStyle cs) {
        CharSequence name = field.getSimpleName();
        assert name.length() > 0;
        TypeMirror type = field.asType();
        boolean isStatic = field.getModifiers().contains(Modifier.STATIC);
        String setterName = CodeStyleUtils.computeSetterName(name, isStatic, cs);
        Types types = info.getTypes();
        List<ExecutableElement> candidates = methods.get(setterName);
        if (candidates != null) {
            for (ExecutableElement candidate : candidates) {
                if ((!candidate.getModifiers().contains(Modifier.ABSTRACT) || candidate.getEnclosingElement() == typeElement)

        }
        return ((PackageElement) e.getEnclosingElement()).getQualifiedName().toString();
    }
    
    public static StringBuilder getCapitalizedName(CharSequence cs) {
        StringBuilder sb = new StringBuilder(cs);
        while(sb.length() > 1 && sb.charAt(0) == '_') //NOI18N
            sb.deleteCharAt(0);
        
        //Beans naming convention, #165241
        if (sb.length() > 1 && Character.isUpperCase(sb.charAt(1))) {
            return sb;
        }

        if (sb.length() > 0)
            sb.setCharAt(0, Character.toUpperCase(sb.charAt(0)));
        return sb;
    }

    public static void guardedCommit(JTextComponent component, ModificationResult mr) throws IOException {
        try {




        public List<? extends CodeGenerator> create(Lookup context) {
            ArrayList<CodeGenerator> ret = new ArrayList<CodeGenerator>();
            JTextComponent component = context.lookup(JTextComponent.class);
            CodeStyle codeStyle = CodeStyle.getDefault(component.getDocument());
            CompilationController controller = context.lookup(CompilationController.class);
            TreePath path = context.lookup(TreePath.class);
            path = path != null ? Utilities.getPathElementOfKind(TreeUtilities.CLASS_TREE_KINDS, path) : null;

                if (ERROR.contentEquals(variableElement.getSimpleName()))
                    continue;
                ElementNode.Description description = ElementNode.Description.create(controller, variableElement, null, true, false);
                boolean hasGetter = GeneratorUtils.hasGetter(controller, typeElement, variableElement, methods, codeStyle);
                boolean hasSetter = variableElement.getModifiers().contains(Modifier.FINAL) || GeneratorUtils.hasSetter(controller, typeElement, variableElement, methods, codeStyle);
                if (!hasGetter) {
                    List<ElementNode.Description> descriptions = gDescriptions.get(variableElement.getEnclosingElement());
                    if (descriptions == null) {

                for (Map.Entry<Element, List<ElementNode.Description>> entry : gDescriptions.entrySet())
                    descriptions.add(ElementNode.Description.create(controller, entry.getKey(), entry.getValue(), false, false));
                Collections.reverse(descriptions);
                ret.add(new GetterSetterGenerator(component, ElementNode.Description.create(controller, typeElement, descriptions, false, false), GeneratorUtils.GETTERS_ONLY, codeStyle));
            }
            if (!sDescriptions.isEmpty()) {
                List<ElementNode.Description> descriptions = new ArrayList<ElementNode.Description>();
                for (Map.Entry<Element, List<ElementNode.Description>> entry : sDescriptions.entrySet())
                    descriptions.add(ElementNode.Description.create(controller, entry.getKey(), entry.getValue(), false, false));
                Collections.reverse(descriptions);
                ret.add(new GetterSetterGenerator(component, ElementNode.Description.create(controller, typeElement, descriptions, false, false), GeneratorUtils.SETTERS_ONLY, codeStyle));
            }
            if (!gsDescriptions.isEmpty()) {
                List<ElementNode.Description> descriptions = new ArrayList<ElementNode.Description>();
                for (Map.Entry<Element, List<ElementNode.Description>> entry : gsDescriptions.entrySet())
                    descriptions.add(ElementNode.Description.create(controller, entry.getKey(), entry.getValue(), false, false));
                Collections.reverse(descriptions);
                ret.add(new GetterSetterGenerator(component, ElementNode.Description.create(controller, typeElement, descriptions, false, false), 0, codeStyle));
            }
            return ret;
        }

    private JTextComponent component;
    private ElementNode.Description description;
    private int type;
    private CodeStyle codestyle;

    /** Creates a new instance of GetterSetterGenerator */
    private GetterSetterGenerator(JTextComponent component, ElementNode.Description description, int type, CodeStyle codeStyle) {
        this.component = component;
        this.description = description;
        this.type = type;
        this.codestyle = codeStyle;
    }

    public String getDisplayName() {


                @Override
                public void run(CompilationController parameter) throws Exception {
                    createGetterSetterLists(parameter, variables, getters, setters, codestyle);
                }
            }, true);
            


    }
        
    private void createGetterSetterLists(CompilationController cc, List<ElementHandle<? extends Element>> variables, List<String> getters, List<String> setters, CodeStyle codestyle) {
        for (ElementHandle handle:variables) {
            final Element el = handle.resolve(cc);
            boolean isStatic = el.getModifiers().contains(Modifier.STATIC);
            if (type!=GeneratorUtils.GETTERS_ONLY)
                setters.add(CodeStyleUtils.computeSetterName(el.getSimpleName(), isStatic, codestyle));
            else 
                setters.add(null);
            if (type!=GeneratorUtils.SETTERS_ONLY)
                getters.add(CodeStyleUtils.computeGetterName(el.getSimpleName(), el.asType().getKind() == TypeKind.BOOLEAN, isStatic, codestyle));
            else
                getters.add(null);
        }




import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;

import javax.lang.model.element.Modifier;
import javax.lang.model.element.Name;
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.VariableElement;
import javax.lang.model.util.ElementFilter;
import javax.lang.model.util.ElementScanner6;
import javax.swing.Action;

import org.netbeans.api.editor.settings.FontColorSettings;
import org.netbeans.api.java.lexer.JavaTokenId;
import org.netbeans.api.java.lexer.JavadocTokenId;
import org.netbeans.api.java.source.CodeStyle;
import org.netbeans.api.java.source.CompilationInfo;
import org.netbeans.api.java.source.ElementUtilities;
import org.netbeans.api.java.source.JavaSource;

import org.netbeans.modules.editor.java.ComputeOffAWT;
import org.netbeans.modules.editor.java.ComputeOffAWT.Worker;
import org.netbeans.modules.editor.java.JavaKit;
import org.netbeans.modules.java.editor.codegen.GeneratorUtils;
import org.netbeans.modules.java.editor.javadoc.JavadocImports;
import org.netbeans.modules.java.editor.semantic.FindLocalUsagesQuery;
import org.netbeans.modules.refactoring.api.AbstractRefactoring;

            el = el.getEnclosingElement();
        }
        
        if (allowInstantRename(info, el, info.getElementUtilities())) {
            final Set<Token> points = new HashSet<Token>(new FindLocalUsagesQuery(true).findUsages(el, info, doc));
            
            if (el.getKind().isClass()) {

        return result;
    }

    private static boolean allowInstantRename(CompilationInfo info, Element e, ElementUtilities eu) {
        if(e.getKind() == ElementKind.FIELD) {
            VariableElement variableElement = (VariableElement) e;
            TypeElement typeElement = eu.enclosingTypeElement(e);
            Map<String, List<ExecutableElement>> methods = new HashMap<String, List<ExecutableElement>>();
            for (ExecutableElement method : ElementFilter.methodsIn(info.getElements().getAllMembers(typeElement))) {
                List<ExecutableElement> l = methods.get(method.getSimpleName().toString());
                if (l == null) {
                    l = new ArrayList<ExecutableElement>();
                    methods.put(method.getSimpleName().toString(), l);
                }
                l.add(method);
            }
            
            boolean isProperty = false;
            try {
                CodeStyle codeStyle = CodeStyle.getDefault(info.getDocument());
                isProperty = GeneratorUtils.hasGetter(info, typeElement, variableElement, methods, codeStyle);
                isProperty = isProperty || (!variableElement.getModifiers().contains(Modifier.FINAL) &&
                                    GeneratorUtils.hasSetter(info, typeElement, variableElement, methods, codeStyle));
            } catch (IOException ex) {
            }
            if(isProperty) {
                return false;
            }
        }
        if (org.netbeans.modules.java.editor.semantic.Utilities.isPrivateElement(e)) {
            return true;
        }

Lines 155-160 Link Here

(-)a/java.hints/src/org/netbeans/modules/java/hints/errors/Utilities.java (-9 / +28 lines)
155	}	155	}
156		156
157	public static String guessName(CompilationInfo info, TreePath tp, TreePath scope) {	157	public static String guessName(CompilationInfo info, TreePath tp, TreePath scope) {
		158	return guessName(info, tp, scope, null, null);
		159	}
		160
		161	public static String guessName(CompilationInfo info, TreePath tp, TreePath scope, String prefix, String suffix) {
158	String name = getName(tp.getLeaf());	162	String name = getName(tp.getLeaf());
159		163
160	if (name == null) {	164	if (name == null) {
Lines 163-178 Link Here
163		167
164	Scope s = info.getTrees().getScope(scope);	168	Scope s = info.getTrees().getScope(scope);
165		169
166	return makeNameUnique(info, s, name);	170	return makeNameUnique(info, s, name, prefix, suffix);
167	}	171	}
168		172
169	public static String makeNameUnique(CompilationInfo info, Scope s, String name) {	173	public static String makeNameUnique(CompilationInfo info, Scope s, String name, String prefix, String suffix) {
		174	if(prefix != null && prefix.length() > 0) {
		175	if(Character.isAlphabetic(prefix.charAt(prefix.length()-1))) {
		176	StringBuilder nameSb = new StringBuilder(name);
		177	nameSb.setCharAt(0, Character.toUpperCase(nameSb.charAt(0)));
		178	name = nameSb.toString();
		179	}
		180	}
		181
		182	boolean cont;
		183	String proposedName;
170	int counter = 0;	184	int counter = 0;
171	boolean cont = true;	185	do {
172	String proposedName = name;	186	proposedName = safeString(prefix) + name + (counter != 0 ? String.valueOf(counter) : "") + safeString(suffix);
173
174	while (cont) {
175	proposedName = name + (counter != 0 ? String.valueOf(counter) : "");
176		187
177	cont = false;	188	cont = false;
178		189
Lines 183-192 Link Here
183	break;	194	break;
184	}	195	}
185	}	196	}
186	}	197	} while(cont);
187		198
188	return proposedName;	199	return proposedName;
189	}	200	}
		201
		202	private static String safeString(String str) {
		203	return str == null ? "" : str;
		204	}
		205
		206	public static String makeNameUnique(CompilationInfo info, Scope s, String name) {
		207	return makeNameUnique(info, s, name, null, null);
		208	}
190		209
191	private static String guessLiteralName(String str) {	210	private static String guessLiteralName(String str) {
192	if(str.isEmpty())	211	if(str.isEmpty())

Lines 116-121 Link Here

(-)a/java.hints/src/org/netbeans/modules/java/hints/introduce/IntroduceHint.java (-3 / +8 lines)
116	import org.netbeans.api.editor.settings.AttributesUtilities;	116	import org.netbeans.api.editor.settings.AttributesUtilities;
117	import org.netbeans.api.java.lexer.JavaTokenId;	117	import org.netbeans.api.java.lexer.JavaTokenId;
118	import org.netbeans.api.java.source.CancellableTask;	118	import org.netbeans.api.java.source.CancellableTask;
		119	import org.netbeans.api.java.source.CodeStyle;
119	import org.netbeans.api.java.source.Task;	120	import org.netbeans.api.java.source.Task;
120	import org.netbeans.api.java.source.CompilationInfo;	121	import org.netbeans.api.java.source.CompilationInfo;
121	import org.netbeans.api.java.source.GeneratorUtilities;	122	import org.netbeans.api.java.source.GeneratorUtilities;
Lines 443-450 Link Here
443	String guessedName = Utilities.getName(resolved.getLeaf());	444	String guessedName = Utilities.getName(resolved.getLeaf());
444	if (guessedName == null) guessedName = "name";	445	if (guessedName == null) guessedName = "name";
445	Scope s = info.getTrees().getScope(resolved);	446	Scope s = info.getTrees().getScope(resolved);
446	Fix variable = isVariable ? new IntroduceFix(h, info.getJavaSource(), variableRewrite ? guessedName : Utilities.makeNameUnique(info, s, guessedName), duplicatesForVariable.size() + 1, IntroduceKind.CREATE_VARIABLE) : null;	447	CodeStyle cs = CodeStyle.getDefault(info.getFileObject());
447	Fix constant = isConstant ? new IntroduceFix(h, info.getJavaSource(), variableRewrite ? guessedName : Utilities.makeNameUnique(info, info.getTrees().getScope(constantTarget), Utilities.toConstantName(guessedName)), duplicatesForConstant.size() + 1, IntroduceKind.CREATE_CONSTANT) : null;	448	Fix variable = isVariable ? new IntroduceFix(h, info.getJavaSource(), variableRewrite ? guessedName : Utilities.makeNameUnique(info, s, guessedName, cs.getLocalVarNamePrefix(), cs.getLocalVarNameSuffix()), duplicatesForVariable.size() + 1, IntroduceKind.CREATE_VARIABLE) : null;
		449	Fix constant = isConstant ? new IntroduceFix(h, info.getJavaSource(), variableRewrite ? guessedName : Utilities.makeNameUnique(info, info.getTrees().getScope(constantTarget), Utilities.toConstantName(guessedName), cs.getStaticFieldNamePrefix(), cs.getStaticFieldNameSuffix()), duplicatesForConstant.size() + 1, IntroduceKind.CREATE_CONSTANT) : null;
448	Fix parameter = isVariable ? new IntroduceParameterFix(h) : null;	450	Fix parameter = isVariable ? new IntroduceParameterFix(h) : null;
449	Fix field = null;	451	Fix field = null;
450	Fix methodFix = null;	452	Fix methodFix = null;
Lines 466-472 Link Here
466		468
467	if (resolved.getLeaf().getKind() == Kind.VARIABLE) {	469	if (resolved.getLeaf().getKind() == Kind.VARIABLE) {
468	//the variable name would incorrectly clash with itself:	470	//the variable name would incorrectly clash with itself:
469	guessedName = Utilities.guessName(info, resolved, resolved.getParentPath());	471	guessedName = Utilities.guessName(info, resolved, resolved.getParentPath(), cs.getFieldNamePrefix(), cs.getFieldNameSuffix());
		472	} else if (!variableRewrite) {
		473	guessedName = Utilities.makeNameUnique(info, info.getTrees().getScope(constantTarget),
		474	guessedName, cs.getFieldNamePrefix(), cs.getFieldNameSuffix());
470	}	475	}
471		476
472	field = new IntroduceFieldFix(h, info.getJavaSource(), guessedName, duplicatesForConstant.size() + 1, initilizeIn, statik, allowFinalInCurrentMethod);	477	field = new IntroduceFieldFix(h, info.getJavaSource(), guessedName, duplicatesForConstant.size() + 1, initilizeIn, statik, allowFinalInCurrentMethod);

Lines 56-61 Link Here

(-)a/java.hints/test/unit/src/org/netbeans/modules/java/hints/introduce/IntroduceHintTest.java (-1 / +2 lines)
56	import javax.lang.model.element.Modifier;	56	import javax.lang.model.element.Modifier;
57	import javax.swing.text.Document;	57	import javax.swing.text.Document;
58	import org.netbeans.api.java.lexer.JavaTokenId;	58	import org.netbeans.api.java.lexer.JavaTokenId;
		59	import org.netbeans.api.java.source.CodeStyle;
59	import org.netbeans.api.java.source.CompilationInfo;	60	import org.netbeans.api.java.source.CompilationInfo;
60	import org.netbeans.api.java.source.JavaSource;	61	import org.netbeans.api.java.source.JavaSource;
61	import org.netbeans.api.java.source.JavaSource.Phase;	62	import org.netbeans.api.java.source.JavaSource.Phase;
Lines 666-672 Link Here
666	.<Modifier>of(Modifier.PRIVATE), false, true),	667	.<Modifier>of(Modifier.PRIVATE), false, true),
667	5, 2);	668	5, 2);
668	}	669	}
669		670
670	public void testFix21() throws Exception {	671	public void testFix21() throws Exception {
671	performFixTest("package test; import java.util.List; public class Test {public void test1() {List<? extends CharSequence> l = \|test()\|;} public List<? extends CharSequence> test() {return null;}}",	672	performFixTest("package test; import java.util.List; public class Test {public void test1() {List<? extends CharSequence> l = \|test()\|;} public List<? extends CharSequence> test() {return null;}}",
672	"package test; import java.util.List; public class Test { private List<? extends CharSequence> name; public void test1() {name = test(); List<? extends CharSequence> l = name;} public List<? extends CharSequence> test() {return null;}}",	673	"package test; import java.util.List; public class Test { private List<? extends CharSequence> name; public void test1() {name = test(); List<? extends CharSequence> l = name;} public List<? extends CharSequence> test() {return null;}}",




import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.Reader;
import java.io.Writer;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Arrays;

    public MethodTree createConstructor(ClassTree clazz, Iterable<? extends VariableTree> fields) {
        assert clazz != null && fields != null;
        TreeMaker make = copy.getTreeMaker();
        CodeStyle cs = DiffContext.getCodeStyle(copy);
        Set<Modifier> mods = EnumSet.of(copy.getTreeUtilities().isEnum(clazz) ? Modifier.PRIVATE : Modifier.PUBLIC);
        List<VariableTree> parameters = new ArrayList<VariableTree>();
        List<StatementTree> statements = new ArrayList<StatementTree>();
        ModifiersTree parameterModifiers = make.Modifiers(EnumSet.noneOf(Modifier.class));
        for (VariableTree vt : fields) {
            String paramName = addParamPrefixSuffix(removeFieldPrefixSuffix(vt, cs), cs);
            parameters.add(make.Variable(parameterModifiers, paramName, vt.getType(), null));
            statements.add(make.ExpressionStatement(make.Assignment(make.MemberSelect(make.Identifier("this"), vt.getName()), make.Identifier(paramName)))); //NOI18N
        }
        BlockTree body = make.Block(statements, false);
        return make.Method(make.Modifiers(mods), "<init>", null, Collections.<TypeParameterTree> emptyList(), parameters, Collections.<ExpressionTree>emptyList(), body, null); //NOI18N

    public MethodTree createGetter(TypeElement clazz, VariableElement field) {
        assert clazz != null && field != null;
        TreeMaker make = copy.getTreeMaker();
        CodeStyle cs = DiffContext.getCodeStyle(copy);
        Set<Modifier> mods = EnumSet.of(Modifier.PUBLIC);
        boolean isStatic = field.getModifiers().contains(Modifier.STATIC);
        if (isStatic) {
            mods.add(Modifier.STATIC);
        }
        assert name.length() > 0;
        TypeMirror type = copy.getTypes().asMemberOf((DeclaredType)clazz.asType(), field);
        String getterName = CodeStyleUtils.computeGetterName(field.getSimpleName(), type.getKind() == TypeKind.BOOLEAN, isStatic, cs);
        BlockTree body = make.Block(Collections.singletonList(make.Return(make.Identifier(field.getSimpleName()))), false);
        return make.Method(make.Modifiers(mods), getterName, make.Type(type), Collections.<TypeParameterTree>emptyList(), Collections.<VariableTree>emptyList(), Collections.<ExpressionTree>emptyList(), body, null);
        return make.Method(make.Modifiers(mods), sb, make.Type(type), Collections.<TypeParameterTree>emptyList(), Collections.<VariableTree>emptyList(), Collections.<ExpressionTree>emptyList(), body, null);
    }

    /**

    public MethodTree createGetter(VariableTree field) {
        assert field != null;
        TreeMaker make = copy.getTreeMaker();
        CodeStyle cs = DiffContext.getCodeStyle(copy);
        Set<Modifier> mods = EnumSet.of(Modifier.PUBLIC);
        boolean isStatic = field.getModifiers().getFlags().contains(Modifier.STATIC);
        if (isStatic) {
            mods.add(Modifier.STATIC);
        }
        assert name.length() > 0;
        Tree type = field.getType();
        boolean isBoolean = type.getKind() == Tree.Kind.PRIMITIVE_TYPE && ((PrimitiveTypeTree) type).getPrimitiveTypeKind() == TypeKind.BOOLEAN;
        String getterName = CodeStyleUtils.computeGetterName(field.getName(), isBoolean, isStatic, cs);
        BlockTree body = make.Block(Collections.singletonList(make.Return(make.Identifier(field.getName()))), false);
        return make.Method(make.Modifiers(mods), getterName, type, Collections.<TypeParameterTree>emptyList(), Collections.<VariableTree>emptyList(), Collections.<ExpressionTree>emptyList(), body, null);
    }

    /**

    public MethodTree createSetter(TypeElement clazz, VariableElement field) {
        assert clazz != null && field != null;
        TreeMaker make = copy.getTreeMaker();
        CodeStyle cs = DiffContext.getCodeStyle(copy);
        Set<Modifier> mods = EnumSet.of(Modifier.PUBLIC);
        boolean isStatic = field.getModifiers().contains(Modifier.STATIC);
        if (isStatic) {
            mods.add(Modifier.STATIC);
        }
        CharSequence name = field.getSimpleName();
        assert name.length() > 0;
        TypeMirror type = copy.getTypes().asMemberOf((DeclaredType)clazz.asType(), field);
        String setterName = CodeStyleUtils.computeSetterName(field.getSimpleName(), isStatic, cs);
        String paramName = addParamPrefixSuffix(removeFieldPrefixSuffix(field, cs), cs);
        List<VariableTree> params = Collections.singletonList(make.Variable(make.Modifiers(EnumSet.noneOf(Modifier.class)), paramName, make.Type(type), null));
        BlockTree body = make.Block(Collections.singletonList(make.ExpressionStatement(make.Assignment(make.MemberSelect(isStatic? make.Identifier(field.getEnclosingElement().getSimpleName()) : make.Identifier("this"), name), make.Identifier(paramName)))), false); //NOI18N
        return make.Method(make.Modifiers(mods), setterName, make.Type(copy.getTypes().getNoType(TypeKind.VOID)), Collections.<TypeParameterTree>emptyList(), params, Collections.<ExpressionTree>emptyList(), body, null);
    }

    /**

            mods.add(Modifier.STATIC);
        CharSequence name = field.getName();
        assert name.length() > 0;
        CodeStyle cs = DiffContext.getCodeStyle(copy);
        String propName = removeFieldPrefixSuffix(field, cs);
        String setterName = CodeStyleUtils.computeSetterName(field.getName(), isStatic, cs);
        String paramName = addParamPrefixSuffix(propName, cs);
        List<VariableTree> params = Collections.singletonList(make.Variable(make.Modifiers(EnumSet.noneOf(Modifier.class)), paramName, field.getType(), null));
        BlockTree body = make.Block(Collections.singletonList(make.ExpressionStatement(make.Assignment(make.MemberSelect(isStatic? make.Identifier(clazz.getSimpleName()) : make.Identifier("this"), name), make.Identifier(paramName)))), false); //NOI18N
        return make.Method(make.Modifiers(mods), setterName, make.Type(copy.getTypes().getNoType(TypeKind.VOID)), Collections.<TypeParameterTree>emptyList(), params, Collections.<ExpressionTree>emptyList(), body, null);
    }
    
    /**

        return info.getElements().getTypeElement("java.lang.Override") != null;
    }

    private static StringBuilder getCapitalizedName(CharSequence cs) {
        StringBuilder sb = new StringBuilder(cs);
        while (sb.length() > 1 && sb.charAt(0) == '_') { //NOI18N
            sb.deleteCharAt(0);
        }

        //Beans naming convention, #165241
        if (sb.length() > 1 && Character.isUpperCase(sb.charAt(1))) {
            return sb;
        }

        if (sb.length() > 0) {
            sb.setCharAt(0, Character.toUpperCase(sb.charAt(0)));
        }
        return sb;
    }

    private Tree resolveWildcard(TypeMirror type) {
        TreeMaker make = copy.getTreeMaker();
        Tree result;

        return bindings;
    }

    private static String removeFieldPrefixSuffix(VariableElement var, CodeStyle cs) {
        boolean isStatic = var.getModifiers().contains(Modifier.STATIC);
        return CodeStyleUtils.removePrefixSuffix(var.getSimpleName(),
                isStatic ? cs.getStaticFieldNamePrefix() : cs.getFieldNamePrefix(),
                isStatic ? cs.getStaticFieldNameSuffix() : cs.getFieldNameSuffix());
    }

    private static String removeFieldPrefixSuffix(VariableTree var, CodeStyle cs) {
        boolean isStatic = var.getModifiers().getFlags().contains(Modifier.STATIC);
        return CodeStyleUtils.removePrefixSuffix(var.getName(),
                isStatic ? cs.getStaticFieldNamePrefix() : cs.getFieldNamePrefix(),
                isStatic ? cs.getStaticFieldNameSuffix() : cs.getFieldNameSuffix());
    }

    private static String addParamPrefixSuffix(CharSequence name, CodeStyle cs) {
        return CodeStyleUtils.addPrefixSuffix(name,
                cs.getParameterNamePrefix(),
                cs.getParameterNameSuffix());
    }

    private static class ClassMemberComparator implements Comparator<Tree> {

        private CodeStyle.MemberGroups groups;

Lines 224-229 Link Here

(-)a/java.source/src/org/netbeans/modules/java/source/resources/layer.xml (+5 lines)
224	<attr name="instanceCreate" methodvalue="org.netbeans.modules.java.ui.FmtImports.getController"/>	224	<attr name="instanceCreate" methodvalue="org.netbeans.modules.java.ui.FmtImports.getController"/>
225	<attr name="position" intvalue="800"/>	225	<attr name="position" intvalue="800"/>
226	</file>	226	</file>
		227	<file name="Naming.instance">
		228	<attr name="instanceOf" stringvalue="org.netbeans.modules.options.editor.spi.PreferencesCustomizer$Factory"/>
		229	<attr name="instanceCreate" methodvalue="org.netbeans.modules.java.ui.FmtNaming.getController"/>
		230	<attr name="position" intvalue="900"/>
		231	</file>
227	<file name="CodeGeneration.instance">	232	<file name="CodeGeneration.instance">
228	<attr name="instanceOf" stringvalue="org.netbeans.modules.options.editor.spi.PreferencesCustomizer$Factory"/>	233	<attr name="instanceOf" stringvalue="org.netbeans.modules.options.editor.spi.PreferencesCustomizer$Factory"/>
229	<attr name="instanceCreate" methodvalue="org.netbeans.modules.java.ui.FmtCodeGeneration.getController"/>	234	<attr name="instanceCreate" methodvalue="org.netbeans.modules.java.ui.FmtCodeGeneration.getController"/>

Lines 43-49 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/Bundle.properties (-1 / +6 lines)
43	# Formating options	43	# Formating options
44		44
45	LBL_TabsAndIndents=Tabs and Indents	45	LBL_TabsAndIndents=Tabs and Indents
46	LBL_CodeGeneration=Code Generation	46	LBL_CodeGeneration=Ordering
		47	LBL_Naming=Naming
47	LBL_Alignment=Alignment	48	LBL_Alignment=Alignment
48	LBL_Braces=Braces	49	LBL_Braces=Braces
49	LBL_Wrapping=Wrapping	50	LBL_Wrapping=Wrapping
Lines 527-532 Link Here
527	private String name;\	528	private String name;\
528	}	529	}
529		530
		531	SAMPLE_Naming=public class ClassA {\
		532	\
		533	}
		534
530	nlFinallyCheckBox1.text="finall&y"	535	nlFinallyCheckBox1.text="finall&y"
531		536
532	AN_Preview=Preview	537	AN_Preview=Preview




  <Layout>
    <DimensionLayout dim="0">
      <Group type="103" groupAlignment="0" attributes="0">
          <Component id="jSeparator1" max="32767" attributes="0"/>
          <Group type="102" alignment="0" attributes="0">
              <Group type="103" groupAlignment="0" attributes="0">
                  <Component id="otherLabel" min="-2" max="-2" attributes="0"/>

          <Component id="jSeparator3" alignment="0" max="32767" attributes="0"/>
          <Group type="102" attributes="0">
              <Group type="103" groupAlignment="0" max="-2" attributes="0">
                  <Component id="namingConventionsLabel" min="-2" max="-2" attributes="0"/>
                  <Component id="memberOrderLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                  <Group type="102" attributes="0">
                      <EmptySpace max="-2" attributes="0"/>
                      <Group type="103" groupAlignment="0" attributes="0">
                          <Component id="jScrollPane1" min="-2" pref="160" max="-2" attributes="0"/>
                          <Component id="jScrollPane2" alignment="0" min="-2" pref="160" max="-2" attributes="0"/>
                      </Group>
                      <EmptySpace max="-2" attributes="0"/>
                      <Group type="103" groupAlignment="0" attributes="0">
                          <Group type="103" alignment="0" groupAlignment="0" max="-2" attributes="0">
                              <Component id="downButton" min="-2" pref="108" max="-2" attributes="0"/>
                              <Component id="upButton" min="-2" pref="108" max="-2" attributes="0"/>
                          </Group>
                          <Group type="103" alignment="0" groupAlignment="0" max="-2" attributes="0">
                              <Component id="visDownButton" min="-2" pref="108" max="-2" attributes="0"/>
                              <Component id="visUpButton" min="-2" pref="108" max="-2" attributes="0"/>
                                      <Component id="upButton" min="-2" pref="108" max="-2" attributes="0"/>
                                  </Group>
                                  <Group type="103" alignment="0" groupAlignment="0" max="-2" attributes="0">
                                      <Component id="visDownButton" max="32767" attributes="0"/>
                                      <Component id="visUpButton" min="-2" pref="108" max="-2" attributes="0"/>
                                  </Group>
                              </Group>
                          </Group>
                      </Group>
                  </Group>

    <DimensionLayout dim="1">
      <Group type="103" groupAlignment="0" attributes="0">
          <Group type="102" attributes="0">
              <Component id="namingConventionsLabel" min="-2" max="-2" attributes="0"/>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="preferLongerNamesCheckBox" min="-2" max="-2" attributes="0"/>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="isForBooleanGettersCheckBox" min="-2" max="-2" attributes="0"/>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="jSeparator1" min="-2" max="-2" attributes="0"/>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="otherLabel" min="-2" max="-2" attributes="0"/>
              <EmptySpace max="-2" attributes="0"/>

    </DimensionLayout>
  </Layout>
  <SubComponents>
    <Component class="javax.swing.JLabel" name="namingConventionsLabel">
      <Properties>
        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_Naming" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
      </Properties>
    </Component>
    <Component class="javax.swing.JCheckBox" name="preferLongerNamesCheckBox">
      <Properties>
        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_PreferLongerNames" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
          <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
            <EmptyBorder bottom="0" left="0" right="0" top="0"/>
          </Border>
        </Property>
        <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
          <Insets value="[0, 0, 0, 0]"/>
        </Property>
        <Property name="opaque" type="boolean" value="false"/>
      </Properties>
    </Component>
    <Component class="javax.swing.JCheckBox" name="isForBooleanGettersCheckBox">
      <Properties>
        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_UseIsForBooleanGetters" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
          <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
            <EmptyBorder bottom="0" left="0" right="0" top="0"/>
          </Border>
        </Property>
        <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
          <Insets value="[0, 0, 0, 0]"/>
        </Property>
        <Property name="opaque" type="boolean" value="false"/>
      </Properties>
    </Component>
    <Container class="javax.swing.JPanel" name="jPanel1">

      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
      <SubComponents>
        <Component class="javax.swing.JLabel" name="prefixLabel">
          <Properties>
            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
              <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_Prefix" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
            </Property>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="1" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="17" weightX="0.5" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JLabel" name="suffixLabel">
          <Properties>
            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
              <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_Suffix" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
            </Property>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="2" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="17" weightX="0.5" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JLabel" name="fieldLabel">
          <Properties>
            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
              <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_Field" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
            </Property>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JTextField" name="fieldPrefixField">
          <Properties>
            <Property name="columns" type="int" value="5"/>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JTextField" name="fieldSuffixField">
          <Properties>
            <Property name="columns" type="int" value="5"/>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="2" gridY="1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JLabel" name="staticFieldLabel">
          <Properties>
            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
              <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_StaticField" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
            </Property>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JTextField" name="staticFieldPrefixField">
          <Properties>
            <Property name="columns" type="int" value="5"/>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="1" gridY="2" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JTextField" name="staticFieldSuffixField">
          <Properties>
            <Property name="columns" type="int" value="5"/>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="2" gridY="2" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JLabel" name="parameterLabel">
          <Properties>
            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
              <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_Parameter" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
            </Property>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JTextField" name="parameterPrefixField">
          <Properties>
            <Property name="columns" type="int" value="5"/>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="1" gridY="3" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JTextField" name="parameterSuffixField">
          <Properties>
            <Property name="columns" type="int" value="5"/>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="2" gridY="3" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JLabel" name="localVarLabel">
          <Properties>
            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
              <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_LocalVariable" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
            </Property>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="0" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JTextField" name="localVarSuffixField">
          <Properties>
            <Property name="columns" type="int" value="5"/>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="1" gridY="4" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JTextField" name="localVarPrefixField">
          <Properties>
            <Property name="columns" type="int" value="5"/>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="2" gridY="4" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
      </SubComponents>
    </Container>
    <Component class="javax.swing.JSeparator" name="jSeparator1">
    </Component>
    <Component class="javax.swing.JLabel" name="otherLabel">
      <Properties>
        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">




    public FmtCodeGeneration() {
        initComponents();
        
        preferLongerNamesCheckBox.putClientProperty(OPTION_ID, preferLongerNames);
        isForBooleanGettersCheckBox.putClientProperty(OPTION_ID, useIsForBooleanGetters);
        fieldPrefixField.putClientProperty(OPTION_ID, fieldNamePrefix);
        fieldSuffixField.putClientProperty(OPTION_ID, fieldNameSuffix);
        staticFieldPrefixField.putClientProperty(OPTION_ID, staticFieldNamePrefix);
        staticFieldSuffixField.putClientProperty(OPTION_ID, staticFieldNameSuffix);
        parameterPrefixField.putClientProperty(OPTION_ID, parameterNamePrefix);
        parameterSuffixField.putClientProperty(OPTION_ID, parameterNameSuffix);
        localVarPrefixField.putClientProperty(OPTION_ID, localVarNamePrefix);
        localVarSuffixField.putClientProperty(OPTION_ID, localVarNameSuffix);
        qualifyFieldAccessCheckBox.putClientProperty(OPTION_ID, qualifyFieldAccess);
        addOverrideAnnortationCheckBox.putClientProperty(OPTION_ID, addOverrideAnnotation);
        parametersFinalCheckBox.putClientProperty(OPTION_ID, makeParametersFinal);

        visibilityOrderList.setSelectedIndex(0);
        visibilityOrderList.addListSelectionListener(this);
        enableVisibilityOrder();
        namingConventionsLabel.setVisible(false);
        preferLongerNamesCheckBox.setVisible(false);
        isForBooleanGettersCheckBox.setVisible(false);
        prefixLabel.setVisible(false);
        suffixLabel.setVisible(false);
        fieldLabel.setVisible(false);
        fieldPrefixField.setVisible(false);
        fieldSuffixField.setVisible(false);
        staticFieldLabel.setVisible(false);
        staticFieldPrefixField.setVisible(false);
        staticFieldSuffixField.setVisible(false);
        parameterLabel.setVisible(false);
        parameterPrefixField.setVisible(false);
        parameterSuffixField.setVisible(false);
        localVarLabel.setVisible(false);
        localVarPrefixField.setVisible(false);
        localVarSuffixField.setVisible(false);
        jSeparator1.setVisible(false);
        otherLabel.setVisible(false);
        qualifyFieldAccessCheckBox.setVisible(false);
        addOverrideAnnortationCheckBox.setVisible(false);

    private void initComponents() {
        java.awt.GridBagConstraints gridBagConstraints;

        namingConventionsLabel = new javax.swing.JLabel();
        preferLongerNamesCheckBox = new javax.swing.JCheckBox();
        isForBooleanGettersCheckBox = new javax.swing.JCheckBox();
        jPanel1 = new javax.swing.JPanel();
        prefixLabel = new javax.swing.JLabel();
        suffixLabel = new javax.swing.JLabel();
        fieldLabel = new javax.swing.JLabel();
        fieldPrefixField = new javax.swing.JTextField();
        fieldSuffixField = new javax.swing.JTextField();
        staticFieldLabel = new javax.swing.JLabel();
        staticFieldPrefixField = new javax.swing.JTextField();
        staticFieldSuffixField = new javax.swing.JTextField();
        parameterLabel = new javax.swing.JLabel();
        parameterPrefixField = new javax.swing.JTextField();
        parameterSuffixField = new javax.swing.JTextField();
        localVarLabel = new javax.swing.JLabel();
        localVarSuffixField = new javax.swing.JTextField();
        localVarPrefixField = new javax.swing.JTextField();
        jSeparator1 = new javax.swing.JSeparator();
        otherLabel = new javax.swing.JLabel();
        qualifyFieldAccessCheckBox = new javax.swing.JCheckBox();
        addOverrideAnnortationCheckBox = new javax.swing.JCheckBox();

        setName(org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_CodeGeneration")); // NOI18N
        setOpaque(false);

        org.openide.awt.Mnemonics.setLocalizedText(namingConventionsLabel, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_Naming")); // NOI18N

        org.openide.awt.Mnemonics.setLocalizedText(preferLongerNamesCheckBox, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_PreferLongerNames")); // NOI18N
        preferLongerNamesCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
        preferLongerNamesCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
        preferLongerNamesCheckBox.setOpaque(false);

        org.openide.awt.Mnemonics.setLocalizedText(isForBooleanGettersCheckBox, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_UseIsForBooleanGetters")); // NOI18N
        isForBooleanGettersCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
        isForBooleanGettersCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
        isForBooleanGettersCheckBox.setOpaque(false);

        jPanel1.setLayout(new java.awt.GridBagLayout());

        org.openide.awt.Mnemonics.setLocalizedText(prefixLabel, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_Prefix")); // NOI18N
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridy = 0;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
        gridBagConstraints.weightx = 0.5;
        gridBagConstraints.insets = new java.awt.Insets(0, 8, 4, 0);
        jPanel1.add(prefixLabel, gridBagConstraints);

        org.openide.awt.Mnemonics.setLocalizedText(suffixLabel, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_Suffix")); // NOI18N
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 2;
        gridBagConstraints.gridy = 0;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
        gridBagConstraints.weightx = 0.5;
        gridBagConstraints.insets = new java.awt.Insets(0, 8, 4, 0);
        jPanel1.add(suffixLabel, gridBagConstraints);

        org.openide.awt.Mnemonics.setLocalizedText(fieldLabel, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_Field")); // NOI18N
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 0;
        gridBagConstraints.gridy = 1;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
        jPanel1.add(fieldLabel, gridBagConstraints);

        fieldPrefixField.setColumns(5);
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridy = 1;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.weightx = 0.5;
        gridBagConstraints.insets = new java.awt.Insets(4, 8, 4, 0);
        jPanel1.add(fieldPrefixField, gridBagConstraints);

        fieldSuffixField.setColumns(5);
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 2;
        gridBagConstraints.gridy = 1;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.weightx = 0.5;
        gridBagConstraints.insets = new java.awt.Insets(4, 8, 4, 0);
        jPanel1.add(fieldSuffixField, gridBagConstraints);

        org.openide.awt.Mnemonics.setLocalizedText(staticFieldLabel, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_StaticField")); // NOI18N
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 0;
        gridBagConstraints.gridy = 2;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
        jPanel1.add(staticFieldLabel, gridBagConstraints);

        staticFieldPrefixField.setColumns(5);
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridy = 2;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.weightx = 0.5;
        gridBagConstraints.insets = new java.awt.Insets(4, 8, 4, 0);
        jPanel1.add(staticFieldPrefixField, gridBagConstraints);

        staticFieldSuffixField.setColumns(5);
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 2;
        gridBagConstraints.gridy = 2;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.weightx = 0.5;
        gridBagConstraints.insets = new java.awt.Insets(4, 8, 4, 0);
        jPanel1.add(staticFieldSuffixField, gridBagConstraints);

        org.openide.awt.Mnemonics.setLocalizedText(parameterLabel, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_Parameter")); // NOI18N
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 0;
        gridBagConstraints.gridy = 3;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
        jPanel1.add(parameterLabel, gridBagConstraints);

        parameterPrefixField.setColumns(5);
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridy = 3;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.weightx = 0.5;
        gridBagConstraints.insets = new java.awt.Insets(4, 8, 4, 0);
        jPanel1.add(parameterPrefixField, gridBagConstraints);

        parameterSuffixField.setColumns(5);
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 2;
        gridBagConstraints.gridy = 3;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.weightx = 0.5;
        gridBagConstraints.insets = new java.awt.Insets(4, 8, 4, 0);
        jPanel1.add(parameterSuffixField, gridBagConstraints);

        org.openide.awt.Mnemonics.setLocalizedText(localVarLabel, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_LocalVariable")); // NOI18N
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 0;
        gridBagConstraints.gridy = 4;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
        gridBagConstraints.insets = new java.awt.Insets(4, 0, 0, 0);
        jPanel1.add(localVarLabel, gridBagConstraints);

        localVarSuffixField.setColumns(5);
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridy = 4;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.weightx = 0.5;
        gridBagConstraints.insets = new java.awt.Insets(4, 8, 0, 0);
        jPanel1.add(localVarSuffixField, gridBagConstraints);

        localVarPrefixField.setColumns(5);
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 2;
        gridBagConstraints.gridy = 4;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.weightx = 0.5;
        gridBagConstraints.insets = new java.awt.Insets(4, 8, 0, 0);
        jPanel1.add(localVarPrefixField, gridBagConstraints);

        org.openide.awt.Mnemonics.setLocalizedText(otherLabel, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_Other")); // NOI18N

        org.openide.awt.Mnemonics.setLocalizedText(qualifyFieldAccessCheckBox, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_QualifyFieldAccess")); // NOI18N

        this.setLayout(layout);
        layout.setHorizontalGroup(
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addComponent(jSeparator1)
            .addGroup(layout.createSequentialGroup()
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                    .addComponent(otherLabel)

            .addComponent(jSeparator3)
            .addGroup(layout.createSequentialGroup()
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                    .addComponent(namingConventionsLabel)
                    .addComponent(memberOrderLabel)
                    .addGroup(layout.createSequentialGroup()
                        .addContainerGap()
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                            .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 160, javax.swing.GroupLayout.PREFERRED_SIZE)
                            .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 160, javax.swing.GroupLayout.PREFERRED_SIZE))
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                                .addComponent(downButton, javax.swing.GroupLayout.PREFERRED_SIZE, 108, javax.swing.GroupLayout.PREFERRED_SIZE)
                                .addComponent(upButton, javax.swing.GroupLayout.PREFERRED_SIZE, 108, javax.swing.GroupLayout.PREFERRED_SIZE))
                            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                                .addComponent(visDownButton, javax.swing.GroupLayout.PREFERRED_SIZE, 108, javax.swing.GroupLayout.PREFERRED_SIZE)
                                .addComponent(visUpButton, javax.swing.GroupLayout.PREFERRED_SIZE, 108, javax.swing.GroupLayout.PREFERRED_SIZE))))
                                        .addComponent(downButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                                        .addComponent(upButton, javax.swing.GroupLayout.PREFERRED_SIZE, 108, javax.swing.GroupLayout.PREFERRED_SIZE))
                                    .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                                        .addComponent(visDownButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                                        .addComponent(visUpButton, javax.swing.GroupLayout.PREFERRED_SIZE, 108, javax.swing.GroupLayout.PREFERRED_SIZE))))))
                    .addComponent(sortByVisibilityCheckBox)
                    .addGroup(layout.createSequentialGroup()
                        .addGap(5, 5, 5)
                        .addComponent(insertionPointLabel)
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                        .addComponent(insertionPointComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
            .addComponent(jSeparator2, javax.swing.GroupLayout.Alignment.TRAILING)
        );
        layout.setVerticalGroup(
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(layout.createSequentialGroup()
                .addContainerGap()
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addComponent(preferLongerNamesCheckBox)
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addComponent(isForBooleanGettersCheckBox)
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addComponent(otherLabel)
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addComponent(qualifyFieldAccessCheckBox)

    // Variables declaration - do not modify//GEN-BEGIN:variables
    private javax.swing.JCheckBox addOverrideAnnortationCheckBox;
    private javax.swing.JButton downButton;
    private javax.swing.JLabel fieldLabel;
    private javax.swing.JTextField fieldPrefixField;
    private javax.swing.JTextField fieldSuffixField;
    private javax.swing.JComboBox insertionPointComboBox;
    private javax.swing.JLabel insertionPointLabel;
    private javax.swing.JCheckBox isForBooleanGettersCheckBox;
    private javax.swing.JPanel jPanel1;
    private javax.swing.JScrollPane jScrollPane1;
    private javax.swing.JScrollPane jScrollPane2;
    private javax.swing.JSeparator jSeparator1;
    private javax.swing.JSeparator jSeparator2;
    private javax.swing.JSeparator jSeparator3;
    private javax.swing.JLabel localVarLabel;
    private javax.swing.JTextField localVarPrefixField;
    private javax.swing.JTextField localVarSuffixField;
    private javax.swing.JCheckBox localVarsFinalCheckBox;
    private javax.swing.JLabel memberOrderLabel;
    private javax.swing.JList membersOrderList;
    private javax.swing.JLabel namingConventionsLabel;
    private javax.swing.JLabel otherLabel;
    private javax.swing.JLabel parameterLabel;
    private javax.swing.JTextField parameterPrefixField;
    private javax.swing.JTextField parameterSuffixField;
    private javax.swing.JCheckBox parametersFinalCheckBox;
    private javax.swing.JCheckBox preferLongerNamesCheckBox;
    private javax.swing.JLabel prefixLabel;
    private javax.swing.JCheckBox qualifyFieldAccessCheckBox;
    private javax.swing.JCheckBox sortByVisibilityCheckBox;
    private javax.swing.JLabel staticFieldLabel;
    private javax.swing.JTextField staticFieldPrefixField;
    private javax.swing.JTextField staticFieldSuffixField;
    private javax.swing.JLabel suffixLabel;
    private javax.swing.JButton upButton;
    private javax.swing.JButton visDownButton;
    private javax.swing.JButton visUpButton;




<?xml version="1.0" encoding="UTF-8" ?>

<Form version="1.8" maxVersion="1.8" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
  <Properties>
    <Property name="name" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
      <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_Naming" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
    </Property>
    <Property name="opaque" type="boolean" value="false"/>
  </Properties>
  <AuxValues>
    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
  </AuxValues>

  <Layout>
    <DimensionLayout dim="0">
      <Group type="103" groupAlignment="0" attributes="0">
          <Group type="102" attributes="0">
              <Group type="103" groupAlignment="0" attributes="0">
                  <Component id="namingConventionsLabel" min="-2" max="-2" attributes="0"/>
                  <Group type="102" attributes="0">
                      <EmptySpace max="-2" attributes="0"/>
                      <Group type="103" groupAlignment="0" attributes="0">
                          <Component id="isForBooleanGettersCheckBox" min="-2" max="-2" attributes="0"/>
                          <Component id="preferLongerNamesCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
                          <Component id="jPanel1" alignment="0" min="-2" pref="274" max="-2" attributes="0"/>
                      </Group>
                  </Group>
              </Group>
              <EmptySpace max="32767" attributes="0"/>
          </Group>
      </Group>
    </DimensionLayout>
    <DimensionLayout dim="1">
      <Group type="103" groupAlignment="0" attributes="0">
          <Group type="102" attributes="0">
              <Component id="namingConventionsLabel" min="-2" max="-2" attributes="0"/>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="preferLongerNamesCheckBox" min="-2" max="-2" attributes="0"/>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="isForBooleanGettersCheckBox" min="-2" max="-2" attributes="0"/>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
              <EmptySpace max="32767" attributes="0"/>
          </Group>
      </Group>
    </DimensionLayout>
  </Layout>
  <SubComponents>
    <Component class="javax.swing.JLabel" name="namingConventionsLabel">
      <Properties>
        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_Naming" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
      </Properties>
    </Component>
    <Component class="javax.swing.JCheckBox" name="preferLongerNamesCheckBox">
      <Properties>
        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_PreferLongerNames" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
          <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
            <EmptyBorder bottom="0" left="0" right="0" top="0"/>
          </Border>
        </Property>
        <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
          <Insets value="[0, 0, 0, 0]"/>
        </Property>
        <Property name="opaque" type="boolean" value="false"/>
      </Properties>
    </Component>
    <Component class="javax.swing.JCheckBox" name="isForBooleanGettersCheckBox">
      <Properties>
        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_UseIsForBooleanGetters" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
          <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
            <EmptyBorder bottom="0" left="0" right="0" top="0"/>
          </Border>
        </Property>
        <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
          <Insets value="[0, 0, 0, 0]"/>
        </Property>
        <Property name="opaque" type="boolean" value="false"/>
      </Properties>
    </Component>
    <Container class="javax.swing.JPanel" name="jPanel1">

      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
      <SubComponents>
        <Component class="javax.swing.JLabel" name="prefixLabel">
          <Properties>
            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
              <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_Prefix" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
            </Property>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="1" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="17" weightX="0.5" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JLabel" name="suffixLabel">
          <Properties>
            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
              <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_Suffix" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
            </Property>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="2" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="17" weightX="0.5" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JLabel" name="fieldLabel">
          <Properties>
            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
              <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_Field" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
            </Property>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JTextField" name="fieldPrefixField">
          <Properties>
            <Property name="columns" type="int" value="5"/>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JTextField" name="fieldSuffixField">
          <Properties>
            <Property name="columns" type="int" value="5"/>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="2" gridY="1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JLabel" name="staticFieldLabel">
          <Properties>
            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
              <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_StaticField" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
            </Property>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JTextField" name="staticFieldPrefixField">
          <Properties>
            <Property name="columns" type="int" value="5"/>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="1" gridY="2" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JTextField" name="staticFieldSuffixField">
          <Properties>
            <Property name="columns" type="int" value="5"/>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="2" gridY="2" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JLabel" name="parameterLabel">
          <Properties>
            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
              <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_Parameter" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
            </Property>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JTextField" name="parameterPrefixField">
          <Properties>
            <Property name="columns" type="int" value="5"/>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="1" gridY="3" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JTextField" name="parameterSuffixField">
          <Properties>
            <Property name="columns" type="int" value="5"/>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="2" gridY="3" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JLabel" name="localVarLabel">
          <Properties>
            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
              <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_LocalVariable" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
            </Property>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="0" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JTextField" name="localVarSuffixField">
          <Properties>
            <Property name="columns" type="int" value="5"/>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="2" gridY="4" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JTextField" name="localVarPrefixField">
          <Properties>
            <Property name="columns" type="int" value="5"/>
          </Properties>
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
              <GridBagConstraints gridX="1" gridY="4" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
      </SubComponents>
    </Container>
  </SubComponents>
</Form>




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * Contributor(s):
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
 * Microsystems, Inc. All Rights Reserved.
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 */
package org.netbeans.modules.java.ui;

import java.awt.Rectangle;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
import java.util.List;
import java.util.prefs.Preferences;

import javax.lang.model.element.ElementKind;
import javax.lang.model.element.Modifier;
import javax.swing.DefaultListModel;
import javax.swing.JEditorPane;
import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;

import com.sun.source.tree.AssignmentTree;
import com.sun.source.tree.BlockTree;
import com.sun.source.tree.ClassTree;
import com.sun.source.tree.CompilationUnitTree;
import com.sun.source.tree.ExpressionTree;
import com.sun.source.tree.IdentifierTree;
import com.sun.source.tree.ModifiersTree;
import com.sun.source.tree.NewClassTree;
import com.sun.source.tree.Tree;
import com.sun.source.tree.TypeParameterTree;
import com.sun.source.tree.VariableTree;
import javax.lang.model.type.TypeKind;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;

import org.netbeans.api.java.source.CodeStyle;
import org.netbeans.api.java.source.CodeStyleUtils;
import org.netbeans.api.java.source.GeneratorUtilities;
import org.netbeans.api.java.source.JavaSource.Phase;
import org.netbeans.api.java.source.ModificationResult;
import org.netbeans.api.java.source.TreeMaker;
import org.netbeans.api.java.source.WorkingCopy;
import org.netbeans.editor.BaseDocument;
import org.netbeans.modules.editor.indent.api.Reformat;
import static org.netbeans.modules.java.ui.FmtOptions.*;
import org.netbeans.modules.java.ui.FmtOptions.CategorySupport;
import static org.netbeans.modules.java.ui.FmtOptions.CategorySupport.OPTION_ID;
import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
import org.netbeans.modules.parsing.api.ResultIterator;
import org.netbeans.modules.parsing.api.Source;
import org.netbeans.modules.parsing.api.UserTask;
import org.openide.cookies.SaveCookie;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.loaders.DataObject;
import org.openide.util.NbBundle;

/**
 *
 * @author Ralph Benjamin Ruijs <ralphbenjamin@netbeans.org>
 */
public class FmtNaming extends javax.swing.JPanel implements Runnable {

    /**
     * Creates new form FmtCodeGeneration
     */
    public FmtNaming() {
        initComponents();
        preferLongerNamesCheckBox.putClientProperty(OPTION_ID, preferLongerNames);
        isForBooleanGettersCheckBox.putClientProperty(OPTION_ID, useIsForBooleanGetters);
        fieldPrefixField.putClientProperty(OPTION_ID, fieldNamePrefix);
        fieldSuffixField.putClientProperty(OPTION_ID, fieldNameSuffix);
        staticFieldPrefixField.putClientProperty(OPTION_ID, staticFieldNamePrefix);
        staticFieldSuffixField.putClientProperty(OPTION_ID, staticFieldNameSuffix);
        parameterPrefixField.putClientProperty(OPTION_ID, parameterNamePrefix);
        parameterSuffixField.putClientProperty(OPTION_ID, parameterNameSuffix);
        localVarPrefixField.putClientProperty(OPTION_ID, localVarNamePrefix);
        localVarSuffixField.putClientProperty(OPTION_ID, localVarNameSuffix);
    }

    public static PreferencesCustomizer.Factory getController() {
        return new PreferencesCustomizer.Factory() {
            public PreferencesCustomizer create(Preferences preferences) {
                NamingCategorySupport support = new NamingCategorySupport(preferences, new FmtNaming());
                ((Runnable) support.panel).run();
                return support;
            }
        };
    }

    /**
     * This method is called from within the constructor to initialize the form.
     * WARNING: Do NOT modify this code. The content of this method is always
     * regenerated by the Form Editor.
     */
    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
    private void initComponents() {
        java.awt.GridBagConstraints gridBagConstraints;

        namingConventionsLabel = new javax.swing.JLabel();
        preferLongerNamesCheckBox = new javax.swing.JCheckBox();
        isForBooleanGettersCheckBox = new javax.swing.JCheckBox();
        jPanel1 = new javax.swing.JPanel();
        prefixLabel = new javax.swing.JLabel();
        suffixLabel = new javax.swing.JLabel();
        fieldLabel = new javax.swing.JLabel();
        fieldPrefixField = new javax.swing.JTextField();
        fieldSuffixField = new javax.swing.JTextField();
        staticFieldLabel = new javax.swing.JLabel();
        staticFieldPrefixField = new javax.swing.JTextField();
        staticFieldSuffixField = new javax.swing.JTextField();
        parameterLabel = new javax.swing.JLabel();
        parameterPrefixField = new javax.swing.JTextField();
        parameterSuffixField = new javax.swing.JTextField();
        localVarLabel = new javax.swing.JLabel();
        localVarSuffixField = new javax.swing.JTextField();
        localVarPrefixField = new javax.swing.JTextField();

        setName(org.openide.util.NbBundle.getMessage(FmtNaming.class, "LBL_Naming")); // NOI18N
        setOpaque(false);

        org.openide.awt.Mnemonics.setLocalizedText(namingConventionsLabel, org.openide.util.NbBundle.getMessage(FmtNaming.class, "LBL_gen_Naming")); // NOI18N

        org.openide.awt.Mnemonics.setLocalizedText(preferLongerNamesCheckBox, org.openide.util.NbBundle.getMessage(FmtNaming.class, "LBL_gen_PreferLongerNames")); // NOI18N
        preferLongerNamesCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
        preferLongerNamesCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
        preferLongerNamesCheckBox.setOpaque(false);

        org.openide.awt.Mnemonics.setLocalizedText(isForBooleanGettersCheckBox, org.openide.util.NbBundle.getMessage(FmtNaming.class, "LBL_gen_UseIsForBooleanGetters")); // NOI18N
        isForBooleanGettersCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
        isForBooleanGettersCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
        isForBooleanGettersCheckBox.setOpaque(false);

        jPanel1.setLayout(new java.awt.GridBagLayout());

        org.openide.awt.Mnemonics.setLocalizedText(prefixLabel, org.openide.util.NbBundle.getMessage(FmtNaming.class, "LBL_gen_Prefix")); // NOI18N
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridy = 0;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
        gridBagConstraints.weightx = 0.5;
        gridBagConstraints.insets = new java.awt.Insets(0, 8, 4, 0);
        jPanel1.add(prefixLabel, gridBagConstraints);

        org.openide.awt.Mnemonics.setLocalizedText(suffixLabel, org.openide.util.NbBundle.getMessage(FmtNaming.class, "LBL_gen_Suffix")); // NOI18N
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 2;
        gridBagConstraints.gridy = 0;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
        gridBagConstraints.weightx = 0.5;
        gridBagConstraints.insets = new java.awt.Insets(0, 8, 4, 0);
        jPanel1.add(suffixLabel, gridBagConstraints);

        org.openide.awt.Mnemonics.setLocalizedText(fieldLabel, org.openide.util.NbBundle.getMessage(FmtNaming.class, "LBL_gen_Field")); // NOI18N
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 0;
        gridBagConstraints.gridy = 1;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
        jPanel1.add(fieldLabel, gridBagConstraints);

        fieldPrefixField.setColumns(5);
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridy = 1;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.weightx = 0.5;
        gridBagConstraints.insets = new java.awt.Insets(4, 8, 4, 0);
        jPanel1.add(fieldPrefixField, gridBagConstraints);

        fieldSuffixField.setColumns(5);
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 2;
        gridBagConstraints.gridy = 1;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.weightx = 0.5;
        gridBagConstraints.insets = new java.awt.Insets(4, 8, 4, 0);
        jPanel1.add(fieldSuffixField, gridBagConstraints);

        org.openide.awt.Mnemonics.setLocalizedText(staticFieldLabel, org.openide.util.NbBundle.getMessage(FmtNaming.class, "LBL_gen_StaticField")); // NOI18N
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 0;
        gridBagConstraints.gridy = 2;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
        jPanel1.add(staticFieldLabel, gridBagConstraints);

        staticFieldPrefixField.setColumns(5);
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridy = 2;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.weightx = 0.5;
        gridBagConstraints.insets = new java.awt.Insets(4, 8, 4, 0);
        jPanel1.add(staticFieldPrefixField, gridBagConstraints);

        staticFieldSuffixField.setColumns(5);
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 2;
        gridBagConstraints.gridy = 2;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.weightx = 0.5;
        gridBagConstraints.insets = new java.awt.Insets(4, 8, 4, 0);
        jPanel1.add(staticFieldSuffixField, gridBagConstraints);

        org.openide.awt.Mnemonics.setLocalizedText(parameterLabel, org.openide.util.NbBundle.getMessage(FmtNaming.class, "LBL_gen_Parameter")); // NOI18N
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 0;
        gridBagConstraints.gridy = 3;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
        jPanel1.add(parameterLabel, gridBagConstraints);

        parameterPrefixField.setColumns(5);
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridy = 3;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.weightx = 0.5;
        gridBagConstraints.insets = new java.awt.Insets(4, 8, 4, 0);
        jPanel1.add(parameterPrefixField, gridBagConstraints);

        parameterSuffixField.setColumns(5);
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 2;
        gridBagConstraints.gridy = 3;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.weightx = 0.5;
        gridBagConstraints.insets = new java.awt.Insets(4, 8, 4, 0);
        jPanel1.add(parameterSuffixField, gridBagConstraints);

        org.openide.awt.Mnemonics.setLocalizedText(localVarLabel, org.openide.util.NbBundle.getMessage(FmtNaming.class, "LBL_gen_LocalVariable")); // NOI18N
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 0;
        gridBagConstraints.gridy = 4;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
        gridBagConstraints.insets = new java.awt.Insets(4, 0, 0, 0);
        jPanel1.add(localVarLabel, gridBagConstraints);

        localVarSuffixField.setColumns(5);
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 2;
        gridBagConstraints.gridy = 4;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.weightx = 0.5;
        gridBagConstraints.insets = new java.awt.Insets(4, 8, 0, 0);
        jPanel1.add(localVarSuffixField, gridBagConstraints);

        localVarPrefixField.setColumns(5);
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridy = 4;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.weightx = 0.5;
        gridBagConstraints.insets = new java.awt.Insets(4, 8, 0, 0);
        jPanel1.add(localVarPrefixField, gridBagConstraints);

        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
        this.setLayout(layout);
        layout.setHorizontalGroup(
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(layout.createSequentialGroup()
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                    .addComponent(namingConventionsLabel)
                    .addGroup(layout.createSequentialGroup()
                        .addContainerGap()
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                            .addComponent(isForBooleanGettersCheckBox)
                            .addComponent(preferLongerNamesCheckBox)
                            .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 274, javax.swing.GroupLayout.PREFERRED_SIZE))))
                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
        );
        layout.setVerticalGroup(
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(layout.createSequentialGroup()
                .addComponent(namingConventionsLabel)
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addComponent(preferLongerNamesCheckBox)
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addComponent(isForBooleanGettersCheckBox)
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
        );
    }// </editor-fold>//GEN-END:initComponents
    // Variables declaration - do not modify//GEN-BEGIN:variables
    private javax.swing.JLabel fieldLabel;
    private javax.swing.JTextField fieldPrefixField;
    private javax.swing.JTextField fieldSuffixField;
    private javax.swing.JCheckBox isForBooleanGettersCheckBox;
    private javax.swing.JPanel jPanel1;
    private javax.swing.JLabel localVarLabel;
    private javax.swing.JTextField localVarPrefixField;
    private javax.swing.JTextField localVarSuffixField;
    private javax.swing.JLabel namingConventionsLabel;
    private javax.swing.JLabel parameterLabel;
    private javax.swing.JTextField parameterPrefixField;
    private javax.swing.JTextField parameterSuffixField;
    private javax.swing.JCheckBox preferLongerNamesCheckBox;
    private javax.swing.JLabel prefixLabel;
    private javax.swing.JLabel staticFieldLabel;
    private javax.swing.JTextField staticFieldPrefixField;
    private javax.swing.JTextField staticFieldSuffixField;
    private javax.swing.JLabel suffixLabel;
    // End of variables declaration//GEN-END:variables

    @Override
    public void run() {
        
    }

    private static final class NamingCategorySupport extends CategorySupport {

        private Source source = null;

        private NamingCategorySupport(Preferences preferences, JPanel panel) {
            super(preferences, "naming", panel, NbBundle.getMessage(FmtNaming.class, "SAMPLE_Naming"), //NOI18N
                  new String[]{FmtOptions.blankLinesBeforeFields, "1"}); //NOI18N
        }

        @Override
        public void refreshPreview() {
            final JEditorPane jep = (JEditorPane) getPreviewComponent();
            try {
                Class.forName(CodeStyle.class.getName(), true, CodeStyle.class.getClassLoader());
            } catch (ClassNotFoundException cnfe) {
                // ignore
            }

            final CodeStyle codeStyle = codeStyleProducer.create(previewPrefs);
            jep.setIgnoreRepaint(true);
            try {
                if (source == null) {
                    FileObject fo = FileUtil.createMemoryFileSystem().getRoot().createData("org.netbeans.samples.ClassA", "java"); //NOI18N
                    source = Source.create(fo);
                }
                final Document doc = source.getDocument(true);
                if (doc.getLength() > 0) {
                    doc.remove(0, doc.getLength());
                }
                doc.insertString(0, previewText, null);
                doc.putProperty(CodeStyle.class, codeStyle);
                jep.setDocument(doc);
                ModificationResult result = ModificationResult.runModificationTask(Collections.singleton(source), new UserTask() {
                    @Override
                    public void run(ResultIterator resultIterator) throws Exception {
                        WorkingCopy copy = WorkingCopy.get(resultIterator.getParserResult());
                        copy.toPhase(Phase.RESOLVED);
                        TreeMaker tm = copy.getTreeMaker();
                        GeneratorUtilities gu = GeneratorUtilities.get(copy);
                        CompilationUnitTree cut = copy.getCompilationUnit();
                        ClassTree ct = (ClassTree) cut.getTypeDecls().get(0);
                        List<Tree> members = new ArrayList<Tree>();
                        String name = CodeStyleUtils.addPrefixSuffix("name",
                                codeStyle.getFieldNamePrefix(),
                                codeStyle.getFieldNameSuffix());
                        VariableTree field = tm.Variable(tm.Modifiers(Collections.singleton(Modifier.PRIVATE)), name, tm.Type("String"), null);
                        members.add(field);
                        String cond = CodeStyleUtils.addPrefixSuffix("cond",
                                codeStyle.getFieldNamePrefix(),
                                codeStyle.getFieldNameSuffix());
                        VariableTree booleanField = tm.Variable(tm.Modifiers(Collections.singleton(Modifier.PRIVATE)), cond, tm.PrimitiveType(TypeKind.BOOLEAN), null);
                        members.add(booleanField);
                        members.add(gu.createConstructor(ct, Collections.singletonList(field)));
                        members.add(gu.createGetter(field));
                        members.add(gu.createSetter(ct, field));
                        members.add(gu.createGetter(booleanField));
                        members.add(gu.createSetter(ct, booleanField));
                        ModifiersTree mods = tm.Modifiers(EnumSet.of(Modifier.PRIVATE, Modifier.STATIC));
                        ClassTree nested = tm.Class(mods, "Nested", Collections.<TypeParameterTree>emptyList(), null, Collections.<Tree>emptyList(), Collections.<Tree>emptyList()); //NOI18N
                        members.add(nested);
                        IdentifierTree nestedId = tm.Identifier("Nested"); //NOI18N
                        String instance = CodeStyleUtils.addPrefixSuffix("instance",
                                codeStyle.getStaticFieldNamePrefix(),
                                codeStyle.getStaticFieldNameSuffix());
                        VariableTree staticField = tm.Variable(mods, instance, nestedId, null); //NOI18N
                        members.add(staticField);
                        members.add(gu.createGetter(staticField));
                        members.add(gu.createSetter(ct, staticField));
                        ClassTree newCT = gu.insertClassMembers(ct, members);
                        copy.rewrite(ct, newCT);
                    }
                });
                result.commit();
                final Reformat reformat = Reformat.get(doc);
                reformat.lock();
                try {
                    if (doc instanceof BaseDocument) {
                        ((BaseDocument) doc).runAtomicAsUser(new Runnable() {
                            @Override
                            public void run() {
                                try {
                                    reformat.reformat(0, doc.getLength());
                                } catch (BadLocationException ble) {
                                }
                            }
                        });
                    } else {
                        reformat.reformat(0, doc.getLength());
                    }
                } finally {
                    reformat.unlock();
                }
                DataObject dataObject = DataObject.find(source.getFileObject());
                SaveCookie sc = dataObject.getLookup().lookup(SaveCookie.class);
                if (sc != null) {
                    sc.save();
                }
            } catch (Exception ex) {
            }
            jep.setIgnoreRepaint(false);
            jep.scrollRectToVisible(new Rectangle(0, 0, 10, 10));
            jep.repaint(100);
        }

        private static class Element {

            private boolean isStatic;
            private ElementKind kind;

            @Override
            public String toString() {
                return (isStatic ? NbBundle.getMessage(FmtNaming.class, "VAL_gen_STATIC") + " " : "") //NOI18N
                       + NbBundle.getMessage(FmtNaming.class, "VAL_gen_" + kind.name()); //NOI18N
            }
        }

        private static class Visibility {

            private String kind;

            @Override
            public String toString() {
                return NbBundle.getMessage(FmtNaming.class, "VAL_gen_" + kind); //NOI18N
            }
        }
    }
}

Lines 116-122 Link Here

(-)a/refactoring.java/nbproject/project.xml (-1 / +1 lines)
116	<build-prerequisite/>	116	<build-prerequisite/>
117	<compile-dependency/>	117	<compile-dependency/>
118	<run-dependency>	118	<run-dependency>
119	<specification-version>0.110</specification-version>	119	<specification-version>0.122</specification-version>
120	</run-dependency>	120	</run-dependency>
121	</dependency>	121	</dependency>
122	<dependency>	122	<dependency>




import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.VariableElement;
import javax.lang.model.type.*;
import javax.lang.model.util.ElementFilter;
import javax.lang.model.util.Types;
import javax.swing.text.Document;
import org.netbeans.api.annotations.common.NullUnknown;
import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.api.java.classpath.ClassPath.Entry;


    private static final String JAVA_MIME_TYPE = "text/x-java"; // NOI18N
    private static final Logger LOG = Logger.getLogger(RefactoringUtils.class.getName());
    private static final RequestProcessor RP = new RequestProcessor(RefactoringUtils.class.getName(), 1, false, false);

    /**
     * Get all overriding methods for given ExecutableElement

        }
        return result;
    }
    
    public static CodeStyle getCodeStyle(CompilationInfo info) {
        if (info != null) {
            try {
                Document doc = info.getDocument();
                if (doc != null) {
                    CodeStyle cs = (CodeStyle)doc.getProperty(CodeStyle.class);
                    return cs != null ? cs : CodeStyle.getDefault(doc);
                }
            } catch (IOException ioe) {
                // ignore
            }

            FileObject file = info.getFileObject();
            if (file != null) {
                return CodeStyle.getDefault(file);
            }
        }

        return CodeStyle.getDefault((Document)null);
    }

    /**
     *

        }
    }

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


    //XXX: copied from SourceUtils.addImports. Ideally, should be on one place only:
    public static CompilationUnitTree addImports(CompilationUnitTree cut, List<String> toImport, TreeMaker make)
            throws IOException {

    }

    public static boolean isSetter(CompilationInfo info, ExecutableElement el, Element propertyElement) {
        CodeStyle codeStyle = getCodeStyle(info);
        String setterName = CodeStyleUtils.computeSetterName(
                propertyElement.getSimpleName(),
                propertyElement.getModifiers().contains(Modifier.STATIC),
                codeStyle);

        return el.getSimpleName().contentEquals(setterName)
                && el.getReturnType().getKind() == TypeKind.VOID

    }

    public static boolean isGetter(CompilationInfo info, ExecutableElement el, Element propertyElement) {
        CodeStyle codeStyle = getCodeStyle(info);
        String getterName = CodeStyleUtils.computeGetterName(
                propertyElement.getSimpleName(),
                propertyElement.asType().getKind() == TypeKind.BOOLEAN,
                propertyElement.getModifiers().contains(Modifier.STATIC),
                codeStyle);
        return el.getSimpleName().contentEquals(getterName)
                && info.getTypes().isSameType(el.getReturnType(),propertyElement.asType())
                && el.getParameters().isEmpty();
    }
    
    public static String removeFieldPrefixSuffix(Element var, CodeStyle cs) {
        boolean isStatic = var.getModifiers().contains(Modifier.STATIC);
        return CodeStyleUtils.removePrefixSuffix(var.getSimpleName(),
                isStatic ? cs.getStaticFieldNamePrefix() : cs.getFieldNamePrefix(),
                isStatic ? cs.getStaticFieldNameSuffix() : cs.getFieldNameSuffix());
    }
    
    public static String addParamPrefixSuffix(CharSequence name, CodeStyle cs) {
        return CodeStyleUtils.addPrefixSuffix(name,
                cs.getParameterNamePrefix(),
                cs.getParameterNameSuffix());
    }

    public static String getTestMethodName(String propertyName) {
	return "test" + CodeStyleUtils.getCapitalizedName(propertyName); //NOI18N
    }

    public static String getGetterName(String propertyName) {
        return "get" + capitalizeFirstLetter(propertyName); //NOI18N
    }

    public static String getSetterName(String propertyName) {
        return "set" + capitalizeFirstLetter(propertyName); //NOI18N
    }

    /**
     * Utility method capitalizes the first letter of string, used to generate
     * method names for patterns
     *
     * @param str The string for capitalization.
     * @return String with the first letter capitalized.
     */
    private static String capitalizeFirstLetter(String str) {
        if (str == null || str.length() <= 0) {
            return str;
        }

        char chars[] = str.toCharArray();
        chars[0] = Character.toUpperCase(chars[0]);
        return new String(chars);
    }

    public static boolean isWeakerAccess(Set<Modifier> modifiers, Set<Modifier> modifiers0) {




    private static Set<Modifier> accessModifiers = EnumSet.of(Modifier.PRIVATE, Modifier.PROTECTED, Modifier.PUBLIC);
    private static List<Modifier> MODIFIERS = Arrays.asList(Modifier.PRIVATE, null, Modifier.PROTECTED, Modifier.PUBLIC);
    private final EncapsulateFieldRefactoring refactoring;

    /**
     * path in source with field declaration; refactoring.getSelectedObject()
     * may contain path to a reference

        return false;
    }

    /**
     * Removes the class field prefix from the identifer of a field. For
     * example, if the class field prefix is "_", the identifier "_name" is
     * stripped to become "name".
     *
     * @param identifierString The identifer to strip.
     * @return The stripped identifier.
     */
    private static String stripPrefix(String identifierString) {
        String stripped;
        if (identifierString.startsWith(CLASS_FIELD_PREFIX) && identifierString.length() > 1) {
            stripped = identifierString.substring(CLASS_FIELD_PREFIX.length());
        } else {
            stripped = identifierString;
        }
        return stripped;
    }

    private static StringBuilder getCapitalizedName(VariableElement field) {
        StringBuilder name = new StringBuilder(stripPrefix(field.getSimpleName().toString()));

        //Beans naming convention, #165241
        if (name.length() > 1 && Character.isUpperCase(name.charAt(1))) {
            return name;
        }

        name.setCharAt(0, Character.toUpperCase(name.charAt(0)));
        return name;
    }

    public static String computeSetterName(VariableElement field) {
        StringBuilder name = getCapitalizedName(field);

        name.insert(0, "set"); //NOI18N
        return name.toString();
    }

    public static String computeGetterName(VariableElement field) {
        StringBuilder name = getCapitalizedName(field);

        if (TypeKind.BOOLEAN == field.asType().getKind()) { // XXX check autoboxing???
            name.insert(0, "is"); //NOI18N
        } else {
            name.insert(0, "get"); //NOI18N
        }

        return name.toString();
    }

    @Override
    public Problem prepare(RefactoringElementsBag bag) {


                    ClassTree nct = node;
                    List<Tree> newMembers = new ArrayList<Tree>();
                    int getterIdx = 0;
                    VariableTree pcs = null;
                    if (descs.get(0).refactoring.isGeneratePropertyChangeSupport()) {
                        pcs = getPropertyChangeSupport(clazz, "java.beans.PropertyChangeSupport"); //NOI18N
                        if (pcs == null) {
                            pcs = createPropertyChangeSupport("java.beans.PropertyChangeSupport", "propertyChangeSupport");//NOI18N
                            newMembers.add(pcs);
                            }
                        }
                    }

                    VariableTree vcs = null;
                    if (descs.get(0).refactoring.isGenerateVetoableChangeSupport()) {
                        vcs = getPropertyChangeSupport(clazz, "java.beans.VetoableChangeSupport");//NOI18N
                        if (vcs == null) {
                            vcs = createPropertyChangeSupport("java.beans.VetoableChangeSupport", "vetoableChangeSupport");//NOI18N
                            newMembers.add(vcs);
                            }
                        }
                    }
                    CodeStyle cs = RefactoringUtils.getCodeStyle(workingCopy);
                    for (EncapsulateDesc desc : descs) {
                        VariableTree propName = createPropName(clazz, desc);
                        if (pcs!=null) {

                                desc.refactoring.getGetterName(),
                                desc.refactoring.getSetterName(),
                                desc.refactoring.getMethodModifiers(),
                                cs,
                                pcs,
                                vcs,
                                propName);

        }

        private MethodTree[] createGetterAndSetter(
                VariableElement field, String getterName, String setterName,
                Set<Modifier> useModifiers, CodeStyle cs,
                VariableTree propertyChange, VariableTree vetoableChange, VariableTree propName) {


            String fieldName = field.getSimpleName().toString();
            boolean staticMod = field.getModifiers().contains(Modifier.STATIC);
            String fieldName = CodeStyleUtils.removePrefixSuffix(field.getSimpleName(),
                    staticMod ? cs.getStaticFieldNamePrefix() : cs.getFieldNamePrefix(),
                    staticMod ? cs.getStaticFieldNameSuffix() : cs.getFieldNameSuffix());
            
            String longName = (staticMod ? "" : "this.") + fieldName;//NOI18N
            String oldName = "old" + CodeStyleUtils.getCapitalizedName(fieldName);//NOI18N
            String parName = staticMod ? "a" + CodeStyleUtils.getCapitalizedName(fieldName) : fieldName; //NOI18N
            String getterBody = "{return " + field.getSimpleName() + ";}"; //NOI18N
            StringBuilder setterBody = new StringBuilder();
            setterBody.append("{");//NOI18N





import javax.lang.model.util.Types;
import org.netbeans.api.java.source.*;
import org.netbeans.modules.refactoring.api.Problem;
import org.netbeans.modules.refactoring.java.RefactoringUtils;
import org.netbeans.modules.refactoring.java.api.IntroduceLocalExtensionRefactoring;
import org.netbeans.modules.refactoring.java.api.IntroduceLocalExtensionRefactoring.Equality;
import org.netbeans.modules.refactoring.java.spi.RefactoringVisitor;

public class IntroduceLocalExtensionTransformer extends RefactoringVisitor {

    private static final Logger LOG = Logger.getLogger(IntroduceLocalExtensionTransformer.class.getName());
    private static final String DELEGATE = "delegate"; //NOI18N
    private final IntroduceLocalExtensionRefactoring refactoring;
    private Problem problem;
    private String fqn;

            fqn = packageName + '.' + name;

            GeneratorUtilities genUtils = GeneratorUtilities.get(workingCopy);
            CodeStyle cs = RefactoringUtils.getCodeStyle(workingCopy);

            TypeElement source = (TypeElement) refactoring.getRefactoringSource().lookup(TreePathHandle.class).getElementHandle().resolve(workingCopy);



            if (wrap && noInterface) {
                Tree type = make.Type(source.asType());
                VariableTree field = make.Variable(make.Modifiers(EnumSet.of(Modifier.PRIVATE)), DELEGATE, type, null); //NOI18N
                members.add(0, field);
                addFields(source, cs, members);
            }

            if (wrap && noInterface) {

        return super.scan(tree, p);
    }

    private void addFields(TypeElement source, CodeStyle cs, List<Tree> members) throws IllegalStateException {
        for (VariableElement field : ElementFilter.fieldsIn(workingCopy.getElements().getAllMembers(source))) {
            if (!field.getModifiers().contains(Modifier.NATIVE)
                    && field.getModifiers().contains(Modifier.PUBLIC)

                    VariableTree variable = make.Variable(field, make.QualIdent(field));
                    members.add(0, variable);
                } else {
                    MethodTree[] createdGetterAndSetter = createGetterAndSetter(field, field.getModifiers(), cs);
                    String setterName = EncapsulateFieldRefactoringPlugin.computeSetterName(field);
                    MethodTree[] createdGetterAndSetter = createGetterAndSetter(field, getterName, setterName, field.getModifiers());
                    ElementHandle<Element> fieldHandle = ElementHandle.create((Element) field);
                    getterSetterMap.put(fieldHandle, new String[]{
                        createdGetterAndSetter[0].getName().toString(),
                        createdGetterAndSetter[1].getName().toString()});
                    members.addAll(Arrays.asList(createdGetterAndSetter));
                }
            }
        }
    }

    private MethodTree[] createGetterAndSetter(VariableElement field, Set<Modifier> useModifiers, CodeStyle cs) {
        boolean staticMod = field.getModifiers().contains(Modifier.STATIC);
        String getterName = CodeStyleUtils.computeGetterName(field.getSimpleName(), field.asType().getKind() == TypeKind.BOOLEAN, staticMod, cs);
        String setterName = CodeStyleUtils.computeSetterName(field.getSimpleName(), staticMod, cs);
        String fieldName = field.getSimpleName().toString();
        String longName = (staticMod ? "" : "this.") + DELEGATE + "." + fieldName;//NOI18N
        String longName = staticMod ? "delegate." : "this.delegate." + fieldName;//NOI18N
        String parName = staticMod ? "a" + getCapitalizedName(field) : Utilities.isJavaIdentifier(stripPrefix(fieldName)) ? stripPrefix(fieldName) : fieldName; //NOI18N
        String getterBody = "{return " + DELEGATE + "." + fieldName + ";}"; //NOI18N
        StringBuilder setterBody = new StringBuilder();
        setterBody.append("{");//NOI18N
        setterBody.append(longName).append(" = ").append(parName).append(";"); //NOI18N

                 *     return this.delegate.hashCode();
                 * }
                 */
                BlockTree body = make.Block(Collections.singletonList(make.Return(make.MethodInvocation(Collections.EMPTY_LIST, make.MemberSelect(make.Identifier("this.delegate"), "equals"), Collections.singletonList(make.MemberSelect(make.Identifier("o"), DELEGATE))))), false); //NOI18N
                MethodTree method = make.Method(make.Modifiers(EnumSet.of(Modifier.PUBLIC)),
                        "equals" + refactoring.getNewName(), //NOI18N
                        make.PrimitiveType(TypeKind.BOOLEAN),

                statements.add(
                        make.If(make.InstanceOf(make.Identifier("o"), newSimpleTypeTree), make.Block(Collections.singletonList(make.ExpressionStatement(
                        make.Assignment(make.Identifier("target"),
                        make.MemberSelect(make.Parenthesized(make.TypeCast(newSimpleTypeTree, make.Identifier("o"))), DELEGATE)))), false), null));
                statements.add(make.Return(make.MethodInvocation(Collections.EMPTY_LIST, make.Identifier("this.delegate.equals"), Collections.singletonList(make.Identifier("target")))));
                BlockTree body = make.Block(statements, false);
                MethodTree method = make.Method(make.Modifiers(EnumSet.of(Modifier.PUBLIC)),

Lines 53-60 Link Here

(-)a/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/JavaPluginUtils.java (-54 / +108 lines)
53	import javax.lang.model.SourceVersion;	53	import javax.lang.model.SourceVersion;
54	import javax.lang.model.element.Element;	54	import javax.lang.model.element.Element;
55	import javax.lang.model.element.ElementKind;	55	import javax.lang.model.element.ElementKind;
		56	import javax.lang.model.element.ExecutableElement;
		57	import javax.lang.model.element.Modifier;
56	import javax.lang.model.element.TypeElement;	58	import javax.lang.model.element.TypeElement;
		59	import javax.lang.model.element.VariableElement;
57	import javax.lang.model.type.*;	60	import javax.lang.model.type.*;
		61	import javax.lang.model.util.Types;
58	import org.netbeans.api.java.classpath.ClassPath;	62	import org.netbeans.api.java.classpath.ClassPath;
59	import org.netbeans.api.java.source.ClasspathInfo.PathKind;	63	import org.netbeans.api.java.source.ClasspathInfo.PathKind;
60	import org.netbeans.api.java.source.*;	64	import org.netbeans.api.java.source.*;
Lines 296-313 Link Here
296	return source;	300	return source;
297	}	301	}
298		302
		303	public static boolean hasGetter(CompilationInfo info, TypeElement typeElement, VariableElement field, Map<String, List<ExecutableElement>> methods, CodeStyle cs) {
		304	CharSequence name = field.getSimpleName();
		305	assert name.length() > 0;
		306	TypeMirror type = field.asType();
		307	boolean isStatic = field.getModifiers().contains(Modifier.STATIC);
		308	String getterName = CodeStyleUtils.computeGetterName(name, type.getKind() == TypeKind.BOOLEAN, isStatic, cs);
		309	Types types = info.getTypes();
		310	List<ExecutableElement> candidates = methods.get(getterName);
		311	if (candidates != null) {
		312	for (ExecutableElement candidate : candidates) {
		313	if ((!candidate.getModifiers().contains(Modifier.ABSTRACT) \|\| candidate.getEnclosingElement() == typeElement)
		314	&& candidate.getParameters().isEmpty()
		315	&& types.isSameType(candidate.getReturnType(), type))
		316	return true;
		317	}
		318	}
		319	return false;
		320	}
		321
		322	public static boolean hasSetter(CompilationInfo info, TypeElement typeElement, VariableElement field, Map<String, List<ExecutableElement>> methods, CodeStyle cs) {
		323	CharSequence name = field.getSimpleName();
		324	assert name.length() > 0;
		325	TypeMirror type = field.asType();
		326	boolean isStatic = field.getModifiers().contains(Modifier.STATIC);
		327	String setterName = CodeStyleUtils.computeSetterName(name, isStatic, cs);
		328	Types types = info.getTypes();
		329	List<ExecutableElement> candidates = methods.get(setterName);
		330	if (candidates != null) {
		331	for (ExecutableElement candidate : candidates) {
		332	if ((!candidate.getModifiers().contains(Modifier.ABSTRACT) \|\| candidate.getEnclosingElement() == typeElement)
		333	&& candidate.getReturnType().getKind() == TypeKind.VOID
		334	&& candidate.getParameters().size() == 1
		335	&& types.isSameType(candidate.getParameters().get(0).asType(), type))
		336	return true;
		337	}
		338	}
		339	return false;
		340	}
		341
299	//<editor-fold defaultstate="collapsed" desc="TODO: Copy from org.netbeans.modules.java.hints.errors.Utilities">	342	//<editor-fold defaultstate="collapsed" desc="TODO: Copy from org.netbeans.modules.java.hints.errors.Utilities">
300	public static final String DEFAULT_NAME = "par"; // NOI18N	343	public static final String DEFAULT_NAME = "par"; // NOI18N
301	public static String makeNameUnique(CompilationInfo info, Scope s, String name) {	344	public static String makeNameUnique(CompilationInfo info, Scope s, String name) {
302	return makeNameUnique(info, s, name, Collections.EMPTY_LIST);	345	return makeNameUnique(info, s, name, Collections.EMPTY_LIST, null, null);
303	}	346	}
		347
304	public static String makeNameUnique(CompilationInfo info, Scope s, String name, List<String> definedIds) {	348	public static String makeNameUnique(CompilationInfo info, Scope s, String name, List<String> definedIds) {
		349	return makeNameUnique(info, s, name, definedIds, null, null);
		350	}
		351
		352	public static String makeNameUnique(CompilationInfo info, Scope s, String name, String prefix, String suffix) {
		353	return makeNameUnique(info, s, name, Collections.EMPTY_LIST, prefix, suffix);
		354	}
		355
		356	public static String makeNameUnique(CompilationInfo info, Scope s, String name, List<String> definedIds, String prefix, String suffix) {
		357	boolean cont;
		358	String proposedName;
		359	name = CodeStyleUtils.addPrefixSuffix(name, prefix, null);
305	int counter = 0;	360	int counter = 0;
306	boolean cont = true;	361	do {
307	String proposedName = name;	362	proposedName = name + (counter != 0 ? String.valueOf(counter) : "") + safeString(suffix);
308
309	while (cont) {
310	proposedName = (counter != 0 ? name + String.valueOf(counter) : name);
311		363
312	cont = false;	364	cont = false;
313		365
Lines 320-339 Link Here
320	}	372	}
321	}	373	}
322	for (Element e : info.getElementUtilities().getLocalMembersAndVars(s, new VariablesFilter())) {	374	for (Element e : info.getElementUtilities().getLocalMembersAndVars(s, new VariablesFilter())) {
323	if (proposedName.equals(e.getSimpleName().toString())) {	375	if (proposedName.equals(e.getSimpleName().toString())) {
324	counter++;	376	counter++;
325	cont = true;	377	cont = true;
326	break;	378	break;
327	}	379	}
328	}	380	}
329	}	381	}
330	}	382	} while(cont);
331		383
332	return proposedName;	384	return proposedName;
333	}	385	}
334		386
335	public static String getName(Tree et) {	387	private static String safeString(String str) {
336	return adjustName(getNameRaw(et));	388	return str == null ? "" : str;
337	}	389	}
338		390
339	public static String getName(TypeMirror tm) {	391	public static String getName(TypeMirror tm) {
Lines 352-384 Link Here
352	}	404	}
353	}	405	}
354		406
		407	public static String getName(ExpressionTree et) {
		408	return getName((Tree) et);
		409	}
		410
		411	public static String getName(Tree et) {
		412	return adjustName(getNameRaw(et));
		413	}
		414
355	private static String getNameRaw(Tree et) {	415	private static String getNameRaw(Tree et) {
356	if (et == null) {	416	if (et == null)
357	return null;	417	return null;
358	}	418
359
360	switch (et.getKind()) {	419	switch (et.getKind()) {
361	case IDENTIFIER:	420	case IDENTIFIER:
362	return ((IdentifierTree) et).getName().toString();	421	return ((IdentifierTree) et).getName().toString();
363	case METHOD_INVOCATION:	422	case METHOD_INVOCATION:
364	return getName(((MethodInvocationTree) et).getMethodSelect());	423	return getNameRaw(((MethodInvocationTree) et).getMethodSelect());
365	case MEMBER_SELECT:	424	case MEMBER_SELECT:
366	return ((MemberSelectTree) et).getIdentifier().toString();	425	return ((MemberSelectTree) et).getIdentifier().toString();
367	case NEW_CLASS:	426	case NEW_CLASS:
368	return firstToLower(getName(((NewClassTree) et).getIdentifier()));	427	return firstToLower(getNameRaw(((NewClassTree) et).getIdentifier()));
369	case PARAMETERIZED_TYPE:	428	case PARAMETERIZED_TYPE:
370	return firstToLower(getName(((ParameterizedTypeTree) et).getType()));	429	return firstToLower(getNameRaw(((ParameterizedTypeTree) et).getType()));
371	case STRING_LITERAL:	430	case STRING_LITERAL:
372	String name = guessLiteralName((String) ((LiteralTree) et).getValue());	431	String name = guessLiteralName((String) ((LiteralTree) et).getValue());
373	if(name == null) {	432	if(name == null) {
374	return firstToLower(String.class.getSimpleName());	433	return firstToLower(String.class.getSimpleName());
375	} else {	434	} else {
376	return firstToLower(name);	435	return firstToLower(name);
377	}	436	}
378	case VARIABLE:	437	case VARIABLE:
379	return ((VariableTree) et).getName().toString();	438	return ((VariableTree) et).getName().toString();
380	default:	439	default:
381	return null;	440	return null;
382	}	441	}
383	}	442	}
384		443
Lines 412-434 Link Here
412	if (name.length() == 0) {	471	if (name.length() == 0) {
413	return null;	472	return null;
414	}	473	}
415		474
416	StringBuilder result = new StringBuilder();	475	StringBuilder result = new StringBuilder();
417	boolean toLower = true;	476	boolean toLower = true;
418	char last = Character.toLowerCase(name.charAt(0));	477	char last = Character.toLowerCase(name.charAt(0));
419		478
420	for (int i = 1; i < name.length(); i++) {	479	for (int i = 1; i < name.length(); i++) {
421	if (toLower && Character.isUpperCase(name.charAt(i))) {	480	if (toLower && (Character.isUpperCase(name.charAt(i)) \|\| name.charAt(i) == '_')) {
422	result.append(Character.toLowerCase(last));	481	result.append(Character.toLowerCase(last));
423	} else {	482	} else {
424	result.append(last);	483	result.append(last);
425	toLower = false;	484	toLower = false;
426	}	485	}
427	last = name.charAt(i);	486	last = name.charAt(i);
428		487
429	}	488	}
430		489
431	result.append(last);	490	result.append(toLower ? Character.toLowerCase(last) : last);
432		491
433	if (SourceVersion.isKeyword(result)) {	492	if (SourceVersion.isKeyword(result)) {
434	return "a" + name;	493	return "a" + name;
Lines 438-462 Link Here
438	}	497	}
439		498
440	private static String guessLiteralName(String str) {	499	private static String guessLiteralName(String str) {
441	StringBuilder sb = new StringBuilder();	500	if(str.isEmpty()) {
442	if(str.length() == 0) {
443	return null;	501	return null;
444	}	502	}
445	char first = str.charAt(0);
446	if(Character.isJavaIdentifierStart(str.charAt(0))) {
447	sb.append(first);
448	}
449		503
450	for (int i = 1; i < str.length(); i++) {	504	StringBuilder sb = new StringBuilder();
		505
		506	for (int i = 0; i < str.length(); i++) {
451	char ch = str.charAt(i);	507	char ch = str.charAt(i);
452	if(ch == ' ') {	508	if(ch == ' ') {
453	sb.append('_');	509	sb.append('_');
454	continue;	510	} else if (sb.length() == 0 ? Character.isJavaIdentifierStart(ch) : Character.isJavaIdentifierPart(ch)) {
455	}
456	if (Character.isJavaIdentifierPart(ch)) {
457	sb.append(ch);	511	sb.append(ch);
458	}	512	}
459	if (i > 40) {	513	if (sb.length() > 40) {
460	break;	514	break;
461	}	515	}
462	}	516	}

Lines 44-51 Link Here

(-)a/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/RenamePropertyRefactoringPlugin.java (-7 / +39 lines)
44	import java.io.IOException;	44	import java.io.IOException;
45	import javax.lang.model.element.Element;	45	import javax.lang.model.element.Element;
46	import javax.lang.model.element.ExecutableElement;	46	import javax.lang.model.element.ExecutableElement;
		47	import javax.lang.model.element.Modifier;
		48	import javax.lang.model.element.Name;
47	import javax.lang.model.element.VariableElement;	49	import javax.lang.model.element.VariableElement;
		50	import javax.lang.model.type.TypeKind;
48	import javax.lang.model.util.ElementFilter;	51	import javax.lang.model.util.ElementFilter;
		52	import org.netbeans.api.java.source.CodeStyle;
		53	import org.netbeans.api.java.source.CodeStyleUtils;
49	import org.netbeans.api.java.source.CompilationController;	54	import org.netbeans.api.java.source.CompilationController;
50	import org.netbeans.api.java.source.JavaSource;	55	import org.netbeans.api.java.source.JavaSource;
51	import org.netbeans.api.java.source.Task;	56	import org.netbeans.api.java.source.Task;
Lines 68-73 Link Here
68		73
69	private RenameRefactoring refactoring;	74	private RenameRefactoring refactoring;
70	private TreePathHandle property;	75	private TreePathHandle property;
		76	private CodeStyle codeStyle;
		77	private boolean isStatic;
		78	private boolean isBoolean;
71	private RenameRefactoring getterDelegate;	79	private RenameRefactoring getterDelegate;
72	private RenameRefactoring setterDelegate;	80	private RenameRefactoring setterDelegate;
73	private RenameRefactoring parameterDelegate;	81	private RenameRefactoring parameterDelegate;
Lines 122-142 Link Here
122		130
123	Problem p = null;	131	Problem p = null;
124	if (getterDelegate != null) {	132	if (getterDelegate != null) {
125	getterDelegate.setNewName(RefactoringUtils.getGetterName(refactoring.getNewName()));	133	String gettername = CodeStyleUtils.computeGetterName(
		134	refactoring.getNewName(), isBoolean, isStatic, codeStyle);
		135	getterDelegate.setNewName(gettername);
126	p = JavaPluginUtils.chainProblems(p, getterDelegate.fastCheckParameters());	136	p = JavaPluginUtils.chainProblems(p, getterDelegate.fastCheckParameters());
127	if (p != null && p.isFatal()) {	137	if (p != null && p.isFatal()) {
128	return p;	138	return p;
129	}	139	}
130	}	140	}
131	if (setterDelegate != null) {	141	if (setterDelegate != null) {
132	setterDelegate.setNewName(RefactoringUtils.getSetterName(refactoring.getNewName()));	142	String settername = CodeStyleUtils.computeSetterName(
		143	refactoring.getNewName(), isStatic, codeStyle);
		144	setterDelegate.setNewName(settername);
133	p = JavaPluginUtils.chainProblems(p, setterDelegate.fastCheckParameters());	145	p = JavaPluginUtils.chainProblems(p, setterDelegate.fastCheckParameters());
134	if (p != null && p.isFatal()) {	146	if (p != null && p.isFatal()) {
135	return p;	147	return p;
136	}	148	}
137	}	149	}
138	if (parameterDelegate != null) {	150	if (parameterDelegate != null) {
139	parameterDelegate.setNewName(refactoring.getNewName());	151	String newParam = RefactoringUtils.addParamPrefixSuffix(
		152	CodeStyleUtils.removePrefixSuffix(
		153	refactoring.getNewName(),
		154	isStatic ? codeStyle.getStaticFieldNamePrefix() : codeStyle.getFieldNamePrefix(),
		155	isStatic ? codeStyle.getStaticFieldNameSuffix() : codeStyle.getFieldNameSuffix()), codeStyle);
		156	parameterDelegate.setNewName(newParam);
140	p = JavaPluginUtils.chainProblems(p, parameterDelegate.fastCheckParameters());	157	p = JavaPluginUtils.chainProblems(p, parameterDelegate.fastCheckParameters());
141	if (p != null && p.isFatal()) {	158	if (p != null && p.isFatal()) {
142	return p;	159	return p;
Lines 224-245 Link Here
224	}	241	}
225	try {	242	try {
226	getJavaSource(Phase.PREPARE).runUserActionTask(new Task<CompilationController>() {	243	getJavaSource(Phase.PREPARE).runUserActionTask(new Task<CompilationController>() {
		244	private String propName;
227		245
228	@Override	246	@Override
229	public void run(CompilationController p) throws Exception {	247	public void run(CompilationController p) throws Exception {
230	p.toPhase(JavaSource.Phase.RESOLVED);	248	p.toPhase(JavaSource.Phase.RESOLVED);
		249	codeStyle = RefactoringUtils.getCodeStyle(p);
231	Element propertyElement = property.resolveElement(p);	250	Element propertyElement = property.resolveElement(p);
		251	isStatic = propertyElement.getModifiers().contains(Modifier.STATIC);
		252	isBoolean = propertyElement.asType().getKind() == TypeKind.BOOLEAN;
		253	propName = RefactoringUtils.removeFieldPrefixSuffix(propertyElement, codeStyle);
		254	String paramName = RefactoringUtils.addParamPrefixSuffix(propName, codeStyle);
		255	String newParam = RefactoringUtils.addParamPrefixSuffix(
		256	CodeStyleUtils.removePrefixSuffix(
		257	refactoring.getNewName(),
		258	isStatic ? codeStyle.getStaticFieldNamePrefix() : codeStyle.getFieldNamePrefix(),
		259	isStatic ? codeStyle.getStaticFieldNameSuffix() : codeStyle.getFieldNameSuffix()), codeStyle);
232	for (ExecutableElement el : ElementFilter.methodsIn(propertyElement.getEnclosingElement().getEnclosedElements())) {	260	for (ExecutableElement el : ElementFilter.methodsIn(propertyElement.getEnclosingElement().getEnclosedElements())) {
233	if (RefactoringUtils.isGetter(p, el, propertyElement)) {	261	if (RefactoringUtils.isGetter(p, el, propertyElement)) {
234	getterDelegate = new RenameRefactoring(Lookups.singleton(TreePathHandle.create(el, p)));	262	getterDelegate = new RenameRefactoring(Lookups.singleton(TreePathHandle.create(el, p)));
235	getterDelegate.setNewName(RefactoringUtils.getGetterName(refactoring.getNewName()));	263	String gettername = CodeStyleUtils.computeGetterName(
		264	refactoring.getNewName(), isBoolean, isStatic, codeStyle);
		265	getterDelegate.setNewName(gettername);
236	} else if (RefactoringUtils.isSetter(p, el, propertyElement)) {	266	} else if (RefactoringUtils.isSetter(p, el, propertyElement)) {
237	setterDelegate = new RenameRefactoring(Lookups.singleton(TreePathHandle.create(el, p)));	267	setterDelegate = new RenameRefactoring(Lookups.singleton(TreePathHandle.create(el, p)));
238	setterDelegate.setNewName(RefactoringUtils.getSetterName(refactoring.getNewName()));	268	String settername = CodeStyleUtils.computeSetterName(
		269	refactoring.getNewName(), isStatic, codeStyle);
		270	setterDelegate.setNewName(settername);
239	VariableElement par = el.getParameters().iterator().next();	271	VariableElement par = el.getParameters().iterator().next();
240	if (par.getSimpleName().contentEquals(propertyElement.getSimpleName())) {	272	if (par.getSimpleName().contentEquals(paramName)) {
241	parameterDelegate = new RenameRefactoring(Lookups.singleton(TreePathHandle.create(p.getTrees().getPath(par), p)));	273	parameterDelegate = new RenameRefactoring(Lookups.singleton(TreePathHandle.create(p.getTrees().getPath(par), p)));
242	parameterDelegate.setNewName(refactoring.getNewName());	274	parameterDelegate.setNewName(newParam);
243	}	275	}
244	}	276	}
245	}	277	}




    private boolean methodNameChanged;
    private boolean returnTypeChanged;
    private boolean isConstructor;
    private final String paramname;
    
    @Override
    public Component getComponent() {

    private static final String ACTION_INLINE_EDITOR = "invokeInlineEditor";  //NOI18N

    /** Creates new form ChangeMethodSignature */
    public ChangeParametersPanel(TreePathHandle refactoredObj, ChangeListener parent, ParameterInfo[] preConfiguration, CodeStyle cs) {
        returnTypeDocListener = new ReturnTypeDocListener();
        methodNameDocListener = new MethodNameDocListener();
        this.refactoredObj = refactoredObj;

        model = new ParamTableModel(columnNames, 0);
        this.returnTypeAction = new ReturnTypeAction();
        singleLineEditor = Utilities.createSingleLineEditor(MIME_JAVA);
        paramname = CodeStyleUtils.addPrefixSuffix("par", cs.getParameterNamePrefix(), cs.getParameterNameSuffix());

        initComponents();

        InputMap im = paramTable.getInputMap(JTable.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);

    private void addButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addButtonActionPerformed
        acceptEditedValue(); 
        int rowCount = model.getRowCount();
        model.addRow(new Object[] { "Object", paramname + rowCount, "null", new Integer(-1), Boolean.TRUE }); // NOI18N
        paramTable.scrollRectToVisible(paramTable.getCellRect(rowCount, 0, false));
        paramTable.changeSelection(rowCount, 0, false, false);
        autoEdit(paramTable);




import javax.lang.model.type.TypeKind;
import javax.swing.event.ChangeListener;
import org.netbeans.api.fileinfo.NonRecursiveFolder;
import org.netbeans.api.java.source.CodeStyle;
import org.netbeans.api.java.source.CompilationInfo;
import org.netbeans.api.java.source.TreePathHandle;
import org.netbeans.modules.refactoring.api.AbstractRefactoring;

    private boolean isMethod;
    private ChangeParametersRefactoring.ParameterInfo[] preConfiguration;
    private Lookup lookup;
    private CodeStyle cs;
    
    /** Creates a new instance of ChangeMethodSignatureRefactoring */
    private ChangeParametersUI(TreePathHandle refactoredObj, CompilationInfo info, ParameterInfo[] preConfiguration, CodeStyle cs) {
        this.refactoring = new ChangeParametersRefactoring(refactoredObj);
        this.method = refactoredObj;
        this.preConfiguration = preConfiguration;
        Element element = method.resolveElement(info);
        this.name = element.getSimpleName().toString();
        this.isMethod = element.getKind() == ElementKind.METHOD;
        this.cs = cs;
    }

    private ChangeParametersUI(Lookup lookup) {

        }
        
        return path != null
                ? new ChangeParametersUI(TreePathHandle.create(path, info), info, configuration, CodeStyle.getDefault(info.getFileObject()))
                : null;
    }
    

    @Override
    public CustomRefactoringPanel getPanel(ChangeListener parent) {
        if (panel == null) {
            panel = new ChangeParametersPanel(method, parent, preConfiguration, cs);
        }
        return panel;
    }

Lines 52-57 Link Here

(-)a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/EncapsulateFieldPanel.java (-2 / +6 lines)
52	import java.io.IOException;	52	import java.io.IOException;
53	import java.util.*;	53	import java.util.*;
54	import javax.lang.model.element.*;	54	import javax.lang.model.element.*;
		55	import javax.lang.model.type.TypeKind;
55	import javax.swing.*;	56	import javax.swing.*;
56	import javax.swing.event.ChangeListener;	57	import javax.swing.event.ChangeListener;
57	import javax.swing.event.TableModelEvent;	58	import javax.swing.event.TableModelEvent;
Lines 62-67 Link Here
62	import org.netbeans.api.java.source.*;	63	import org.netbeans.api.java.source.*;
63	import org.netbeans.api.java.source.ui.ElementHeaders;	64	import org.netbeans.api.java.source.ui.ElementHeaders;
64	import org.netbeans.modules.refactoring.java.RefactoringModule;	65	import org.netbeans.modules.refactoring.java.RefactoringModule;
		66	import org.netbeans.modules.refactoring.java.RefactoringUtils;
65	import org.netbeans.modules.refactoring.java.api.MemberInfo;	67	import org.netbeans.modules.refactoring.java.api.MemberInfo;
66	import org.netbeans.modules.refactoring.java.plugins.EncapsulateFieldRefactoringPlugin;	68	import org.netbeans.modules.refactoring.java.plugins.EncapsulateFieldRefactoringPlugin;
67	import org.netbeans.modules.refactoring.java.ui.EncapsulateFieldsRefactoring.EncapsulateFieldInfo;	69	import org.netbeans.modules.refactoring.java.ui.EncapsulateFieldsRefactoring.EncapsulateFieldInfo;
Lines 188-195 Link Here
188	TreePath fieldTPath = javac.getTrees().getPath(field);	190	TreePath fieldTPath = javac.getTrees().getPath(field);
189	boolean createGetter = fields !=null? fields.contains(TreePathHandle.create(field, javac)) : selectedElm == field ;	191	boolean createGetter = fields !=null? fields.contains(TreePathHandle.create(field, javac)) : selectedElm == field ;
190	boolean createSetter = createGetter && !field.getModifiers().contains(Modifier.FINAL);	192	boolean createSetter = createGetter && !field.getModifiers().contains(Modifier.FINAL);
191	String getName = EncapsulateFieldRefactoringPlugin.computeGetterName(field);	193	CodeStyle cs = RefactoringUtils.getCodeStyle(javac);
192	String setName = EncapsulateFieldRefactoringPlugin.computeSetterName(field);	194	boolean staticMod = field.getModifiers().contains(Modifier.STATIC);
		195	String getName = CodeStyleUtils.computeGetterName(field.getSimpleName(), field.asType().getKind() == TypeKind.BOOLEAN, staticMod, cs);
		196	String setName = CodeStyleUtils.computeSetterName(field.getSimpleName(), staticMod, cs);
193	model.addRow(new Object[] {	197	model.addRow(new Object[] {
194	MemberInfo.create(fieldTPath, javac),	198	MemberInfo.create(fieldTPath, javac),
195	createGetter ? Boolean.TRUE : Boolean.FALSE,	199	createGetter ? Boolean.TRUE : Boolean.FALSE,

Lines 59-64 Link Here

(-)a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/IntroduceParameterPanel.java (-1 / +9 lines)
59	import javax.swing.text.Position;	59	import javax.swing.text.Position;
60	import org.netbeans.api.editor.DialogBinding;	60	import org.netbeans.api.editor.DialogBinding;
61	import org.netbeans.api.java.source.CancellableTask;	61	import org.netbeans.api.java.source.CancellableTask;
		62	import org.netbeans.api.java.source.CodeStyle;
62	import org.netbeans.api.java.source.CompilationController;	63	import org.netbeans.api.java.source.CompilationController;
63	import org.netbeans.api.java.source.JavaSource;	64	import org.netbeans.api.java.source.JavaSource;
64	import org.netbeans.api.java.source.TreePathHandle;	65	import org.netbeans.api.java.source.TreePathHandle;
Lines 170-176 Link Here
170	TreePath bodyPath = new TreePath(methodPath, methodTree.getBody());	171	TreePath bodyPath = new TreePath(methodPath, methodTree.getBody());
171	scope = info.getTrees().getScope(bodyPath);	172	scope = info.getTrees().getScope(bodyPath);
172		173
173	final String parameterName = JavaPluginUtils.makeNameUnique(info, scope, name);	174	CodeStyle cs;
		175	Document doc = info.getDocument();
		176	if(doc != null) {
		177	cs = CodeStyle.getDefault(doc);
		178	} else {
		179	cs = CodeStyle.getDefault(info.getFileObject());
		180	}
		181	final String parameterName = JavaPluginUtils.makeNameUnique(info, scope, name, cs.getParameterNamePrefix(), cs.getParameterNameSuffix());
174		182
175	SwingUtilities.invokeLater(new Runnable() {	183	SwingUtilities.invokeLater(new Runnable() {
176	@Override	184	@Override




import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.VariableElement;
import javax.lang.model.type.TypeKind;
import javax.lang.model.util.ElementFilter;
import org.netbeans.api.java.source.CodeStyle;
import org.netbeans.api.java.source.CodeStyleUtils;
import org.netbeans.api.java.source.CompilationController;
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.Task;
import org.netbeans.api.java.source.TreePathHandle;
import org.netbeans.modules.java.source.save.DiffContext;
import org.netbeans.modules.refactoring.api.Problem;
import org.netbeans.modules.refactoring.api.RefactoringSession;
import org.netbeans.modules.refactoring.java.plugins.EncapsulateFieldRefactoringPlugin;
import org.netbeans.modules.refactoring.java.ui.EncapsulateFieldsRefactoring;
import org.openide.filesystems.FileObject;


            public void run(CompilationController info) throws Exception {
                info.toPhase(JavaSource.Phase.RESOLVED);
                CompilationUnitTree cut = info.getCompilationUnit();
                CodeStyle cs = DiffContext.getCodeStyle(info);
                final ClassTree classTree = (ClassTree) cut.getTypeDecls().get(0);
                final TreePath classPath = info.getTrees().getPath(cut, classTree);
                TypeElement classEl = (TypeElement) info.getTrees().getElement(classPath);

                LinkedList<EncapsulateFieldsRefactoring.EncapsulateFieldInfo> fields = new LinkedList<EncapsulateFieldsRefactoring.EncapsulateFieldInfo>();
                for (int p : position) {
                    VariableElement field = fieldsIn.get(p);
                    boolean staticMod = field.getModifiers().contains(Modifier.STATIC);
                    String getName = CodeStyleUtils.computeGetterName(field.getSimpleName(), field.asType().getKind() == TypeKind.BOOLEAN, staticMod, cs);
                    String setName = CodeStyleUtils.computeSetterName(field.getSimpleName(), staticMod, cs);
                    EncapsulateFieldsRefactoring.EncapsulateFieldInfo encInfo = new EncapsulateFieldsRefactoring.EncapsulateFieldInfo(TreePathHandle.create(field, info), getName, setName);
                    fields.add(encInfo);
                }

Lines 131-137 Link Here

(-)a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/RefactoringTestBase.java (-1 / +1 lines)
131	assertNotNull(f);	131	assertNotNull(f);
132	assertNotNull(f.content);	132	assertNotNull(f.content);
133	assertNotNull("Cannot find " + f.filename + " in map " + content, fileContent);	133	assertNotNull("Cannot find " + f.filename + " in map " + content, fileContent);
134	assertEquals(getName() ,f.content.replaceAll("[ \t\n]+", " "), fileContent.replaceAll("[ \t\n]+", " "));	134	assertEquals(getName() ,f.content.replaceAll("[ \t\r\n\n]+", " "), fileContent.replaceAll("[ \t\r\n\n]+", " "));
135	}	135	}
136		136
137	assertTrue(content.toString(), content.isEmpty());	137	assertTrue(content.toString(), content.isEmpty());

Return to bug 228870

Lines 53-58 Link Here

(-)a/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionItem.java (-11 / +23 lines)
53	import java.awt.Graphics;	53	import java.awt.Graphics;
54	import java.awt.event.InputEvent;	54	import java.awt.event.InputEvent;
55	import java.awt.event.KeyEvent;	55	import java.awt.event.KeyEvent;
		56	import java.io.IOException;
56	import java.net.URL;	57	import java.net.URL;
57	import java.util.*;	58	import java.util.*;
58	import java.util.concurrent.atomic.AtomicBoolean;	59	import java.util.concurrent.atomic.AtomicBoolean;
Lines 211-221 Link Here
211	}	212	}
212	}	213	}
213		214
214	public static JavaCompletionItem createGetterSetterMethodItem(CompilationInfo info, VariableElement elem, TypeMirror type, int substitutionOffset, boolean setter) {	215	public static JavaCompletionItem createGetterSetterMethodItem(CompilationInfo info, VariableElement elem, TypeMirror type, int substitutionOffset, String name, boolean setter) {
215	switch (elem.getKind()) {	216	switch (elem.getKind()) {
216	case ENUM_CONSTANT:	217	case ENUM_CONSTANT:
217	case FIELD:	218	case FIELD:
218	return new GetterSetterMethodItem(info, elem, type, substitutionOffset, setter);	219	return new GetterSetterMethodItem(info, elem, type, substitutionOffset, name, setter);
219	default:	220	default:
220	throw new IllegalArgumentException("kind=" + elem.getKind());	221	throw new IllegalArgumentException("kind=" + elem.getKind());
221	}	222	}
Lines 1881-1903 Link Here
1881		1882
1882	protected ElementHandle<VariableElement> elementHandle;	1883	protected ElementHandle<VariableElement> elementHandle;
1883	private boolean setter;	1884	private boolean setter;
1884	private String simpleName;	1885	private String paramName;
1885	private String name;	1886	private String name;
1886	private String typeName;	1887	private String typeName;
1887	private String sortText;	1888	private String sortText;
1888	private String leftText;	1889	private String leftText;
1889	private String rightText;	1890	private String rightText;
1890		1891
1891	private GetterSetterMethodItem(CompilationInfo info, VariableElement elem, TypeMirror type, int substitutionOffset, boolean setter) {	1892	private GetterSetterMethodItem(CompilationInfo info, VariableElement elem, TypeMirror type, int substitutionOffset, String name, boolean setter) {
1892	super(substitutionOffset);	1893	super(substitutionOffset);
1893	this.elementHandle = ElementHandle.create(elem);	1894	this.elementHandle = ElementHandle.create(elem);
1894	this.setter = setter;	1895	this.setter = setter;
1895	this.simpleName = elem.getSimpleName().toString();	1896	CodeStyle cs = null;
1896	if (setter) {	1897	try {
1897	this.name = "set" + GeneratorUtils.getCapitalizedName(simpleName); //NOI18N	1898	cs = CodeStyle.getDefault(info.getDocument());
1898	} else {	1899	} catch (IOException ex) {
1899	this.name = (elem.asType().getKind() == TypeKind.BOOLEAN ? "is" : "get") + GeneratorUtils.getCapitalizedName(simpleName); //NOI18N
1900	}	1900	}
		1901	if (cs == null) {
		1902	cs = CodeStyle.getDefault(info.getFileObject());
		1903	}
		1904	boolean isStatic = elem.getModifiers().contains(Modifier.STATIC);
		1905	String simpleName = CodeStyleUtils.removePrefixSuffix(elem.getSimpleName(),
		1906	isStatic ? cs.getStaticFieldNamePrefix() : cs.getFieldNamePrefix(),
		1907	isStatic ? cs.getStaticFieldNameSuffix() : cs.getFieldNameSuffix());
		1908	this.paramName = CodeStyleUtils.addPrefixSuffix(
		1909	simpleName,
		1910	cs.getParameterNamePrefix(),
		1911	cs.getParameterNameSuffix());
		1912	this.name = name;
1901	this.typeName = Utilities.getTypeName(info, type, false).toString();	1913	this.typeName = Utilities.getTypeName(info, type, false).toString();
1902	}	1914	}
1903		1915
Lines 1939-1945 Link Here
1939	lText.append(escape(typeName));	1951	lText.append(escape(typeName));
1940	lText.append(' ');	1952	lText.append(' ');
1941	lText.append(PARAMETER_NAME_COLOR);	1953	lText.append(PARAMETER_NAME_COLOR);
1942	lText.append(simpleName);	1954	lText.append(paramName);
1943	lText.append(COLOR_END);	1955	lText.append(COLOR_END);
1944	}	1956	}
1945	lText.append(") - "); //NOI18N	1957	lText.append(") - "); //NOI18N
Lines 2030-2036 Link Here
2030	if (setter) {	2042	if (setter) {
2031	sb.append(typeName);	2043	sb.append(typeName);
2032	sb.append(' ');	2044	sb.append(' ');
2033	sb.append(simpleName);	2045	sb.append(paramName);
2034	}	2046	}
2035	sb.append(") - "); //NOI18N	2047	sb.append(") - "); //NOI18N
2036	sb.append(GENERATE_TEXT);	2048	sb.append(GENERATE_TEXT);

Lines 245-250 Link Here

(-)a/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionProvider.java (-11 / +38 lines)
245		245
246	private ElementHandle element;	246	private ElementHandle element;
247	private boolean hasTask;	247	private boolean hasTask;
		248	private CodeStyle codeStyle;
248		249
249	private JavaCompletionQuery(int queryType, int caretOffset, boolean hasTask) {	250	private JavaCompletionQuery(int queryType, int caretOffset, boolean hasTask) {
250	this.queryType = queryType;	251	this.queryType = queryType;
Lines 268-273 Link Here
268	@Override	269	@Override
269	protected void prepareQuery(JTextComponent component) {	270	protected void prepareQuery(JTextComponent component) {
270	this.component = component;	271	this.component = component;
		272	this.codeStyle = CodeStyle.getDefault(component.getDocument());
271	if (queryType == TOOLTIP_QUERY_TYPE) {	273	if (queryType == TOOLTIP_QUERY_TYPE) {
272	this.toolTip = new MethodParamsTipPaintComponent(component);	274	this.toolTip = new MethodParamsTipPaintComponent(component);
273	}	275	}
Lines 2615-2620 Link Here
2615	}	2617	}
2616	controller.toPhase(Phase.ELEMENTS_RESOLVED);	2618	controller.toPhase(Phase.ELEMENTS_RESOLVED);
2617	boolean isConst = parent.getKind() == Tree.Kind.VARIABLE && ((VariableTree)parent).getModifiers().getFlags().containsAll(EnumSet.of(FINAL, STATIC));	2619	boolean isConst = parent.getKind() == Tree.Kind.VARIABLE && ((VariableTree)parent).getModifiers().getFlags().containsAll(EnumSet.of(FINAL, STATIC));
		2620	boolean preferLong = false;
		2621	String csPrefix = null;
		2622	String csSuffix = null;
		2623	if(codeStyle != null) {
		2624	preferLong = codeStyle.preferLongerNames();
		2625	if(env.getScope().getEnclosingMethod() == null) {
		2626	if(exPath.getParentPath().getParentPath().getLeaf().getKind() == Tree.Kind.METHOD) {
		2627	csPrefix = codeStyle.getParameterNamePrefix();
		2628	csSuffix = codeStyle.getParameterNameSuffix();
		2629	} else if(((VariableTree)parent).getModifiers().getFlags().contains(STATIC)) {
		2630	csPrefix = codeStyle.getStaticFieldNamePrefix();
		2631	csSuffix = codeStyle.getStaticFieldNameSuffix();
		2632	} else {
		2633	csPrefix = codeStyle.getFieldNamePrefix();
		2634	csSuffix = codeStyle.getFieldNameSuffix();
		2635	}
		2636	} else {
		2637	csPrefix = codeStyle.getLocalVarNamePrefix();
		2638	csSuffix = codeStyle.getLocalVarNameSuffix();
		2639	}
		2640	}
2618	if (et.getKind() == Tree.Kind.ANNOTATED_TYPE) {	2641	if (et.getKind() == Tree.Kind.ANNOTATED_TYPE) {
2619	et = ((AnnotatedTypeTree)et).getUnderlyingType();	2642	et = ((AnnotatedTypeTree)et).getUnderlyingType();
2620	exPath = new TreePath(exPath, et);	2643	exPath = new TreePath(exPath, et);
Lines 2631-2637 Link Here
2631	!illegalForwardRefs.contains(e);	2654	!illegalForwardRefs.contains(e);
2632	}	2655	}
2633	};	2656	};
2634	for (String name : Utilities.varNamesSuggestions(tm, null, prefix, controller.getTypes(), controller.getElements(), controller.getElementUtilities().getLocalMembersAndVars(scope, acceptor), isConst))	2657	for (String name : Utilities.varNamesSuggestions(tm, null, prefix, controller.getTypes(), controller.getElements(), controller.getElementUtilities().getLocalMembersAndVars(scope, acceptor), isConst, csPrefix, csSuffix, preferLong))
2635	results.add(JavaCompletionItem.createVariableItem(env.getController(), name, anchorOffset, true, false));	2658	results.add(JavaCompletionItem.createVariableItem(env.getController(), name, anchorOffset, true, false));
2636	return;	2659	return;
2637	}	2660	}
Lines 2663-2669 Link Here
2663	!illegalForwardRefs.contains(e);	2686	!illegalForwardRefs.contains(e);
2664	}	2687	}
2665	};	2688	};
2666	for (String name : Utilities.varNamesSuggestions(tm, null, prefix, controller.getTypes(), controller.getElements(), controller.getElementUtilities().getLocalMembersAndVars(scope, acceptor), isConst))	2689	for (String name : Utilities.varNamesSuggestions(tm, null, prefix, controller.getTypes(), controller.getElements(),
		2690	controller.getElementUtilities().getLocalMembersAndVars(scope, acceptor), isConst,
		2691	csPrefix, csSuffix, preferLong))
2667	results.add(JavaCompletionItem.createVariableItem(env.getController(), name, anchorOffset, true, false));	2692	results.add(JavaCompletionItem.createVariableItem(env.getController(), name, anchorOffset, true, false));
2668	}	2693	}
2669	VariableElement ve = getFieldOrVar(env, e.getSimpleName().toString());	2694	VariableElement ve = getFieldOrVar(env, e.getSimpleName().toString());
Lines 2691-2697 Link Here
2691	!illegalForwardRefs.contains(e);	2716	!illegalForwardRefs.contains(e);
2692	}	2717	}
2693	};	2718	};
2694	for (String name : Utilities.varNamesSuggestions(controller.getTypes().getDeclaredType(te), null, prefix, controller.getTypes(), controller.getElements(), controller.getElementUtilities().getLocalMembersAndVars(scope, acceptor), isConst))	2719	for (String name : Utilities.varNamesSuggestions(controller.getTypes().getDeclaredType(te), null, prefix, controller.getTypes(),
		2720	controller.getElements(), controller.getElementUtilities().getLocalMembersAndVars(scope, acceptor), isConst,
		2721	csPrefix, csSuffix, preferLong))
2695	results.add(JavaCompletionItem.createVariableItem(env.getController(), name, anchorOffset, true, false));	2722	results.add(JavaCompletionItem.createVariableItem(env.getController(), name, anchorOffset, true, false));
2696	}	2723	}
2697	break;	2724	break;
Lines 2795-2801 Link Here
2795	!illegalForwardRefs.contains(e);	2822	!illegalForwardRefs.contains(e);
2796	}	2823	}
2797	};	2824	};
2798	for (String name : Utilities.varNamesSuggestions(tm, null, prefix, controller.getTypes(), controller.getElements(), controller.getElementUtilities().getLocalMembersAndVars(scope, acceptor), isConst))	2825	for (String name : Utilities.varNamesSuggestions(tm, null, prefix, controller.getTypes(), controller.getElements(), controller.getElementUtilities().getLocalMembersAndVars(scope, acceptor), isConst, csPrefix, csSuffix, preferLong))
2799	results.add(JavaCompletionItem.createVariableItem(env.getController(), name, anchorOffset, true, false));	2826	results.add(JavaCompletionItem.createVariableItem(env.getController(), name, anchorOffset, true, false));
2800	break;	2827	break;
2801	case ENUM_CONSTANT:	2828	case ENUM_CONSTANT:
Lines 4145-4158 Link Here
4145	for (VariableElement variableElement : ElementFilter.fieldsIn(members)) {	4172	for (VariableElement variableElement : ElementFilter.fieldsIn(members)) {
4146	Name name = variableElement.getSimpleName();	4173	Name name = variableElement.getSimpleName();
4147	if (!name.contentEquals(ERROR)) {	4174	if (!name.contentEquals(ERROR)) {
4148	String nameBase = GeneratorUtils.getCapitalizedName(name).toString();	4175	boolean isStatic = variableElement.getModifiers().contains(Modifier.STATIC);
4149	String setterName = "set" + nameBase; //NOI18N	4176	String setterName = CodeStyleUtils.computeSetterName(name, isStatic, codeStyle);
4150	String getterName = (variableElement.asType().getKind() == TypeKind.BOOLEAN ? "is" : "get") + nameBase; //NOI18N	4177	String getterName = CodeStyleUtils.computeGetterName(name, variableElement.asType().getKind() == TypeKind.BOOLEAN, isStatic, codeStyle);
4151	if ((prefix == null \|\| startsWith(env, getterName)) && !GeneratorUtils.hasGetter(controller, te, variableElement, methods)) {	4178	if ((prefix == null \|\| startsWith(env, getterName)) && !GeneratorUtils.hasGetter(controller, te, variableElement, methods, codeStyle)) {
4152	results.add(JavaCompletionItem.createGetterSetterMethodItem(env.getController(), variableElement, asMemberOf(variableElement, clsType, types), anchorOffset, false));	4179	results.add(JavaCompletionItem.createGetterSetterMethodItem(env.getController(), variableElement, asMemberOf(variableElement, clsType, types), anchorOffset, getterName, false));
4153	}	4180	}
4154	if ((prefix == null \|\| startsWith(env, setterName)) && !(variableElement.getModifiers().contains(Modifier.FINAL) \|\| GeneratorUtils.hasSetter(controller, te, variableElement, methods))) {	4181	if ((prefix == null \|\| startsWith(env, setterName)) && !(variableElement.getModifiers().contains(Modifier.FINAL) \|\| GeneratorUtils.hasSetter(controller, te, variableElement, methods, codeStyle))) {
4155	results.add(JavaCompletionItem.createGetterSetterMethodItem(env.getController(), variableElement, asMemberOf(variableElement, clsType, types), anchorOffset, true));	4182	results.add(JavaCompletionItem.createGetterSetterMethodItem(env.getController(), variableElement, asMemberOf(variableElement, clsType, types), anchorOffset, setterName, true));
4156	}	4183	}
4157	}	4184	}
4158	}	4185	}

Lines 68-74 Link Here

(-)a/beans/src/org/netbeans/modules/beans/addproperty/AddPropertyCodeGenerator.java (-6 / +9 lines)
68	import javax.swing.text.StyledDocument;	68	import javax.swing.text.StyledDocument;
69	import org.netbeans.api.editor.guards.GuardedSection;	69	import org.netbeans.api.editor.guards.GuardedSection;
70	import org.netbeans.api.editor.guards.GuardedSectionManager;	70	import org.netbeans.api.editor.guards.GuardedSectionManager;
71	import org.netbeans.api.java.source.ClasspathInfo;	71	import org.netbeans.api.java.source.CodeStyle;
72	import org.netbeans.api.java.source.CompilationController;	72	import org.netbeans.api.java.source.CompilationController;
73	import org.netbeans.api.java.source.CompilationInfo;	73	import org.netbeans.api.java.source.CompilationInfo;
74	import org.netbeans.api.java.source.JavaSource;	74	import org.netbeans.api.java.source.JavaSource;
Lines 78-84 Link Here
78	import org.netbeans.api.java.source.TreeUtilities;	78	import org.netbeans.api.java.source.TreeUtilities;
79	import org.netbeans.api.java.source.WorkingCopy;	79	import org.netbeans.api.java.source.WorkingCopy;
80	import org.netbeans.editor.GuardedException;	80	import org.netbeans.editor.GuardedException;
81	import org.netbeans.editor.Utilities;
82	import org.netbeans.modules.editor.indent.api.Reformat;	81	import org.netbeans.modules.editor.indent.api.Reformat;
83	import org.netbeans.spi.editor.codegen.CodeGenerator;	82	import org.netbeans.spi.editor.codegen.CodeGenerator;
84	import org.openide.DialogDescriptor;	83	import org.openide.DialogDescriptor;
Lines 126-137 Link Here
126		125
127	public void perform(FileObject file, JTextComponent pane) {	126	public void perform(FileObject file, JTextComponent pane) {
128	JButton ok = new JButton(NbBundle.getMessage(AddPropertyCodeGenerator.class, "LBL_ButtonOK"));	127	JButton ok = new JButton(NbBundle.getMessage(AddPropertyCodeGenerator.class, "LBL_ButtonOK"));
129	final AddPropertyPanel addPropertyPanel = new AddPropertyPanel(file, className, existingFields, pcsName, vcsName, ok);	128	CodeStyle cs = CodeStyle.getDefault(pane.getDocument());
		129	if(cs == null) {
		130	cs = CodeStyle.getDefault(file);
		131	}
		132	final AddPropertyPanel addPropertyPanel = new AddPropertyPanel(file, className, cs, existingFields, pcsName, vcsName, ok);
130	String caption = NbBundle.getMessage(AddPropertyCodeGenerator.class, "CAP_AddProperty");	133	String caption = NbBundle.getMessage(AddPropertyCodeGenerator.class, "CAP_AddProperty");
131	String cancel = NbBundle.getMessage(AddPropertyCodeGenerator.class, "LBL_ButtonCancel");	134	String cancel = NbBundle.getMessage(AddPropertyCodeGenerator.class, "LBL_ButtonCancel");
132	DialogDescriptor dd = new DialogDescriptor(addPropertyPanel,caption, true, new Object[] {ok,cancel}, ok, DialogDescriptor.DEFAULT_ALIGN, null, null);	135	DialogDescriptor dd = new DialogDescriptor(addPropertyPanel,caption, true, new Object[] {ok,cancel}, ok, DialogDescriptor.DEFAULT_ALIGN, null, null);
133	if (DialogDisplayer.getDefault().notify(dd) == ok) {	136	if (DialogDisplayer.getDefault().notify(dd) == ok) {
134	insertCode2(file, pane, addPropertyPanel.getAddPropertyConfig());	137	insertCode2(file, pane, addPropertyPanel.getAddPropertyConfig(), cs);
135	}	138	}
136	}	139	}
137		140
Lines 140-149 Link Here
140	* @see <a href=http://www.netbeans.org/issues/show_bug.cgi?id=162853>162853</a>	143	* @see <a href=http://www.netbeans.org/issues/show_bug.cgi?id=162853>162853</a>
141	* @see <a href=http://www.netbeans.org/issues/show_bug.cgi?id=162630>162630</a>	144	* @see <a href=http://www.netbeans.org/issues/show_bug.cgi?id=162630>162630</a>
142	*/	145	*/
143	static void insertCode2(final FileObject file, final JTextComponent pane, final AddPropertyConfig config) {	146	static void insertCode2(final FileObject file, final JTextComponent pane, final AddPropertyConfig config, CodeStyle cs) {
144	final Document doc = pane.getDocument();	147	final Document doc = pane.getDocument();
145	final Reformat r = Reformat.get(pane.getDocument());	148	final Reformat r = Reformat.get(pane.getDocument());
146	final String code = new AddPropertyGenerator().generate(config);	149	final String code = new AddPropertyGenerator().generate(config, cs);
147	final Position[] bounds = new Position[2];	150	final Position[] bounds = new Position[2];
148		151
149	final int offset[] = new int[1];	152	final int offset[] = new int[1];

Lines 52-57 Link Here

(-)a/beans/src/org/netbeans/modules/beans/addproperty/AddPropertyPanel.java (-2 / +5 lines)
52	import javax.swing.event.DocumentEvent;	52	import javax.swing.event.DocumentEvent;
53	import javax.swing.event.DocumentListener;	53	import javax.swing.event.DocumentListener;
54	import org.netbeans.api.java.source.ClasspathInfo;	54	import org.netbeans.api.java.source.ClasspathInfo;
		55	import org.netbeans.api.java.source.CodeStyle;
55	import org.netbeans.api.java.source.ElementHandle;	56	import org.netbeans.api.java.source.ElementHandle;
56	import org.netbeans.api.java.source.ui.TypeElementFinder;	57	import org.netbeans.api.java.source.ui.TypeElementFinder;
57	import org.openide.filesystems.FileObject;	58	import org.openide.filesystems.FileObject;
Lines 71-84 Link Here
71	private DocumentListener propNameTextFieldDocumentListener;	72	private DocumentListener propNameTextFieldDocumentListener;
72	private FileObject file;	73	private FileObject file;
73	private String className;	74	private String className;
		75	private final CodeStyle cs;
74	private List<String> existingFields;	76	private List<String> existingFields;
75	private String[] pcsName;	77	private String[] pcsName;
76	private String[] vcsName;	78	private String[] vcsName;
77	private JButton okButton;	79	private JButton okButton;
78		80
79	public AddPropertyPanel(FileObject file, String className, List<String> existingFields, String[] pcsName, String[] vcsName, JButton okButton) {	81	public AddPropertyPanel(FileObject file, String className, CodeStyle cs, List<String> existingFields, String[] pcsName, String[] vcsName, JButton okButton) {
80	this.file = file;	82	this.file = file;
81	this.className = className;	83	this.className = className;
		84	this.cs = cs;
82	this.existingFields = existingFields;	85	this.existingFields = existingFields;
83	this.pcsName = pcsName;	86	this.pcsName = pcsName;
84	this.vcsName = vcsName;	87	this.vcsName = vcsName;
Lines 162-168 Link Here
162	}	165	}
163	}	166	}
164		167
165	final String previewTemplate = new AddPropertyGenerator().generate(getAddPropertyConfig());	168	final String previewTemplate = new AddPropertyGenerator().generate(getAddPropertyConfig(), cs);
166	previewEditorPane.setText(previewTemplate);	169	previewEditorPane.setText(previewTemplate);
167		170
168	String error = resolveError();	171	String error = resolveError();

Lines 5-11 Link Here

(-)a/beans/src/org/netbeans/modules/beans/resources/templates/AddProperty.freemarker (-19 / +19 lines)
5	<#assign vetoableChangeSupport="vetoableChangeSupport">	5	<#assign vetoableChangeSupport="vetoableChangeSupport">
6	</#if>	6	</#if>
7		7
8	${access}<#if static >static </#if><#if final >final </#if>${type}<#if indexed >[]</#if> ${name}<#if final > = ${initializer}<#else><#if initializer != "" > = ${initializer}</#if></#if>;	8	${access}<#if static >static </#if><#if final >final </#if>${type}<#if indexed >[]</#if> ${fieldName}<#if final > = ${initializer}<#else><#if initializer != "" > = ${initializer}</#if></#if>;
9	<#if bound >	9	<#if bound >
10		10
11	public static final String ${PROP_NAME} = "${name}";	11	public static final String ${PROP_NAME} = "${name}";
Lines 19-26 Link Here
19	* @return the value of ${name}	19	* @return the value of ${name}
20	*/	20	*/
21	</#if>	21	</#if>
22	public <#if static >static </#if>${type}<#if indexed >[]</#if> <#if type = "boolean" >is<#else>get</#if>${capitalizedName}() {	22	public <#if static >static </#if>${type}<#if indexed >[]</#if> ${getterName}() {
23	return ${name};	23	return ${fieldName};
24	}	24	}
25	</#if>	25	</#if>
26	<#if generateSetter >	26	<#if generateSetter >
Lines 30-51 Link Here
30	/**	30	/**
31	* Set the value of ${name}	31	* Set the value of ${name}
32	*	32	*
33	* @param ${name} new value of ${name}	33	* @param ${paramName} new value of ${name}
34	<#if vetoable>	34	<#if vetoable>
35	* @throws java.beans.PropertyVetoException	35	* @throws java.beans.PropertyVetoException
36	</#if>	36	</#if>
37	*/	37	*/
38	</#if>	38	</#if>
39	public <#if static >static </#if>void set${capitalizedName}(${type}<#if indexed >[]</#if> ${name})<#if vetoable> throws java.beans.PropertyVetoException</#if> {	39	public <#if static >static </#if>void ${setterName}(${type}<#if indexed >[]</#if> ${paramName})<#if vetoable> throws java.beans.PropertyVetoException</#if> {
40	<#if bound >	40	<#if bound >
41	${type}<#if indexed >[]</#if> old${capitalizedName} = this.${name};	41	${type}<#if indexed >[]</#if> old${capitalizedName} = this.${fieldName};
42	<#if vetoable>	42	<#if vetoable>
43	${vetoableChangeSupport}.fireVetoableChange(${PROP_NAME}, old${capitalizedName}, ${name});	43	${vetoableChangeSupport}.fireVetoableChange(${PROP_NAME}, old${capitalizedName}, ${paramName});
44	</#if>	44	</#if>
45	</#if>	45	</#if>
46	<#if static >${className}.<#else>this.</#if>${name} = ${name};	46	<#if static >${className}.<#else>this.</#if>${fieldName} = ${paramName};
47	<#if bound >	47	<#if bound >
48	${propertyChangeSupport}.firePropertyChange(${PROP_NAME}, old${capitalizedName}, ${name});	48	${propertyChangeSupport}.firePropertyChange(${PROP_NAME}, old${capitalizedName}, ${paramName});
49	</#if>	49	</#if>
50	}	50	}
51	</#if>	51	</#if>
Lines 57-68 Link Here
57	/**	57	/**
58	* Get the value of ${name} at specified index	58	* Get the value of ${name} at specified index
59	*	59	*
60	* @param index	60	* @param ${paramIndex} the index of ${name}
61	* @return the value of ${name} at specified index	61	* @return the value of ${name} at specified index
62	*/	62	*/
63	</#if>	63	</#if>
64	public <#if static >static </#if>${type} <#if type = "boolean" >is<#else>get</#if>${capitalizedName}(int index) {	64	public <#if static >static </#if>${type} ${getterName}(int ${paramIndex}) {
65	return <#if !static >this.</#if>${name}[index];	65	return <#if !static >this.</#if>${fieldName}[${paramIndex}];
66	}	66	}
67	</#if>	67	</#if>
68	<#if generateSetter >	68	<#if generateSetter >
Lines 70-92 Link Here
70	/**	70	/**
71	* Set the value of ${name} at specified index.	71	* Set the value of ${name} at specified index.
72	*	72	*
73	* @param index	73	* @param ${paramIndex} the index of ${name}
74	* @param new${capitalizedName} new value of ${name} at specified index	74	* @param ${paramName} new value of ${name} at specified index
75	<#if vetoable>	75	<#if vetoable>
76	* @throws java.beans.PropertyVetoException	76	* @throws java.beans.PropertyVetoException
77	</#if>	77	</#if>
78	*/	78	*/
79	</#if>	79	</#if>
80	public <#if static >static </#if>void set${capitalizedName}(int index, ${type} new${capitalizedName})<#if vetoable> throws java.beans.PropertyVetoException</#if> {	80	public <#if static >static </#if>void ${setterName}(int ${paramIndex}, ${type} ${paramName})<#if vetoable> throws java.beans.PropertyVetoException</#if> {
81	<#if bound >	81	<#if bound >
82	${type} old${capitalizedName} = this.${name}[index];	82	${type} old${capitalizedName} = this.${fieldName}[${paramIndex}];
83	<#if vetoable>	83	<#if vetoable>
84	${vetoableChangeSupport}.fireVetoableChange(${PROP_NAME}, old${capitalizedName}, new${capitalizedName});	84	${vetoableChangeSupport}.fireVetoableChange(${PROP_NAME}, old${capitalizedName}, ${paramName});
85	</#if>	85	</#if>
86	</#if>	86	</#if>
87	<#if !static >this.</#if>${name}[index] = new${capitalizedName};	87	<#if !static >this.</#if>${fieldName}[${paramIndex}] = ${paramName};
88	<#if bound >	88	<#if bound >
89	${propertyChangeSupport}.fireIndexedPropertyChange(${PROP_NAME}, index, old${capitalizedName}, new${capitalizedName});	89	${propertyChangeSupport}.fireIndexedPropertyChange(${PROP_NAME}, ${paramIndex}, old${capitalizedName}, ${paramName});
90	</#if>	90	</#if>
91	}	91	}
92	</#if>	92	</#if>

Lines 82-87 Link Here

(-)a/java.editor/src/org/netbeans/modules/editor/java/Utilities.java (-5 / +7 lines)
82	import org.netbeans.api.editor.mimelookup.MimeLookup;	82	import org.netbeans.api.editor.mimelookup.MimeLookup;
83	import org.netbeans.api.editor.settings.SimpleValueNames;	83	import org.netbeans.api.editor.settings.SimpleValueNames;
84	import org.netbeans.api.java.lexer.JavaTokenId;	84	import org.netbeans.api.java.lexer.JavaTokenId;
		85	import org.netbeans.api.java.source.CodeStyleUtils;
85	import org.netbeans.api.java.source.CompilationInfo;	86	import org.netbeans.api.java.source.CompilationInfo;
86	import org.netbeans.api.java.source.ElementHandle;	87	import org.netbeans.api.java.source.ElementHandle;
87	import org.netbeans.api.java.source.SourceUtils;	88	import org.netbeans.api.java.source.SourceUtils;
Lines 530-536 Link Here
530	return refs;	531	return refs;
531	}	532	}
532		533
533	public static List<String> varNamesSuggestions(TypeMirror type, String suggestedName, String prefix, Types types, Elements elements, Iterable<? extends Element> locals, boolean isConst) {	534	public static List<String> varNamesSuggestions(TypeMirror type, String suggestedName, String prefix, Types types, Elements elements, Iterable<? extends Element> locals, boolean isConst, String namePrefix, String nameSuffix, Boolean preferLong) {
534	List<String> result = new ArrayList<String>();	535	List<String> result = new ArrayList<String>();
535	if (type == null && suggestedName == null)	536	if (type == null && suggestedName == null)
536	return result;	537	return result;
Lines 566-579 Link Here
566	}	567	}
567	int cnt = 1;	568	int cnt = 1;
568	String baseName = name;	569	String baseName = name;
		570	name = CodeStyleUtils.addPrefixSuffix(name, namePrefix, nameSuffix);
569	while (isClashing(name, type, locals)) {	571	while (isClashing(name, type, locals)) {
570	if (isPrimitive) {	572	if (isPrimitive) {
571	char c = name.charAt(0);	573	char c = name.charAt(namePrefix != null?namePrefix.length():0);
572	name = Character.toString(++c);	574	name = CodeStyleUtils.addPrefixSuffix(Character.toString(++c), namePrefix, nameSuffix);
573	if (c == 'z') //NOI18N	575	if (c == 'z' \|\| c == 'Z') //NOI18N
574	isPrimitive = false;	576	isPrimitive = false;
575	} else {	577	} else {
576	name = baseName + cnt++;	578	name = CodeStyleUtils.addPrefixSuffix(baseName + cnt++, namePrefix, nameSuffix);
577	}	579	}
578	}	580	}
579	result.add(name);	581	result.add(name);

Lines 88-93 Link Here

(-)a/java.editor/src/org/netbeans/modules/java/editor/codegen/GeneratorUtils.java (-23 / +9 lines)
88		88
89	import org.netbeans.api.annotations.common.NonNull;	89	import org.netbeans.api.annotations.common.NonNull;
90	import org.netbeans.api.java.source.CodeStyle;	90	import org.netbeans.api.java.source.CodeStyle;
		91	import org.netbeans.api.java.source.CodeStyleUtils;
91	import org.netbeans.api.java.source.Comment;	92	import org.netbeans.api.java.source.Comment;
92	import org.netbeans.api.java.source.CompilationInfo;	93	import org.netbeans.api.java.source.CompilationInfo;
93	import org.netbeans.api.java.source.ElementUtilities;	94	import org.netbeans.api.java.source.ElementUtilities;
Lines 275-288 Link Here
275	}	276	}
276	}	277	}
277		278
278	public static boolean hasGetter(CompilationInfo info, TypeElement typeElement, VariableElement field, Map<String, List<ExecutableElement>> methods) {	279	public static boolean hasGetter(CompilationInfo info, TypeElement typeElement, VariableElement field, Map<String, List<ExecutableElement>> methods, CodeStyle cs) {
279	CharSequence name = field.getSimpleName();	280	CharSequence name = field.getSimpleName();
280	assert name.length() > 0;	281	assert name.length() > 0;
281	TypeMirror type = field.asType();	282	TypeMirror type = field.asType();
282	StringBuilder sb = getCapitalizedName(name);	283	boolean isStatic = field.getModifiers().contains(Modifier.STATIC);
283	sb.insert(0, type.getKind() == TypeKind.BOOLEAN ? "is" : "get"); //NOI18N	284	String getterName = CodeStyleUtils.computeGetterName(name, type.getKind() == TypeKind.BOOLEAN, isStatic, cs);
284	Types types = info.getTypes();	285	Types types = info.getTypes();
285	List<ExecutableElement> candidates = methods.get(sb.toString());	286	List<ExecutableElement> candidates = methods.get(getterName);
286	if (candidates != null) {	287	if (candidates != null) {
287	for (ExecutableElement candidate : candidates) {	288	for (ExecutableElement candidate : candidates) {
288	if ((!candidate.getModifiers().contains(Modifier.ABSTRACT) \|\| candidate.getEnclosingElement() == typeElement)	289	if ((!candidate.getModifiers().contains(Modifier.ABSTRACT) \|\| candidate.getEnclosingElement() == typeElement)
Lines 294-307 Link Here
294	return false;	295	return false;
295	}	296	}
296		297
297	public static boolean hasSetter(CompilationInfo info, TypeElement typeElement, VariableElement field, Map<String, List<ExecutableElement>> methods) {	298	public static boolean hasSetter(CompilationInfo info, TypeElement typeElement, VariableElement field, Map<String, List<ExecutableElement>> methods, CodeStyle cs) {
298	CharSequence name = field.getSimpleName();	299	CharSequence name = field.getSimpleName();
299	assert name.length() > 0;	300	assert name.length() > 0;
300	TypeMirror type = field.asType();	301	TypeMirror type = field.asType();
301	StringBuilder sb = getCapitalizedName(name);	302	boolean isStatic = field.getModifiers().contains(Modifier.STATIC);
302	sb.insert(0, "set"); //NOI18N	303	String setterName = CodeStyleUtils.computeSetterName(name, isStatic, cs);
303	Types types = info.getTypes();	304	Types types = info.getTypes();
304	List<ExecutableElement> candidates = methods.get(sb.toString());	305	List<ExecutableElement> candidates = methods.get(setterName);
305	if (candidates != null) {	306	if (candidates != null) {
306	for (ExecutableElement candidate : candidates) {	307	for (ExecutableElement candidate : candidates) {
307	if ((!candidate.getModifiers().contains(Modifier.ABSTRACT) \|\| candidate.getEnclosingElement() == typeElement)	308	if ((!candidate.getModifiers().contains(Modifier.ABSTRACT) \|\| candidate.getEnclosingElement() == typeElement)
Lines 596-616 Link Here
596	}	597	}
597	return ((PackageElement) e.getEnclosingElement()).getQualifiedName().toString();	598	return ((PackageElement) e.getEnclosingElement()).getQualifiedName().toString();
598	}	599	}
599
600	public static StringBuilder getCapitalizedName(CharSequence cs) {
601	StringBuilder sb = new StringBuilder(cs);
602	while(sb.length() > 1 && sb.charAt(0) == '_') //NOI18N
603	sb.deleteCharAt(0);
604
605	//Beans naming convention, #165241
606	if (sb.length() > 1 && Character.isUpperCase(sb.charAt(1))) {
607	return sb;
608	}
609
610	if (sb.length() > 0)
611	sb.setCharAt(0, Character.toUpperCase(sb.charAt(0)));
612	return sb;
613	}
614		600
615	public static void guardedCommit(JTextComponent component, ModificationResult mr) throws IOException {	601	public static void guardedCommit(JTextComponent component, ModificationResult mr) throws IOException {
616	try {	602	try {

Lines 92-97 Link Here

(-)a/java.editor/src/org/netbeans/modules/java/editor/codegen/GetterSetterGenerator.java (-10 / +14 lines)
92	public List<? extends CodeGenerator> create(Lookup context) {	92	public List<? extends CodeGenerator> create(Lookup context) {
93	ArrayList<CodeGenerator> ret = new ArrayList<CodeGenerator>();	93	ArrayList<CodeGenerator> ret = new ArrayList<CodeGenerator>();
94	JTextComponent component = context.lookup(JTextComponent.class);	94	JTextComponent component = context.lookup(JTextComponent.class);
		95	CodeStyle codeStyle = CodeStyle.getDefault(component.getDocument());
95	CompilationController controller = context.lookup(CompilationController.class);	96	CompilationController controller = context.lookup(CompilationController.class);
96	TreePath path = context.lookup(TreePath.class);	97	TreePath path = context.lookup(TreePath.class);
97	path = path != null ? Utilities.getPathElementOfKind(TreeUtilities.CLASS_TREE_KINDS, path) : null;	98	path = path != null ? Utilities.getPathElementOfKind(TreeUtilities.CLASS_TREE_KINDS, path) : null;
Lines 122-129 Link Here
122	if (ERROR.contentEquals(variableElement.getSimpleName()))	123	if (ERROR.contentEquals(variableElement.getSimpleName()))
123	continue;	124	continue;
124	ElementNode.Description description = ElementNode.Description.create(controller, variableElement, null, true, false);	125	ElementNode.Description description = ElementNode.Description.create(controller, variableElement, null, true, false);
125	boolean hasGetter = GeneratorUtils.hasGetter(controller, typeElement, variableElement, methods);	126	boolean hasGetter = GeneratorUtils.hasGetter(controller, typeElement, variableElement, methods, codeStyle);
126	boolean hasSetter = variableElement.getModifiers().contains(Modifier.FINAL) \|\| GeneratorUtils.hasSetter(controller, typeElement, variableElement, methods);	127	boolean hasSetter = variableElement.getModifiers().contains(Modifier.FINAL) \|\| GeneratorUtils.hasSetter(controller, typeElement, variableElement, methods, codeStyle);
127	if (!hasGetter) {	128	if (!hasGetter) {
128	List<ElementNode.Description> descriptions = gDescriptions.get(variableElement.getEnclosingElement());	129	List<ElementNode.Description> descriptions = gDescriptions.get(variableElement.getEnclosingElement());
129	if (descriptions == null) {	130	if (descriptions == null) {
Lines 154-174 Link Here
154	for (Map.Entry<Element, List<ElementNode.Description>> entry : gDescriptions.entrySet())	155	for (Map.Entry<Element, List<ElementNode.Description>> entry : gDescriptions.entrySet())
155	descriptions.add(ElementNode.Description.create(controller, entry.getKey(), entry.getValue(), false, false));	156	descriptions.add(ElementNode.Description.create(controller, entry.getKey(), entry.getValue(), false, false));
156	Collections.reverse(descriptions);	157	Collections.reverse(descriptions);
157	ret.add(new GetterSetterGenerator(component, ElementNode.Description.create(controller, typeElement, descriptions, false, false), GeneratorUtils.GETTERS_ONLY));	158	ret.add(new GetterSetterGenerator(component, ElementNode.Description.create(controller, typeElement, descriptions, false, false), GeneratorUtils.GETTERS_ONLY, codeStyle));
158	}	159	}
159	if (!sDescriptions.isEmpty()) {	160	if (!sDescriptions.isEmpty()) {
160	List<ElementNode.Description> descriptions = new ArrayList<ElementNode.Description>();	161	List<ElementNode.Description> descriptions = new ArrayList<ElementNode.Description>();
161	for (Map.Entry<Element, List<ElementNode.Description>> entry : sDescriptions.entrySet())	162	for (Map.Entry<Element, List<ElementNode.Description>> entry : sDescriptions.entrySet())
162	descriptions.add(ElementNode.Description.create(controller, entry.getKey(), entry.getValue(), false, false));	163	descriptions.add(ElementNode.Description.create(controller, entry.getKey(), entry.getValue(), false, false));
163	Collections.reverse(descriptions);	164	Collections.reverse(descriptions);
164	ret.add(new GetterSetterGenerator(component, ElementNode.Description.create(controller, typeElement, descriptions, false, false), GeneratorUtils.SETTERS_ONLY));	165	ret.add(new GetterSetterGenerator(component, ElementNode.Description.create(controller, typeElement, descriptions, false, false), GeneratorUtils.SETTERS_ONLY, codeStyle));
165	}	166	}
166	if (!gsDescriptions.isEmpty()) {	167	if (!gsDescriptions.isEmpty()) {
167	List<ElementNode.Description> descriptions = new ArrayList<ElementNode.Description>();	168	List<ElementNode.Description> descriptions = new ArrayList<ElementNode.Description>();
168	for (Map.Entry<Element, List<ElementNode.Description>> entry : gsDescriptions.entrySet())	169	for (Map.Entry<Element, List<ElementNode.Description>> entry : gsDescriptions.entrySet())
169	descriptions.add(ElementNode.Description.create(controller, entry.getKey(), entry.getValue(), false, false));	170	descriptions.add(ElementNode.Description.create(controller, entry.getKey(), entry.getValue(), false, false));
170	Collections.reverse(descriptions);	171	Collections.reverse(descriptions);
171	ret.add(new GetterSetterGenerator(component, ElementNode.Description.create(controller, typeElement, descriptions, false, false), 0));	172	ret.add(new GetterSetterGenerator(component, ElementNode.Description.create(controller, typeElement, descriptions, false, false), 0, codeStyle));
172	}	173	}
173	return ret;	174	return ret;
174	}	175	}
Lines 177-188 Link Here
177	private JTextComponent component;	178	private JTextComponent component;
178	private ElementNode.Description description;	179	private ElementNode.Description description;
179	private int type;	180	private int type;
		181	private CodeStyle codestyle;
180		182
181	/** Creates a new instance of GetterSetterGenerator */	183	/** Creates a new instance of GetterSetterGenerator */
182	private GetterSetterGenerator(JTextComponent component, ElementNode.Description description, int type) {	184	private GetterSetterGenerator(JTextComponent component, ElementNode.Description description, int type, CodeStyle codeStyle) {
183	this.component = component;	185	this.component = component;
184	this.description = description;	186	this.description = description;
185	this.type = type;	187	this.type = type;
		188	this.codestyle = codeStyle;
186	}	189	}
187		190
188	public String getDisplayName() {	191	public String getDisplayName() {
Lines 256-262 Link Here
256		259
257	@Override	260	@Override
258	public void run(CompilationController parameter) throws Exception {	261	public void run(CompilationController parameter) throws Exception {
259	createGetterSetterLists(parameter, variables, getters, setters);	262	createGetterSetterLists(parameter, variables, getters, setters, codestyle);
260	}	263	}
261	}, true);	264	}, true);
262		265
Lines 277-291 Link Here
277		280
278	}	281	}
279		282
280	private void createGetterSetterLists(CompilationController cc, List<ElementHandle<? extends Element>> variables, List<String> getters, List<String> setters) {	283	private void createGetterSetterLists(CompilationController cc, List<ElementHandle<? extends Element>> variables, List<String> getters, List<String> setters, CodeStyle codestyle) {
281	for (ElementHandle handle:variables) {	284	for (ElementHandle handle:variables) {
282	final Element el = handle.resolve(cc);	285	final Element el = handle.resolve(cc);
		286	boolean isStatic = el.getModifiers().contains(Modifier.STATIC);
283	if (type!=GeneratorUtils.GETTERS_ONLY)	287	if (type!=GeneratorUtils.GETTERS_ONLY)
284	setters.add("set" + GeneratorUtils.getCapitalizedName(el.getSimpleName()));//NOI18N	288	setters.add(CodeStyleUtils.computeSetterName(el.getSimpleName(), isStatic, codestyle));
285	else	289	else
286	setters.add(null);	290	setters.add(null);
287	if (type!=GeneratorUtils.SETTERS_ONLY)	291	if (type!=GeneratorUtils.SETTERS_ONLY)
288	getters.add((el.asType().getKind() == TypeKind.BOOLEAN ? "is" : "get") + GeneratorUtils.getCapitalizedName(el.getSimpleName()));//NOI18N	292	getters.add(CodeStyleUtils.computeGetterName(el.getSimpleName(), el.asType().getKind() == TypeKind.BOOLEAN, isStatic, codestyle));
289	else	293	else
290	getters.add(null);	294	getters.add(null);
291	}	295	}

Lines 72-77 Link Here

(-)a/java.editor/src/org/netbeans/modules/java/editor/codegen/LoggerGenerator.java (-1 / +3 lines)
72	import com.sun.source.tree.Scope;	72	import com.sun.source.tree.Scope;
73	import com.sun.source.tree.VariableTree;	73	import com.sun.source.tree.VariableTree;
74	import com.sun.source.util.TreePath;	74	import com.sun.source.util.TreePath;
		75	import org.netbeans.api.java.source.CodeStyle;
75		76
76	import org.netbeans.api.java.source.CompilationController;	77	import org.netbeans.api.java.source.CompilationController;
77	import org.netbeans.api.java.source.GeneratorUtilities;	78	import org.netbeans.api.java.source.GeneratorUtilities;
Lines 160-166 Link Here
160	org.netbeans.editor.Utilities.setStatusBoldText(component, message);	161	org.netbeans.editor.Utilities.setStatusBoldText(component, message);
161	} else {	162	} else {
162	ClassTree cls = (ClassTree) path.getLeaf();	163	ClassTree cls = (ClassTree) path.getLeaf();
163	List<String> names = Utilities.varNamesSuggestions(null, "LOG", null, copy.getTypes(), copy.getElements(), e.getEnclosedElements(), true);	164	CodeStyle cs = CodeStyle.getDefault(component.getDocument());
		165	List<String> names = Utilities.varNamesSuggestions(null, "LOG", null, copy.getTypes(), copy.getElements(), e.getEnclosedElements(), true, cs.getStaticFieldNamePrefix(), cs.getStaticFieldNameSuffix(), cs.preferLongerNames());
164	VariableTree var = createLoggerField(copy.getTreeMaker(), cls, names.size() > 0 ? names.get(0) : "LOG"); //NOI18N	166	VariableTree var = createLoggerField(copy.getTreeMaker(), cls, names.size() > 0 ? names.get(0) : "LOG"); //NOI18N
165	copy.rewrite(cls, GeneratorUtils.insertClassMembers(copy, cls, Collections.singletonList(var), caretOffset));	167	copy.rewrite(cls, GeneratorUtils.insertClassMembers(copy, cls, Collections.singletonList(var), caretOffset));
166	}	168	}

Lines 59-67 Link Here

(-)a/java.editor/src/org/netbeans/modules/java/editor/rename/InstantRenamePerformer.java (-2 / +32 lines)
59	import java.util.ArrayList;	59	import java.util.ArrayList;
60	import java.util.Collections;	60	import java.util.Collections;
61	import java.util.EnumSet;	61	import java.util.EnumSet;
		62	import java.util.HashMap;
62	import java.util.HashSet;	63	import java.util.HashSet;
63	import java.util.LinkedHashSet;	64	import java.util.LinkedHashSet;
64	import java.util.List;	65	import java.util.List;
		66	import java.util.Map;
65	import java.util.Set;	67	import java.util.Set;
66	import java.util.logging.Level;	68	import java.util.logging.Level;
67	import java.util.logging.Logger;	69	import java.util.logging.Logger;
Lines 71-76 Link Here
71	import javax.lang.model.element.Modifier;	73	import javax.lang.model.element.Modifier;
72	import javax.lang.model.element.Name;	74	import javax.lang.model.element.Name;
73	import javax.lang.model.element.TypeElement;	75	import javax.lang.model.element.TypeElement;
		76	import javax.lang.model.element.VariableElement;
74	import javax.lang.model.util.ElementFilter;	77	import javax.lang.model.util.ElementFilter;
75	import javax.lang.model.util.ElementScanner6;	78	import javax.lang.model.util.ElementScanner6;
76	import javax.swing.Action;	79	import javax.swing.Action;
Lines 99-104 Link Here
99	import org.netbeans.api.editor.settings.FontColorSettings;	102	import org.netbeans.api.editor.settings.FontColorSettings;
100	import org.netbeans.api.java.lexer.JavaTokenId;	103	import org.netbeans.api.java.lexer.JavaTokenId;
101	import org.netbeans.api.java.lexer.JavadocTokenId;	104	import org.netbeans.api.java.lexer.JavadocTokenId;
		105	import org.netbeans.api.java.source.CodeStyle;
102	import org.netbeans.api.java.source.CompilationInfo;	106	import org.netbeans.api.java.source.CompilationInfo;
103	import org.netbeans.api.java.source.ElementUtilities;	107	import org.netbeans.api.java.source.ElementUtilities;
104	import org.netbeans.api.java.source.JavaSource;	108	import org.netbeans.api.java.source.JavaSource;
Lines 115-120 Link Here
115	import org.netbeans.modules.editor.java.ComputeOffAWT;	119	import org.netbeans.modules.editor.java.ComputeOffAWT;
116	import org.netbeans.modules.editor.java.ComputeOffAWT.Worker;	120	import org.netbeans.modules.editor.java.ComputeOffAWT.Worker;
117	import org.netbeans.modules.editor.java.JavaKit;	121	import org.netbeans.modules.editor.java.JavaKit;
		122	import org.netbeans.modules.java.editor.codegen.GeneratorUtils;
118	import org.netbeans.modules.java.editor.javadoc.JavadocImports;	123	import org.netbeans.modules.java.editor.javadoc.JavadocImports;
119	import org.netbeans.modules.java.editor.semantic.FindLocalUsagesQuery;	124	import org.netbeans.modules.java.editor.semantic.FindLocalUsagesQuery;
120	import org.netbeans.modules.refactoring.api.AbstractRefactoring;	125	import org.netbeans.modules.refactoring.api.AbstractRefactoring;
Lines 380-386 Link Here
380	el = el.getEnclosingElement();	385	el = el.getEnclosingElement();
381	}	386	}
382		387
383	if (allowInstantRename(el, info.getElementUtilities())) {	388	if (allowInstantRename(info, el, info.getElementUtilities())) {
384	final Set<Token> points = new HashSet<Token>(new FindLocalUsagesQuery(true).findUsages(el, info, doc));	389	final Set<Token> points = new HashSet<Token>(new FindLocalUsagesQuery(true).findUsages(el, info, doc));
385		390
386	if (el.getKind().isClass()) {	391	if (el.getKind().isClass()) {
Lines 445-451 Link Here
445	return result;	450	return result;
446	}	451	}
447		452
448	private static boolean allowInstantRename(Element e, ElementUtilities eu) {	453	private static boolean allowInstantRename(CompilationInfo info, Element e, ElementUtilities eu) {
		454	if(e.getKind() == ElementKind.FIELD) {
		455	VariableElement variableElement = (VariableElement) e;
		456	TypeElement typeElement = eu.enclosingTypeElement(e);
		457	Map<String, List<ExecutableElement>> methods = new HashMap<String, List<ExecutableElement>>();
		458	for (ExecutableElement method : ElementFilter.methodsIn(info.getElements().getAllMembers(typeElement))) {
		459	List<ExecutableElement> l = methods.get(method.getSimpleName().toString());
		460	if (l == null) {
		461	l = new ArrayList<ExecutableElement>();
		462	methods.put(method.getSimpleName().toString(), l);
		463	}
		464	l.add(method);
		465	}
		466
		467	boolean isProperty = false;
		468	try {
		469	CodeStyle codeStyle = CodeStyle.getDefault(info.getDocument());
		470	isProperty = GeneratorUtils.hasGetter(info, typeElement, variableElement, methods, codeStyle);
		471	isProperty = isProperty \|\| (!variableElement.getModifiers().contains(Modifier.FINAL) &&
		472	GeneratorUtils.hasSetter(info, typeElement, variableElement, methods, codeStyle));
		473	} catch (IOException ex) {
		474	}
		475	if(isProperty) {
		476	return false;
		477	}
		478	}
449	if (org.netbeans.modules.java.editor.semantic.Utilities.isPrivateElement(e)) {	479	if (org.netbeans.modules.java.editor.semantic.Utilities.isPrivateElement(e)) {
450	return true;	480	return true;
451	}	481	}

Lines 80-92 Link Here

(-)a/java.source/src/org/netbeans/api/java/source/GeneratorUtilities.java (-48 / +54 lines)
80	import com.sun.tools.javac.tree.JCTree;	80	import com.sun.tools.javac.tree.JCTree;
81	import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;	81	import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
82		82
83	import java.io.ByteArrayOutputStream;
84	import java.io.IOException;	83	import java.io.IOException;
85	import java.io.InputStreamReader;	84	import java.io.InputStreamReader;
86	import java.io.OutputStreamWriter;
87	import java.io.PrintWriter;
88	import java.io.Reader;	85	import java.io.Reader;
89	import java.io.Writer;
90	import java.nio.charset.Charset;	86	import java.nio.charset.Charset;
91	import java.util.ArrayList;	87	import java.util.ArrayList;
92	import java.util.Arrays;	88	import java.util.Arrays;
Lines 471-483 Link Here
471	public MethodTree createConstructor(ClassTree clazz, Iterable<? extends VariableTree> fields) {	467	public MethodTree createConstructor(ClassTree clazz, Iterable<? extends VariableTree> fields) {
472	assert clazz != null && fields != null;	468	assert clazz != null && fields != null;
473	TreeMaker make = copy.getTreeMaker();	469	TreeMaker make = copy.getTreeMaker();
		470	CodeStyle cs = DiffContext.getCodeStyle(copy);
474	Set<Modifier> mods = EnumSet.of(copy.getTreeUtilities().isEnum(clazz) ? Modifier.PRIVATE : Modifier.PUBLIC);	471	Set<Modifier> mods = EnumSet.of(copy.getTreeUtilities().isEnum(clazz) ? Modifier.PRIVATE : Modifier.PUBLIC);
475	List<VariableTree> parameters = new ArrayList<VariableTree>();	472	List<VariableTree> parameters = new ArrayList<VariableTree>();
476	List<StatementTree> statements = new ArrayList<StatementTree>();	473	List<StatementTree> statements = new ArrayList<StatementTree>();
477	ModifiersTree parameterModifiers = make.Modifiers(EnumSet.noneOf(Modifier.class));	474	ModifiersTree parameterModifiers = make.Modifiers(EnumSet.noneOf(Modifier.class));
478	for (VariableTree vt : fields) {	475	for (VariableTree vt : fields) {
479	parameters.add(make.Variable(parameterModifiers, vt.getName(), vt.getType(), null));	476	String paramName = addParamPrefixSuffix(removeFieldPrefixSuffix(vt, cs), cs);
480	statements.add(make.ExpressionStatement(make.Assignment(make.MemberSelect(make.Identifier("this"), vt.getName()), make.Identifier(vt.getName())))); //NOI18N	477	parameters.add(make.Variable(parameterModifiers, paramName, vt.getType(), null));
		478	statements.add(make.ExpressionStatement(make.Assignment(make.MemberSelect(make.Identifier("this"), vt.getName()), make.Identifier(paramName)))); //NOI18N
481	}	479	}
482	BlockTree body = make.Block(statements, false);	480	BlockTree body = make.Block(statements, false);
483	return make.Method(make.Modifiers(mods), "<init>", null, Collections.<TypeParameterTree> emptyList(), parameters, Collections.<ExpressionTree>emptyList(), body, null); //NOI18N	481	return make.Method(make.Modifiers(mods), "<init>", null, Collections.<TypeParameterTree> emptyList(), parameters, Collections.<ExpressionTree>emptyList(), body, null); //NOI18N
Lines 494-509 Link Here
494	public MethodTree createGetter(TypeElement clazz, VariableElement field) {	492	public MethodTree createGetter(TypeElement clazz, VariableElement field) {
495	assert clazz != null && field != null;	493	assert clazz != null && field != null;
496	TreeMaker make = copy.getTreeMaker();	494	TreeMaker make = copy.getTreeMaker();
		495	CodeStyle cs = DiffContext.getCodeStyle(copy);
497	Set<Modifier> mods = EnumSet.of(Modifier.PUBLIC);	496	Set<Modifier> mods = EnumSet.of(Modifier.PUBLIC);
498	if (field.getModifiers().contains(Modifier.STATIC))	497	boolean isStatic = field.getModifiers().contains(Modifier.STATIC);
		498	if (isStatic) {
499	mods.add(Modifier.STATIC);	499	mods.add(Modifier.STATIC);
500	CharSequence name = field.getSimpleName();	500	}
501	assert name.length() > 0;
502	TypeMirror type = copy.getTypes().asMemberOf((DeclaredType)clazz.asType(), field);	501	TypeMirror type = copy.getTypes().asMemberOf((DeclaredType)clazz.asType(), field);
503	StringBuilder sb = getCapitalizedName(name);	502	String getterName = CodeStyleUtils.computeGetterName(field.getSimpleName(), type.getKind() == TypeKind.BOOLEAN, isStatic, cs);
504	sb.insert(0, type.getKind() == TypeKind.BOOLEAN ? "is" : "get"); //NOI18N	503	BlockTree body = make.Block(Collections.singletonList(make.Return(make.Identifier(field.getSimpleName()))), false);
505	BlockTree body = make.Block(Collections.singletonList(make.Return(make.Identifier(name))), false);	504	return make.Method(make.Modifiers(mods), getterName, make.Type(type), Collections.<TypeParameterTree>emptyList(), Collections.<VariableTree>emptyList(), Collections.<ExpressionTree>emptyList(), body, null);
506	return make.Method(make.Modifiers(mods), sb, make.Type(type), Collections.<TypeParameterTree>emptyList(), Collections.<VariableTree>emptyList(), Collections.<ExpressionTree>emptyList(), body, null);
507	}	505	}
508		506
509	/**	507	/**
Lines 516-531 Link Here
516	public MethodTree createGetter(VariableTree field) {	514	public MethodTree createGetter(VariableTree field) {
517	assert field != null;	515	assert field != null;
518	TreeMaker make = copy.getTreeMaker();	516	TreeMaker make = copy.getTreeMaker();
		517	CodeStyle cs = DiffContext.getCodeStyle(copy);
519	Set<Modifier> mods = EnumSet.of(Modifier.PUBLIC);	518	Set<Modifier> mods = EnumSet.of(Modifier.PUBLIC);
520	if (field.getModifiers().getFlags().contains(Modifier.STATIC))	519	boolean isStatic = field.getModifiers().getFlags().contains(Modifier.STATIC);
		520	if (isStatic) {
521	mods.add(Modifier.STATIC);	521	mods.add(Modifier.STATIC);
522	CharSequence name = field.getName();	522	}
523	assert name.length() > 0;
524	Tree type = field.getType();	523	Tree type = field.getType();
525	StringBuilder sb = getCapitalizedName(name);	524	boolean isBoolean = type.getKind() == Tree.Kind.PRIMITIVE_TYPE && ((PrimitiveTypeTree) type).getPrimitiveTypeKind() == TypeKind.BOOLEAN;
526	sb.insert(0, type.getKind() == Tree.Kind.PRIMITIVE_TYPE && ((PrimitiveTypeTree)type).getPrimitiveTypeKind() == TypeKind.BOOLEAN ? "is" : "get"); //NOI18N	525	String getterName = CodeStyleUtils.computeGetterName(field.getName(), isBoolean, isStatic, cs);
527	BlockTree body = make.Block(Collections.singletonList(make.Return(make.Identifier(name))), false);	526	BlockTree body = make.Block(Collections.singletonList(make.Return(make.Identifier(field.getName()))), false);
528	return make.Method(make.Modifiers(mods), sb, type, Collections.<TypeParameterTree>emptyList(), Collections.<VariableTree>emptyList(), Collections.<ExpressionTree>emptyList(), body, null);	527	return make.Method(make.Modifiers(mods), getterName, type, Collections.<TypeParameterTree>emptyList(), Collections.<VariableTree>emptyList(), Collections.<ExpressionTree>emptyList(), body, null);
529	}	528	}
530		529
531	/**	530	/**
Lines 539-556 Link Here
539	public MethodTree createSetter(TypeElement clazz, VariableElement field) {	538	public MethodTree createSetter(TypeElement clazz, VariableElement field) {
540	assert clazz != null && field != null;	539	assert clazz != null && field != null;
541	TreeMaker make = copy.getTreeMaker();	540	TreeMaker make = copy.getTreeMaker();
		541	CodeStyle cs = DiffContext.getCodeStyle(copy);
542	Set<Modifier> mods = EnumSet.of(Modifier.PUBLIC);	542	Set<Modifier> mods = EnumSet.of(Modifier.PUBLIC);
543	boolean isStatic = field.getModifiers().contains(Modifier.STATIC);	543	boolean isStatic = field.getModifiers().contains(Modifier.STATIC);
544	if (isStatic)	544	if (isStatic) {
545	mods.add(Modifier.STATIC);	545	mods.add(Modifier.STATIC);
		546	}
546	CharSequence name = field.getSimpleName();	547	CharSequence name = field.getSimpleName();
547	assert name.length() > 0;	548	assert name.length() > 0;
548	TypeMirror type = copy.getTypes().asMemberOf((DeclaredType)clazz.asType(), field);	549	TypeMirror type = copy.getTypes().asMemberOf((DeclaredType)clazz.asType(), field);
549	StringBuilder sb = getCapitalizedName(name);	550	String setterName = CodeStyleUtils.computeSetterName(field.getSimpleName(), isStatic, cs);
550	sb.insert(0, "set"); //NOI18N	551	String paramName = addParamPrefixSuffix(removeFieldPrefixSuffix(field, cs), cs);
551	List<VariableTree> params = Collections.singletonList(make.Variable(make.Modifiers(EnumSet.noneOf(Modifier.class)), name, make.Type(type), null));	552	List<VariableTree> params = Collections.singletonList(make.Variable(make.Modifiers(EnumSet.noneOf(Modifier.class)), paramName, make.Type(type), null));
552	BlockTree body = make.Block(Collections.singletonList(make.ExpressionStatement(make.Assignment(make.MemberSelect(isStatic? make.Identifier(field.getEnclosingElement().getSimpleName()) : make.Identifier("this"), name), make.Identifier(name)))), false); //NOI18N	553	BlockTree body = make.Block(Collections.singletonList(make.ExpressionStatement(make.Assignment(make.MemberSelect(isStatic? make.Identifier(field.getEnclosingElement().getSimpleName()) : make.Identifier("this"), name), make.Identifier(paramName)))), false); //NOI18N
553	return make.Method(make.Modifiers(mods), sb, make.Type(copy.getTypes().getNoType(TypeKind.VOID)), Collections.<TypeParameterTree>emptyList(), params, Collections.<ExpressionTree>emptyList(), body, null);	554	return make.Method(make.Modifiers(mods), setterName, make.Type(copy.getTypes().getNoType(TypeKind.VOID)), Collections.<TypeParameterTree>emptyList(), params, Collections.<ExpressionTree>emptyList(), body, null);
554	}	555	}
555		556
556	/**	557	/**
Lines 570-580 Link Here
570	mods.add(Modifier.STATIC);	571	mods.add(Modifier.STATIC);
571	CharSequence name = field.getName();	572	CharSequence name = field.getName();
572	assert name.length() > 0;	573	assert name.length() > 0;
573	StringBuilder sb = getCapitalizedName(name);	574	CodeStyle cs = DiffContext.getCodeStyle(copy);
574	sb.insert(0, "set"); //NOI18N	575	String propName = removeFieldPrefixSuffix(field, cs);
575	List<VariableTree> params = Collections.singletonList(make.Variable(make.Modifiers(EnumSet.noneOf(Modifier.class)), name, field.getType(), null));	576	String setterName = CodeStyleUtils.computeSetterName(field.getName(), isStatic, cs);
576	BlockTree body = make.Block(Collections.singletonList(make.ExpressionStatement(make.Assignment(make.MemberSelect(isStatic? make.Identifier(clazz.getSimpleName()) : make.Identifier("this"), name), make.Identifier(name)))), false); //NOI18N	577	String paramName = addParamPrefixSuffix(propName, cs);
577	return make.Method(make.Modifiers(mods), sb, make.Type(copy.getTypes().getNoType(TypeKind.VOID)), Collections.<TypeParameterTree>emptyList(), params, Collections.<ExpressionTree>emptyList(), body, null);	578	List<VariableTree> params = Collections.singletonList(make.Variable(make.Modifiers(EnumSet.noneOf(Modifier.class)), paramName, field.getType(), null));
		579	BlockTree body = make.Block(Collections.singletonList(make.ExpressionStatement(make.Assignment(make.MemberSelect(isStatic? make.Identifier(clazz.getSimpleName()) : make.Identifier("this"), name), make.Identifier(paramName)))), false); //NOI18N
		580	return make.Method(make.Modifiers(mods), setterName, make.Type(copy.getTypes().getNoType(TypeKind.VOID)), Collections.<TypeParameterTree>emptyList(), params, Collections.<ExpressionTree>emptyList(), body, null);
578	}	581	}
579		582
580	/**	583	/**
Lines 1158-1180 Link Here
1158	return info.getElements().getTypeElement("java.lang.Override") != null;	1161	return info.getElements().getTypeElement("java.lang.Override") != null;
1159	}	1162	}
1160		1163
1161	private static StringBuilder getCapitalizedName(CharSequence cs) {
1162	StringBuilder sb = new StringBuilder(cs);
1163	while (sb.length() > 1 && sb.charAt(0) == '_') { //NOI18N
1164	sb.deleteCharAt(0);
1165	}
1166
1167	//Beans naming convention, #165241
1168	if (sb.length() > 1 && Character.isUpperCase(sb.charAt(1))) {
1169	return sb;
1170	}
1171
1172	if (sb.length() > 0) {
1173	sb.setCharAt(0, Character.toUpperCase(sb.charAt(0)));
1174	}
1175	return sb;
1176	}
1177
1178	private Tree resolveWildcard(TypeMirror type) {	1164	private Tree resolveWildcard(TypeMirror type) {
1179	TreeMaker make = copy.getTreeMaker();	1165	TreeMaker make = copy.getTreeMaker();
1180	Tree result;	1166	Tree result;
Lines 1361-1366 Link Here
1361	return bindings;	1347	return bindings;
1362	}	1348	}
1363		1349
		1350	private static String removeFieldPrefixSuffix(VariableElement var, CodeStyle cs) {
		1351	boolean isStatic = var.getModifiers().contains(Modifier.STATIC);
		1352	return CodeStyleUtils.removePrefixSuffix(var.getSimpleName(),
		1353	isStatic ? cs.getStaticFieldNamePrefix() : cs.getFieldNamePrefix(),
		1354	isStatic ? cs.getStaticFieldNameSuffix() : cs.getFieldNameSuffix());
		1355	}
		1356
		1357	private static String removeFieldPrefixSuffix(VariableTree var, CodeStyle cs) {
		1358	boolean isStatic = var.getModifiers().getFlags().contains(Modifier.STATIC);
		1359	return CodeStyleUtils.removePrefixSuffix(var.getName(),
		1360	isStatic ? cs.getStaticFieldNamePrefix() : cs.getFieldNamePrefix(),
		1361	isStatic ? cs.getStaticFieldNameSuffix() : cs.getFieldNameSuffix());
		1362	}
		1363
		1364	private static String addParamPrefixSuffix(CharSequence name, CodeStyle cs) {
		1365	return CodeStyleUtils.addPrefixSuffix(name,
		1366	cs.getParameterNamePrefix(),
		1367	cs.getParameterNameSuffix());
		1368	}
		1369
1364	private static class ClassMemberComparator implements Comparator<Tree> {	1370	private static class ClassMemberComparator implements Comparator<Tree> {
1365		1371
1366	private CodeStyle.MemberGroups groups;	1372	private CodeStyle.MemberGroups groups;

Lines 22-28 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/FmtCodeGeneration.form (-230 / +13 lines)
22	<Layout>	22	<Layout>
23	<DimensionLayout dim="0">	23	<DimensionLayout dim="0">
24	<Group type="103" groupAlignment="0" attributes="0">	24	<Group type="103" groupAlignment="0" attributes="0">
25	<Component id="jSeparator1" max="32767" attributes="0"/>
26	<Group type="102" alignment="0" attributes="0">	25	<Group type="102" alignment="0" attributes="0">
27	<Group type="103" groupAlignment="0" attributes="0">	26	<Group type="103" groupAlignment="0" attributes="0">
28	<Component id="otherLabel" min="-2" max="-2" attributes="0"/>	27	<Component id="otherLabel" min="-2" max="-2" attributes="0"/>
Lines 41-70 Link Here
41	<Component id="jSeparator3" alignment="0" max="32767" attributes="0"/>	40	<Component id="jSeparator3" alignment="0" max="32767" attributes="0"/>
42	<Group type="102" attributes="0">	41	<Group type="102" attributes="0">
43	<Group type="103" groupAlignment="0" max="-2" attributes="0">	42	<Group type="103" groupAlignment="0" max="-2" attributes="0">
44	<Component id="namingConventionsLabel" min="-2" max="-2" attributes="0"/>
45	<Component id="memberOrderLabel" alignment="0" min="-2" max="-2" attributes="0"/>	43	<Component id="memberOrderLabel" alignment="0" min="-2" max="-2" attributes="0"/>
46	<Group type="102" attributes="0">	44	<Group type="102" attributes="0">
47	<EmptySpace max="-2" attributes="0"/>	45	<EmptySpace max="-2" attributes="0"/>
48	<Group type="103" groupAlignment="0" max="-2" attributes="0">	46	<Group type="103" groupAlignment="0" attributes="0">
49	<Component id="isForBooleanGettersCheckBox" min="-2" max="-2" attributes="0"/>	47	<Component id="jScrollPane1" min="-2" pref="160" max="-2" attributes="0"/>
50	<Component id="preferLongerNamesCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>	48	<Component id="jScrollPane2" alignment="0" min="-2" pref="160" max="-2" attributes="0"/>
51	<Component id="jPanel1" alignment="0" min="-2" pref="274" max="-2" attributes="0"/>	49	</Group>
52	<Group type="102" attributes="0">	50	<EmptySpace max="-2" attributes="0"/>
53	<Group type="103" groupAlignment="0" attributes="0">	51	<Group type="103" groupAlignment="0" attributes="0">
54	<Component id="jScrollPane1" max="32767" attributes="0"/>	52	<Group type="103" alignment="0" groupAlignment="0" max="-2" attributes="0">
55	<Component id="jScrollPane2" alignment="0" min="-2" pref="160" max="-2" attributes="0"/>	53	<Component id="downButton" min="-2" pref="108" max="-2" attributes="0"/>
56	</Group>	54	<Component id="upButton" min="-2" pref="108" max="-2" attributes="0"/>
57	<EmptySpace max="-2" attributes="0"/>	55	</Group>
58	<Group type="103" groupAlignment="0" attributes="0">	56	<Group type="103" alignment="0" groupAlignment="0" max="-2" attributes="0">
59	<Group type="103" alignment="0" groupAlignment="0" max="-2" attributes="0">	57	<Component id="visDownButton" min="-2" pref="108" max="-2" attributes="0"/>
60	<Component id="downButton" max="32767" attributes="0"/>	58	<Component id="visUpButton" min="-2" pref="108" max="-2" attributes="0"/>
61	<Component id="upButton" min="-2" pref="108" max="-2" attributes="0"/>
62	</Group>
63	<Group type="103" alignment="0" groupAlignment="0" max="-2" attributes="0">
64	<Component id="visDownButton" max="32767" attributes="0"/>
65	<Component id="visUpButton" min="-2" pref="108" max="-2" attributes="0"/>
66	</Group>
67	</Group>
68	</Group>	59	</Group>
69	</Group>	60	</Group>
70	</Group>	61	</Group>
Lines 84-98 Link Here
84	<DimensionLayout dim="1">	75	<DimensionLayout dim="1">
85	<Group type="103" groupAlignment="0" attributes="0">	76	<Group type="103" groupAlignment="0" attributes="0">
86	<Group type="102" attributes="0">	77	<Group type="102" attributes="0">
87	<Component id="namingConventionsLabel" min="-2" max="-2" attributes="0"/>
88	<EmptySpace max="-2" attributes="0"/>
89	<Component id="preferLongerNamesCheckBox" min="-2" max="-2" attributes="0"/>
90	<EmptySpace max="-2" attributes="0"/>
91	<Component id="isForBooleanGettersCheckBox" min="-2" max="-2" attributes="0"/>
92	<EmptySpace max="-2" attributes="0"/>
93	<Component id="jPanel1" min="-2" max="-2" attributes="0"/>
94	<EmptySpace max="-2" attributes="0"/>
95	<Component id="jSeparator1" min="-2" max="-2" attributes="0"/>
96	<EmptySpace max="-2" attributes="0"/>	78	<EmptySpace max="-2" attributes="0"/>
97	<Component id="otherLabel" min="-2" max="-2" attributes="0"/>	79	<Component id="otherLabel" min="-2" max="-2" attributes="0"/>
98	<EmptySpace max="-2" attributes="0"/>	80	<EmptySpace max="-2" attributes="0"/>
Lines 140-344 Link Here
140	</DimensionLayout>	122	</DimensionLayout>
141	</Layout>	123	</Layout>
142	<SubComponents>	124	<SubComponents>
143	<Component class="javax.swing.JLabel" name="namingConventionsLabel">
144	<Properties>
145	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
146	<ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_Naming" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
147	</Property>
148	</Properties>
149	</Component>
150	<Component class="javax.swing.JCheckBox" name="preferLongerNamesCheckBox">
151	<Properties>
152	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
153	<ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_PreferLongerNames" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
154	</Property>
155	<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
156	<Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
157	<EmptyBorder bottom="0" left="0" right="0" top="0"/>
158	</Border>
159	</Property>
160	<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
161	<Insets value="[0, 0, 0, 0]"/>
162	</Property>
163	<Property name="opaque" type="boolean" value="false"/>
164	</Properties>
165	</Component>
166	<Component class="javax.swing.JCheckBox" name="isForBooleanGettersCheckBox">
167	<Properties>
168	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
169	<ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_UseIsForBooleanGetters" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
170	</Property>
171	<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
172	<Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
173	<EmptyBorder bottom="0" left="0" right="0" top="0"/>
174	</Border>
175	</Property>
176	<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
177	<Insets value="[0, 0, 0, 0]"/>
178	</Property>
179	<Property name="opaque" type="boolean" value="false"/>
180	</Properties>
181	</Component>
182	<Container class="javax.swing.JPanel" name="jPanel1">
183
184	<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
185	<SubComponents>
186	<Component class="javax.swing.JLabel" name="prefixLabel">
187	<Properties>
188	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
189	<ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_Prefix" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
190	</Property>
191	</Properties>
192	<Constraints>
193	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
194	<GridBagConstraints gridX="1" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="17" weightX="0.5" weightY="0.0"/>
195	</Constraint>
196	</Constraints>
197	</Component>
198	<Component class="javax.swing.JLabel" name="suffixLabel">
199	<Properties>
200	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
201	<ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_Suffix" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
202	</Property>
203	</Properties>
204	<Constraints>
205	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
206	<GridBagConstraints gridX="2" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="17" weightX="0.5" weightY="0.0"/>
207	</Constraint>
208	</Constraints>
209	</Component>
210	<Component class="javax.swing.JLabel" name="fieldLabel">
211	<Properties>
212	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
213	<ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_Field" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
214	</Property>
215	</Properties>
216	<Constraints>
217	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
218	<GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
219	</Constraint>
220	</Constraints>
221	</Component>
222	<Component class="javax.swing.JTextField" name="fieldPrefixField">
223	<Properties>
224	<Property name="columns" type="int" value="5"/>
225	</Properties>
226	<Constraints>
227	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
228	<GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
229	</Constraint>
230	</Constraints>
231	</Component>
232	<Component class="javax.swing.JTextField" name="fieldSuffixField">
233	<Properties>
234	<Property name="columns" type="int" value="5"/>
235	</Properties>
236	<Constraints>
237	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
238	<GridBagConstraints gridX="2" gridY="1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
239	</Constraint>
240	</Constraints>
241	</Component>
242	<Component class="javax.swing.JLabel" name="staticFieldLabel">
243	<Properties>
244	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
245	<ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_StaticField" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
246	</Property>
247	</Properties>
248	<Constraints>
249	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
250	<GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
251	</Constraint>
252	</Constraints>
253	</Component>
254	<Component class="javax.swing.JTextField" name="staticFieldPrefixField">
255	<Properties>
256	<Property name="columns" type="int" value="5"/>
257	</Properties>
258	<Constraints>
259	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
260	<GridBagConstraints gridX="1" gridY="2" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
261	</Constraint>
262	</Constraints>
263	</Component>
264	<Component class="javax.swing.JTextField" name="staticFieldSuffixField">
265	<Properties>
266	<Property name="columns" type="int" value="5"/>
267	</Properties>
268	<Constraints>
269	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
270	<GridBagConstraints gridX="2" gridY="2" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
271	</Constraint>
272	</Constraints>
273	</Component>
274	<Component class="javax.swing.JLabel" name="parameterLabel">
275	<Properties>
276	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
277	<ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_Parameter" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
278	</Property>
279	</Properties>
280	<Constraints>
281	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
282	<GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
283	</Constraint>
284	</Constraints>
285	</Component>
286	<Component class="javax.swing.JTextField" name="parameterPrefixField">
287	<Properties>
288	<Property name="columns" type="int" value="5"/>
289	</Properties>
290	<Constraints>
291	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
292	<GridBagConstraints gridX="1" gridY="3" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
293	</Constraint>
294	</Constraints>
295	</Component>
296	<Component class="javax.swing.JTextField" name="parameterSuffixField">
297	<Properties>
298	<Property name="columns" type="int" value="5"/>
299	</Properties>
300	<Constraints>
301	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
302	<GridBagConstraints gridX="2" gridY="3" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
303	</Constraint>
304	</Constraints>
305	</Component>
306	<Component class="javax.swing.JLabel" name="localVarLabel">
307	<Properties>
308	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
309	<ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_LocalVariable" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
310	</Property>
311	</Properties>
312	<Constraints>
313	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
314	<GridBagConstraints gridX="0" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
315	</Constraint>
316	</Constraints>
317	</Component>
318	<Component class="javax.swing.JTextField" name="localVarSuffixField">
319	<Properties>
320	<Property name="columns" type="int" value="5"/>
321	</Properties>
322	<Constraints>
323	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
324	<GridBagConstraints gridX="1" gridY="4" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
325	</Constraint>
326	</Constraints>
327	</Component>
328	<Component class="javax.swing.JTextField" name="localVarPrefixField">
329	<Properties>
330	<Property name="columns" type="int" value="5"/>
331	</Properties>
332	<Constraints>
333	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
334	<GridBagConstraints gridX="2" gridY="4" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
335	</Constraint>
336	</Constraints>
337	</Component>
338	</SubComponents>
339	</Container>
340	<Component class="javax.swing.JSeparator" name="jSeparator1">
341	</Component>
342	<Component class="javax.swing.JLabel" name="otherLabel">	125	<Component class="javax.swing.JLabel" name="otherLabel">
343	<Properties>	126	<Properties>
344	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">	127	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">

Added Link Here

(-)bdb0f6cd71ec (+255 lines)
1	<?xml version="1.0" encoding="UTF-8" ?>
2
3	<Form version="1.8" maxVersion="1.8" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
4	<Properties>
5	<Property name="name" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
6	<ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_Naming" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
7	</Property>
8	<Property name="opaque" type="boolean" value="false"/>
9	</Properties>
10	<AuxValues>
11	<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
12	<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
13	<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
14	<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
15	<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
16	<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
17	<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
18	<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
19	<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
20	</AuxValues>
21
22	<Layout>
23	<DimensionLayout dim="0">
24	<Group type="103" groupAlignment="0" attributes="0">
25	<Group type="102" attributes="0">
26	<Group type="103" groupAlignment="0" attributes="0">
27	<Component id="namingConventionsLabel" min="-2" max="-2" attributes="0"/>
28	<Group type="102" attributes="0">
29	<EmptySpace max="-2" attributes="0"/>
30	<Group type="103" groupAlignment="0" attributes="0">
31	<Component id="isForBooleanGettersCheckBox" min="-2" max="-2" attributes="0"/>
32	<Component id="preferLongerNamesCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
33	<Component id="jPanel1" alignment="0" min="-2" pref="274" max="-2" attributes="0"/>
34	</Group>
35	</Group>
36	</Group>
37	<EmptySpace max="32767" attributes="0"/>
38	</Group>
39	</Group>
40	</DimensionLayout>
41	<DimensionLayout dim="1">
42	<Group type="103" groupAlignment="0" attributes="0">
43	<Group type="102" attributes="0">
44	<Component id="namingConventionsLabel" min="-2" max="-2" attributes="0"/>
45	<EmptySpace max="-2" attributes="0"/>
46	<Component id="preferLongerNamesCheckBox" min="-2" max="-2" attributes="0"/>
47	<EmptySpace max="-2" attributes="0"/>
48	<Component id="isForBooleanGettersCheckBox" min="-2" max="-2" attributes="0"/>
49	<EmptySpace max="-2" attributes="0"/>
50	<Component id="jPanel1" min="-2" max="-2" attributes="0"/>
51	<EmptySpace max="32767" attributes="0"/>
52	</Group>
53	</Group>
54	</DimensionLayout>
55	</Layout>
56	<SubComponents>
57	<Component class="javax.swing.JLabel" name="namingConventionsLabel">
58	<Properties>
59	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
60	<ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_Naming" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
61	</Property>
62	</Properties>
63	</Component>
64	<Component class="javax.swing.JCheckBox" name="preferLongerNamesCheckBox">
65	<Properties>
66	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
67	<ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_PreferLongerNames" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
68	</Property>
69	<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
70	<Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
71	<EmptyBorder bottom="0" left="0" right="0" top="0"/>
72	</Border>
73	</Property>
74	<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
75	<Insets value="[0, 0, 0, 0]"/>
76	</Property>
77	<Property name="opaque" type="boolean" value="false"/>
78	</Properties>
79	</Component>
80	<Component class="javax.swing.JCheckBox" name="isForBooleanGettersCheckBox">
81	<Properties>
82	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
83	<ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_UseIsForBooleanGetters" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
84	</Property>
85	<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
86	<Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
87	<EmptyBorder bottom="0" left="0" right="0" top="0"/>
88	</Border>
89	</Property>
90	<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
91	<Insets value="[0, 0, 0, 0]"/>
92	</Property>
93	<Property name="opaque" type="boolean" value="false"/>
94	</Properties>
95	</Component>
96	<Container class="javax.swing.JPanel" name="jPanel1">
97
98	<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
99	<SubComponents>
100	<Component class="javax.swing.JLabel" name="prefixLabel">
101	<Properties>
102	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
103	<ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_Prefix" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
104	</Property>
105	</Properties>
106	<Constraints>
107	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
108	<GridBagConstraints gridX="1" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="17" weightX="0.5" weightY="0.0"/>
109	</Constraint>
110	</Constraints>
111	</Component>
112	<Component class="javax.swing.JLabel" name="suffixLabel">
113	<Properties>
114	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
115	<ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_Suffix" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
116	</Property>
117	</Properties>
118	<Constraints>
119	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
120	<GridBagConstraints gridX="2" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="17" weightX="0.5" weightY="0.0"/>
121	</Constraint>
122	</Constraints>
123	</Component>
124	<Component class="javax.swing.JLabel" name="fieldLabel">
125	<Properties>
126	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
127	<ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_Field" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
128	</Property>
129	</Properties>
130	<Constraints>
131	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
132	<GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
133	</Constraint>
134	</Constraints>
135	</Component>
136	<Component class="javax.swing.JTextField" name="fieldPrefixField">
137	<Properties>
138	<Property name="columns" type="int" value="5"/>
139	</Properties>
140	<Constraints>
141	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
142	<GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
143	</Constraint>
144	</Constraints>
145	</Component>
146	<Component class="javax.swing.JTextField" name="fieldSuffixField">
147	<Properties>
148	<Property name="columns" type="int" value="5"/>
149	</Properties>
150	<Constraints>
151	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
152	<GridBagConstraints gridX="2" gridY="1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
153	</Constraint>
154	</Constraints>
155	</Component>
156	<Component class="javax.swing.JLabel" name="staticFieldLabel">
157	<Properties>
158	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
159	<ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_StaticField" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
160	</Property>
161	</Properties>
162	<Constraints>
163	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
164	<GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
165	</Constraint>
166	</Constraints>
167	</Component>
168	<Component class="javax.swing.JTextField" name="staticFieldPrefixField">
169	<Properties>
170	<Property name="columns" type="int" value="5"/>
171	</Properties>
172	<Constraints>
173	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
174	<GridBagConstraints gridX="1" gridY="2" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
175	</Constraint>
176	</Constraints>
177	</Component>
178	<Component class="javax.swing.JTextField" name="staticFieldSuffixField">
179	<Properties>
180	<Property name="columns" type="int" value="5"/>
181	</Properties>
182	<Constraints>
183	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
184	<GridBagConstraints gridX="2" gridY="2" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
185	</Constraint>
186	</Constraints>
187	</Component>
188	<Component class="javax.swing.JLabel" name="parameterLabel">
189	<Properties>
190	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
191	<ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_Parameter" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
192	</Property>
193	</Properties>
194	<Constraints>
195	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
196	<GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
197	</Constraint>
198	</Constraints>
199	</Component>
200	<Component class="javax.swing.JTextField" name="parameterPrefixField">
201	<Properties>
202	<Property name="columns" type="int" value="5"/>
203	</Properties>
204	<Constraints>
205	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
206	<GridBagConstraints gridX="1" gridY="3" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
207	</Constraint>
208	</Constraints>
209	</Component>
210	<Component class="javax.swing.JTextField" name="parameterSuffixField">
211	<Properties>
212	<Property name="columns" type="int" value="5"/>
213	</Properties>
214	<Constraints>
215	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
216	<GridBagConstraints gridX="2" gridY="3" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
217	</Constraint>
218	</Constraints>
219	</Component>
220	<Component class="javax.swing.JLabel" name="localVarLabel">
221	<Properties>
222	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
223	<ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_LocalVariable" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
224	</Property>
225	</Properties>
226	<Constraints>
227	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
228	<GridBagConstraints gridX="0" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
229	</Constraint>
230	</Constraints>
231	</Component>
232	<Component class="javax.swing.JTextField" name="localVarSuffixField">
233	<Properties>
234	<Property name="columns" type="int" value="5"/>
235	</Properties>
236	<Constraints>
237	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
238	<GridBagConstraints gridX="2" gridY="4" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
239	</Constraint>
240	</Constraints>
241	</Component>
242	<Component class="javax.swing.JTextField" name="localVarPrefixField">
243	<Properties>
244	<Property name="columns" type="int" value="5"/>
245	</Properties>
246	<Constraints>
247	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
248	<GridBagConstraints gridX="1" gridY="4" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="8" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.5" weightY="0.0"/>
249	</Constraint>
250	</Constraints>
251	</Component>
252	</SubComponents>
253	</Container>
254	</SubComponents>
255	</Form>

Lines 97-103 Link Here

(-)a/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/EncapsulateFieldRefactoringPlugin.java (-73 / +26 lines)
97	private static Set<Modifier> accessModifiers = EnumSet.of(Modifier.PRIVATE, Modifier.PROTECTED, Modifier.PUBLIC);	97	private static Set<Modifier> accessModifiers = EnumSet.of(Modifier.PRIVATE, Modifier.PROTECTED, Modifier.PUBLIC);
98	private static List<Modifier> MODIFIERS = Arrays.asList(Modifier.PRIVATE, null, Modifier.PROTECTED, Modifier.PUBLIC);	98	private static List<Modifier> MODIFIERS = Arrays.asList(Modifier.PRIVATE, null, Modifier.PROTECTED, Modifier.PUBLIC);
99	private final EncapsulateFieldRefactoring refactoring;	99	private final EncapsulateFieldRefactoring refactoring;
100	public static final String CLASS_FIELD_PREFIX = "_"; // NOI18N	100
101	/**	101	/**
102	* path in source with field declaration; refactoring.getSelectedObject()	102	* path in source with field declaration; refactoring.getSelectedObject()
103	* may contain path to a reference	103	* may contain path to a reference
Lines 390-444 Link Here
390	return false;	390	return false;
391	}	391	}
392		392
393	/**
394	* Removes the class field prefix from the identifer of a field. For
395	* example, if the class field prefix is "_", the identifier "_name" is
396	* stripped to become "name".
397	*
398	* @param identifierString The identifer to strip.
399	* @return The stripped identifier.
400	*/
401	private static String stripPrefix(String identifierString) {
402	String stripped;
403	if (identifierString.startsWith(CLASS_FIELD_PREFIX) && identifierString.length() > 1) {
404	stripped = identifierString.substring(CLASS_FIELD_PREFIX.length());
405	} else {
406	stripped = identifierString;
407	}
408	return stripped;
409	}
410
411	private static StringBuilder getCapitalizedName(VariableElement field) {
412	StringBuilder name = new StringBuilder(stripPrefix(field.getSimpleName().toString()));
413
414	//Beans naming convention, #165241
415	if (name.length() > 1 && Character.isUpperCase(name.charAt(1))) {
416	return name;
417	}
418
419	name.setCharAt(0, Character.toUpperCase(name.charAt(0)));
420	return name;
421	}
422
423	public static String computeSetterName(VariableElement field) {
424	StringBuilder name = getCapitalizedName(field);
425
426	name.insert(0, "set"); //NOI18N
427	return name.toString();
428	}
429
430	public static String computeGetterName(VariableElement field) {
431	StringBuilder name = getCapitalizedName(field);
432
433	if (TypeKind.BOOLEAN == field.asType().getKind()) { // XXX check autoboxing???
434	name.insert(0, "is"); //NOI18N
435	} else {
436	name.insert(0, "get"); //NOI18N
437	}
438
439	return name.toString();
440	}
441
442	@Override	393	@Override
443	public Problem prepare(RefactoringElementsBag bag) {	394	public Problem prepare(RefactoringElementsBag bag) {
444		395
Lines 605-628 Link Here
605	ClassTree nct = node;	556	ClassTree nct = node;
606	List<Tree> newMembers = new ArrayList<Tree>();	557	List<Tree> newMembers = new ArrayList<Tree>();
607	int getterIdx = 0;	558	int getterIdx = 0;
608	VariableTree pcs = null;	559	VariableTree pcs = null;
609	if (descs.get(0).refactoring.isGeneratePropertyChangeSupport()) {	560	if (descs.get(0).refactoring.isGeneratePropertyChangeSupport()) {
610	pcs = getPropertyChangeSupport(clazz, "java.beans.PropertyChangeSupport"); //NOI18N	561	pcs = getPropertyChangeSupport(clazz, "java.beans.PropertyChangeSupport"); //NOI18N
611	if (pcs == null) {	562	if (pcs == null) {
612	pcs = createPropertyChangeSupport("java.beans.PropertyChangeSupport", "propertyChangeSupport");//NOI18N	563	pcs = createPropertyChangeSupport("java.beans.PropertyChangeSupport", "propertyChangeSupport");//NOI18N
613	newMembers.add(pcs);	564	newMembers.add(pcs);
614	}
615	}	565	}
		566	}
616		567
617	VariableTree vcs = null;	568	VariableTree vcs = null;
618	if (descs.get(0).refactoring.isGenerateVetoableChangeSupport()) {	569	if (descs.get(0).refactoring.isGenerateVetoableChangeSupport()) {
619	vcs = getPropertyChangeSupport(clazz, "java.beans.VetoableChangeSupport");//NOI18N	570	vcs = getPropertyChangeSupport(clazz, "java.beans.VetoableChangeSupport");//NOI18N
620	if (vcs == null) {	571	if (vcs == null) {
621	vcs = createPropertyChangeSupport("java.beans.VetoableChangeSupport", "vetoableChangeSupport");//NOI18N	572	vcs = createPropertyChangeSupport("java.beans.VetoableChangeSupport", "vetoableChangeSupport");//NOI18N
622	newMembers.add(vcs);	573	newMembers.add(vcs);
623	}
624	}	574	}
625		575	}
		576	CodeStyle cs = RefactoringUtils.getCodeStyle(workingCopy);
626	for (EncapsulateDesc desc : descs) {	577	for (EncapsulateDesc desc : descs) {
627	VariableTree propName = createPropName(clazz, desc);	578	VariableTree propName = createPropName(clazz, desc);
628	if (pcs!=null) {	579	if (pcs!=null) {
Lines 633-638 Link Here
633	desc.refactoring.getGetterName(),	584	desc.refactoring.getGetterName(),
634	desc.refactoring.getSetterName(),	585	desc.refactoring.getSetterName(),
635	desc.refactoring.getMethodModifiers(),	586	desc.refactoring.getMethodModifiers(),
		587	cs,
636	pcs,	588	pcs,
637	vcs,	589	vcs,
638	propName);	590	propName);
Lines 989-1005 Link Here
989	}	941	}
990		942
991	private MethodTree[] createGetterAndSetter(	943	private MethodTree[] createGetterAndSetter(
992	VariableElement field, String getterName,	944	VariableElement field, String getterName, String setterName,
993	String setterName, Set<Modifier> useModifiers,	945	Set<Modifier> useModifiers, CodeStyle cs,
994	VariableTree propertyChange, VariableTree vetoableChange, VariableTree propName) {	946	VariableTree propertyChange, VariableTree vetoableChange, VariableTree propName) {
995
996
997	String fieldName = field.getSimpleName().toString();
998	boolean staticMod = field.getModifiers().contains(Modifier.STATIC);	947	boolean staticMod = field.getModifiers().contains(Modifier.STATIC);
		948	String fieldName = CodeStyleUtils.removePrefixSuffix(field.getSimpleName(),
		949	staticMod ? cs.getStaticFieldNamePrefix() : cs.getFieldNamePrefix(),
		950	staticMod ? cs.getStaticFieldNameSuffix() : cs.getFieldNameSuffix());
		951
999	String longName = (staticMod ? "" : "this.") + fieldName;//NOI18N	952	String longName = (staticMod ? "" : "this.") + fieldName;//NOI18N
1000	String oldName = "old" + getCapitalizedName(field);//NOI18N	953	String oldName = "old" + CodeStyleUtils.getCapitalizedName(fieldName);//NOI18N
1001	String parName = staticMod ? "a" + getCapitalizedName(field) : Utilities.isJavaIdentifier(stripPrefix(fieldName)) ? stripPrefix(fieldName) : fieldName; //NOI18N	954	String parName = staticMod ? "a" + CodeStyleUtils.getCapitalizedName(fieldName) : fieldName; //NOI18N
1002	String getterBody = "{return " + fieldName + ";}"; //NOI18N	955	String getterBody = "{return " + field.getSimpleName() + ";}"; //NOI18N
1003	StringBuilder setterBody = new StringBuilder();	956	StringBuilder setterBody = new StringBuilder();
1004	setterBody.append("{");//NOI18N	957	setterBody.append("{");//NOI18N
1005		958

Lines 118-124 Link Here

(-)a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ChangeParametersPanel.java (-4 / +5 lines)
118	private boolean methodNameChanged;	118	private boolean methodNameChanged;
119	private boolean returnTypeChanged;	119	private boolean returnTypeChanged;
120	private boolean isConstructor;	120	private boolean isConstructor;
121		121	private final String paramname;
122		122
123	@Override	123	@Override
124	public Component getComponent() {	124	public Component getComponent() {
Lines 142-148 Link Here
142	private static final String ACTION_INLINE_EDITOR = "invokeInlineEditor"; //NOI18N	142	private static final String ACTION_INLINE_EDITOR = "invokeInlineEditor"; //NOI18N
143		143
144	/** Creates new form ChangeMethodSignature */	144	/** Creates new form ChangeMethodSignature */
145	public ChangeParametersPanel(TreePathHandle refactoredObj, ChangeListener parent, ParameterInfo[] preConfiguration) {	145	public ChangeParametersPanel(TreePathHandle refactoredObj, ChangeListener parent, ParameterInfo[] preConfiguration, CodeStyle cs) {
146	returnTypeDocListener = new ReturnTypeDocListener();	146	returnTypeDocListener = new ReturnTypeDocListener();
147	methodNameDocListener = new MethodNameDocListener();	147	methodNameDocListener = new MethodNameDocListener();
148	this.refactoredObj = refactoredObj;	148	this.refactoredObj = refactoredObj;
Lines 151-157 Link Here
151	model = new ParamTableModel(columnNames, 0);	151	model = new ParamTableModel(columnNames, 0);
152	this.returnTypeAction = new ReturnTypeAction();	152	this.returnTypeAction = new ReturnTypeAction();
153	singleLineEditor = Utilities.createSingleLineEditor(MIME_JAVA);	153	singleLineEditor = Utilities.createSingleLineEditor(MIME_JAVA);
154		154	paramname = CodeStyleUtils.addPrefixSuffix("par", cs.getParameterNamePrefix(), cs.getParameterNameSuffix());
		155
155	initComponents();	156	initComponents();
156		157
157	InputMap im = paramTable.getInputMap(JTable.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);	158	InputMap im = paramTable.getInputMap(JTable.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
Lines 616-622 Link Here
616	private void addButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addButtonActionPerformed	617	private void addButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addButtonActionPerformed
617	acceptEditedValue();	618	acceptEditedValue();
618	int rowCount = model.getRowCount();	619	int rowCount = model.getRowCount();
619	model.addRow(new Object[] { "Object", "par" + rowCount, "null", new Integer(-1), Boolean.TRUE }); // NOI18N	620	model.addRow(new Object[] { "Object", paramname + rowCount, "null", new Integer(-1), Boolean.TRUE }); // NOI18N
620	paramTable.scrollRectToVisible(paramTable.getCellRect(rowCount, 0, false));	621	paramTable.scrollRectToVisible(paramTable.getCellRect(rowCount, 0, false));
621	paramTable.changeSelection(rowCount, 0, false, false);	622	paramTable.changeSelection(rowCount, 0, false, false);
622	autoEdit(paramTable);	623	autoEdit(paramTable);