Attachment #115813 for bug #208503

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




    <!-- ACTUAL CHANGES BEGIN HERE: -->

    <changes>
        <change id="class-members-order">
             <api name="general"/>
             <summary>Added several methods to <code>CodeStyle</code> supporting customization of the generated class members order and other minor formatting enhancements.</summary>
             <version major="0" minor="96"/>
             <date day="16" month="2" year="2012"/>
             <author login="dbalek"/>
             <compatibility addition="yes" binary="compatible" deletion="no" deprecation="no" modification="no" semantic="compatible" source="compatible"/>
             <description>
                 Added <code>CodeStyle.getClassMemberGroups</code>, <code>CodeStyle.getClassMemberInsertionPoint</code>,
                 to support customization of the generated class members order, and <code>CodeStyle.wrapAfterDotInChainedMethodCalls</code>,
                 <code>CodeStyle.getBlankLinesAfterAnonymousClassHeader</code>, <code>CodeStyle.spaceAroundAnnotationValueAssignOps</code>
                 to support minor formatting enhancements.
             </description>
             <issue number="20672"/>
        </change>
        <change id="SourceUtils-backgroundScan">
             <api name="general"/>
             <summary>Added <code>SourceUtils.waitUserActionTask</code>.</summary>

Lines 46-60 Link Here

(-)a/java.source/src/org/netbeans/api/java/source/CodeStyle.java (-3 / +180 lines)
46		46
47	import java.util.Arrays;	47	import java.util.Arrays;
48	import java.util.Comparator;	48	import java.util.Comparator;
		49	import java.util.EnumSet;
		50	import java.util.Set;
49	import java.util.prefs.Preferences;	51	import java.util.prefs.Preferences;
		52
		53	import javax.lang.model.element.Element;
		54	import javax.lang.model.element.ElementKind;
		55	import javax.lang.model.element.Modifier;
50	import javax.swing.text.Document;	56	import javax.swing.text.Document;
		57
		58	import com.sun.source.tree.BlockTree;
		59	import com.sun.source.tree.ClassTree;
		60	import com.sun.source.tree.MethodTree;
		61	import com.sun.source.tree.Tree;
		62	import com.sun.source.tree.VariableTree;
		63
51	import org.netbeans.api.project.Project;	64	import org.netbeans.api.project.Project;
52	import org.netbeans.modules.editor.indent.spi.CodeStylePreferences;	65	import org.netbeans.modules.editor.indent.spi.CodeStylePreferences;
53	import org.netbeans.modules.java.source.parsing.JavacParser;	66	import org.netbeans.modules.java.source.parsing.JavacParser;
54	import org.netbeans.modules.java.ui.FmtOptions;	67	import org.netbeans.modules.java.ui.FmtOptions;
55		68	import static org.netbeans.modules.java.ui.FmtOptions.*;
56	import org.openide.filesystems.FileObject;	69	import org.openide.filesystems.FileObject;
57	import static org.netbeans.modules.java.ui.FmtOptions.*;
58		70
59	/**	71	/**
60	* XXX make sure the getters get the defaults from somewhere	72	* XXX make sure the getters get the defaults from somewhere
Lines 239-245 Link Here
239	}	251	}
240		252
241	public boolean makeParametersFinal() {	253	public boolean makeParametersFinal() {
242	return preferences.getBoolean(makeParametersFinal, getDefaultAsBoolean(useFQNs));	254	return preferences.getBoolean(makeParametersFinal, getDefaultAsBoolean(makeParametersFinal));
		255	}
		256
		257	/**
		258	* Returns an information about the desired grouping of class members.
		259	* @since 0.96
		260	*/
		261	public MemberGroups getClassMemberGroups() {
		262	return new MemberGroups(preferences.get(classMembersOrder, getDefaultAsString(classMembersOrder)),
		263	preferences.getBoolean(sortMembersByVisibility, getDefaultAsBoolean(sortMembersByVisibility))
		264	? preferences.get(visibilityOrder, getDefaultAsString(visibilityOrder)) : null);
		265	}
		266
		267	/**
		268	* Returns an information about the desired insertion point of a new class member.
		269	* @since 0.96
		270	*/
		271	public InsertionPoint getClassMemberInsertionPoint() {
		272	String point = preferences.get(classMemberInsertionPoint, getDefaultAsString(classMemberInsertionPoint));
		273	return InsertionPoint.valueOf(point);
243	}	274	}
244		275
245	// Alignment and braces ----------------------------------------------------	276	// Alignment and braces ----------------------------------------------------
Lines 400-405 Link Here
400	return WrapStyle.valueOf(wrap);	431	return WrapStyle.valueOf(wrap);
401	}	432	}
402		433
		434	public boolean wrapAfterDotInChainedMethodCalls() {
		435	return preferences.getBoolean(wrapAfterDotInChainedMethodCalls, getDefaultAsBoolean(wrapAfterDotInChainedMethodCalls));
		436	}
		437
403	public WrapStyle wrapArrayInit() {	438	public WrapStyle wrapArrayInit() {
404	String wrap = preferences.get(wrapArrayInit, getDefaultAsString(wrapArrayInit));	439	String wrap = preferences.get(wrapArrayInit, getDefaultAsString(wrapArrayInit));
405	return WrapStyle.valueOf(wrap);	440	return WrapStyle.valueOf(wrap);
Lines 511-516 Link Here
511	return preferences.getInt(blankLinesAfterClassHeader, getDefaultAsInt(blankLinesAfterClassHeader));	546	return preferences.getInt(blankLinesAfterClassHeader, getDefaultAsInt(blankLinesAfterClassHeader));
512	}	547	}
513		548
		549	public int getBlankLinesAfterAnonymousClassHeader() {
		550	return preferences.getInt(blankLinesAfterAnonymousClassHeader, getDefaultAsInt(blankLinesAfterAnonymousClassHeader));
		551	}
		552
514	public int getBlankLinesBeforeFields() {	553	public int getBlankLinesBeforeFields() {
515	return preferences.getInt(blankLinesBeforeFields, getDefaultAsInt(blankLinesBeforeFields));	554	return preferences.getInt(blankLinesBeforeFields, getDefaultAsInt(blankLinesBeforeFields));
516	}	555	}
Lines 604-609 Link Here
604	return preferences.getBoolean(spaceAroundAssignOps, getDefaultAsBoolean(spaceAroundAssignOps));	643	return preferences.getBoolean(spaceAroundAssignOps, getDefaultAsBoolean(spaceAroundAssignOps));
605	}	644	}
606		645
		646	public boolean spaceAroundAnnotationValueAssignOps() {
		647	return preferences.getBoolean(spaceAroundAnnotationValueAssignOps, getDefaultAsBoolean(spaceAroundAnnotationValueAssignOps));
		648	}
		649
607	public boolean spaceBeforeClassDeclLeftBrace() {	650	public boolean spaceBeforeClassDeclLeftBrace() {
608	return preferences.getBoolean(spaceBeforeClassDeclLeftBrace, getDefaultAsBoolean(spaceBeforeClassDeclLeftBrace));	651	return preferences.getBoolean(spaceBeforeClassDeclLeftBrace, getDefaultAsBoolean(spaceBeforeClassDeclLeftBrace));
609	}	652	}
Lines 896-901 Link Here
896	WRAP_NEVER	939	WRAP_NEVER
897	}	940	}
898		941
		942	public enum InsertionPoint {
		943	LAST_IN_CATEGORY,
		944	FIRST_IN_CATEGORY,
		945	CARET_LOCATION
		946	}
		947
899	/**	948	/**
900	* Provides an information about the desired grouping of import statements,	949	* Provides an information about the desired grouping of import statements,
901	* including group order.	950	* including group order.
Lines 971-976 Link Here
971	}	1020	}
972	}	1021	}
973		1022
		1023	/**
		1024	* Provides an information about the desired grouping of class members,
		1025	* including group order.
		1026	* @since 0.96
		1027	*/
		1028	public static final class MemberGroups {
		1029
		1030	private Info[] infos;
		1031
		1032	private MemberGroups(String groups, String visibility) {
		1033	if (groups == null \|\| groups.length() == 0) {
		1034	this.infos = new Info[0];
		1035	} else {
		1036	String[] order = groups.trim().split("\\s[,;]\\s"); //NOI18N
		1037	String[] visibilityOrder = visibility != null ? visibility.trim().split("\\s[,;]\\s") : new String[1]; //NOI18N
		1038	this.infos = new Info[order.length * visibilityOrder.length];
		1039	for (int i = 0; i < order.length; i++) {
		1040	String o = order[i];
		1041	boolean isStatic = false;
		1042	if (o.startsWith("STATIC ")) { //NOI18N
		1043	isStatic = true;
		1044	o = o.substring(7);
		1045	}
		1046	ElementKind kind = ElementKind.valueOf(o);
		1047	for (int j = 0; j < visibilityOrder.length; j++) {
		1048	int idx = i * visibilityOrder.length + j;
		1049	String vo = visibilityOrder[j];
		1050	Info info = new Info(idx);
		1051	info.ignoreVisibility = vo == null \|\| !"DEFAULT".equals(vo); //NOI18N
		1052	info.mods = vo != null && !"DEFAULT".equals(vo) ? EnumSet.of(Modifier.valueOf(vo)) : EnumSet.noneOf(Modifier.class); //NOI18N
		1053	if (isStatic)
		1054	info.mods.add(Modifier.STATIC);
		1055	info.kind = kind;
		1056	this.infos[idx] = info;
		1057	}
		1058	}
		1059	}
		1060	}
		1061
		1062	/**
		1063	* Returns the group number of the class member. Elements with the same
		1064	* number form a group. Groups with lower numbers should be positioned
		1065	* higher in the class member list.
		1066	* @param tree the member tree
		1067	* @return the group number
		1068	* @since 0.96
		1069	*/
		1070	public int getGroupId(Tree tree) {
		1071	for (Info info : infos) {
		1072	ElementKind kind = ElementKind.OTHER;
		1073	Set<Modifier> modifiers = null;
		1074	switch (tree.getKind()) {
		1075	case ANNOTATION_TYPE:
		1076	case CLASS:
		1077	case ENUM:
		1078	case INTERFACE:
		1079	kind = ElementKind.CLASS;
		1080	modifiers = ((ClassTree)tree).getModifiers().getFlags();
		1081	break;
		1082	case METHOD:
		1083	MethodTree mt = (MethodTree)tree;
		1084	if (mt.getName().contentEquals("<init>")) { //NOI18N
		1085	kind = ElementKind.CONSTRUCTOR;
		1086	} else {
1087	kind = ElementKind.METHOD;
1088	}
1089	modifiers = mt.getModifiers().getFlags();
1090	break;
1091	case VARIABLE:
1092	kind = ElementKind.FIELD;
1093	modifiers = ((VariableTree)tree).getModifiers().getFlags();
1094	break;
1095	case BLOCK:
1096	kind = ((BlockTree)tree).isStatic() ? ElementKind.STATIC_INIT : ElementKind.INSTANCE_INIT;
1097	break;
1098	}
1099	if (info.check(kind, modifiers))
1100	return info.groupId;
1101	}
1102	return infos.length;
1103	}
1104
1105	/**
1106	* Returns the group number of the class member. Elements with the same
1107	* number form a group. Groups with lower numbers should be positioned
1108	* higher in the class member list.
1109	* @param element the member element
1110	* @return the group number
1111	* @since 0.96
1112	*/
1113	public int getGroupId(Element element) {
1114	for (Info info : infos) {
1115	ElementKind kind = element.getKind();
1116	if (kind == ElementKind.ANNOTATION_TYPE \|\| kind == ElementKind.ENUM \|\| kind == ElementKind.INSTANCE_INIT)
1117	kind = ElementKind.CLASS;
1118	if (info.check(kind, element.getModifiers()));
1119	return info.groupId;
1120	}
1121	return infos.length;
1122	}
1123
1124	private static final class Info {
1125
1126	private int groupId;
1127	private boolean ignoreVisibility;
1128	private Set<Modifier> mods;
1129	private ElementKind kind;
1130
1131	private Info(int id) {
1132	this.groupId = id;
1133	}
1134
1135	private boolean check(ElementKind kind, Set<Modifier> modifiers) {
1136	if (this.kind != kind)
1137	return false;
1138	if (modifiers == null)
1139	return true;
1140	if (!modifiers.containsAll(this.mods))
1141	return false;
1142	if (ignoreVisibility)
1143	return true;
1144	EnumSet<Modifier> copy = EnumSet.copyOf(modifiers);
1145	copy.retainAll(EnumSet.of(Modifier.PUBLIC, Modifier.PRIVATE, Modifier.PROTECTED));
1146	return copy.isEmpty();
1147	}
1148	}
1149	}
1150
974	// Communication with non public packages ----------------------------------	1151	// Communication with non public packages ----------------------------------
975		1152
976	private static class Producer implements FmtOptions.CodeStyleProducer {	1153	private static class Producer implements FmtOptions.CodeStyleProducer {




import javax.lang.model.type.TypeVariable;
import javax.lang.model.type.WildcardType;
import javax.lang.model.util.Elements;
import javax.lang.model.util.Types;
import javax.swing.text.Document;
import javax.swing.text.JTextComponent;

import org.netbeans.api.editor.EditorRegistry;
import org.netbeans.api.java.lexer.JavaTokenId;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.editor.GuardedDocument;

    public ClassTree insertClassMember(ClassTree clazz, Tree member) {
        assert clazz != null && member != null;
        int idx = 0;
        Document doc = null;
        int caretPos = -1;
        try {
            doc = copy.getDocument();
            if (doc == null) {
                DataObject data = DataObject.find(copy.getFileObject());
                EditorCookie cookie = data.getCookie(EditorCookie.class);
                doc = cookie.openDocument();
            }

            if (doc != null && doc instanceof GuardedDocument) {
                gdoc = (GuardedDocument)doc;
                sp = copy.getTrees().getSourcePositions();
            }
        } catch (IOException ioe) {}
        CodeStyle codeStyle = DiffContext.getCodeStyle(copy);
        if (codeStyle.getClassMemberInsertionPoint() == CodeStyle.InsertionPoint.CARET_LOCATION) {
            JTextComponent jtc = EditorRegistry.lastFocusedComponent();
            if (jtc.getDocument() == doc)
                caretPos = jtc.getCaretPosition();
        }
        ClassMemberComparator comparator = caretPos < 0 ? new ClassMemberComparator(codeStyle) : null;
        SourcePositions sp = copy.getTrees().getSourcePositions();
        TreeUtilities utils = copy.getTreeUtilities();
        CompilationUnitTree compilationUnit = copy.getCompilationUnit();
        Tree lastMember = null;
        for (Tree tree : clazz.getMembers()) {
            TreePath path = TreePath.getPath(compilationUnit, tree);
            if ((path == null || !utils.isSynthetic(path)) && (caretPos < 0
                    && (codeStyle.getClassMemberInsertionPoint() == CodeStyle.InsertionPoint.FIRST_IN_CATEGORY && comparator.compare(member, tree) <= 0
                    || comparator.compare(member, tree) < 0) || caretPos >= 0 && caretPos < sp.getStartPosition(compilationUnit, tree))) {
                if (doc == null || !(doc instanceof GuardedDocument))
                    break;
                int pos = (int)(lastMember != null ? sp.getEndPosition(compilationUnit, lastMember) : sp.getStartPosition( compilationUnit,clazz));
                pos = ((GuardedDocument)doc).getGuardedBlockChain().adjustToBlockEnd(pos);
                long treePos = sp.getStartPosition(compilationUnit, tree);
                if (treePos < 0 || pos <= treePos)
                    break;
            }
            idx++;


    private static class ClassMemberComparator implements Comparator<Tree> {

        private CodeStyle.MemberGroups groups;

        public ClassMemberComparator(CodeStyle cs) {
            this.groups = cs.getClassMemberGroups();
        }

        @Override
        public int compare(Tree tree1, Tree tree2) {
            if (tree1 == tree2)
                return 0;
            return groups.getGroupId(tree1) - groups.getGroupId(tree2);
        }

        private static int getSortPriority(Tree tree) {
            int ret = 0;
            ModifiersTree modifiers = null;
            switch (tree.getKind()) {
            case ANNOTATION_TYPE:
            case CLASS:
            case ENUM:
            case INTERFACE:
                ret = 4000;
                modifiers = ((ClassTree)tree).getModifiers();
                break;
            case METHOD:
                MethodTree mt = (MethodTree)tree;
                if (mt.getName().contentEquals("<init>"))
                    ret = 200;
                else
                    ret = 300;
                modifiers = mt.getModifiers();
                break;
            case VARIABLE:
                ret = 100;
                modifiers = ((VariableTree)tree).getModifiers();
                break;
            }
            if (modifiers != null) {
                if (!modifiers.getFlags().contains(Modifier.STATIC))
                    ret += 1000;
            }
            return ret;
        }
    }
    
    private static ClassMemberComparator CLASS_MEMBER_COMPARATOR = new ClassMemberComparator();

    private static class ImportsComparator implements Comparator<Object> {

        private CodeStyle.ImportGroups groups;




    private int fromOffset = -1;
    private int toOffset = -1;
    private boolean containsError = false;
    private boolean insideAnnotation = false;

    private final Map<Tree, ?> tree2Tag;
    private final Map<Object, int[]> tag2Span;

            }
        }
	if (!emptyClass) {
	    blankLines(enclClassName.isEmpty() ? cs.getBlankLinesAfterAnonymousClassHeader() : cs.getBlankLinesAfterClassHeader());
            if ((tree.mods.flags & ENUM) != 0) {
                printEnumConstants(tree.defs, false);
            }

    public void visitAssign(JCAssign tree) {
        int col = out.col;
	printExpr(tree.lhs, TreeInfo.assignPrec + 1);
        boolean spaceAroundAssignOps = cs.spaceAroundAssignOps();
	if (spaceAroundAssignOps)
            print(' ');
	print('=');
	int rm = cs.getRightMargin();
        switch(cs.wrapAssignOps()) {
        case WRAP_IF_LONG:
            if (widthEstimator.estimateWidth(tree.rhs, rm - out.col) + out.col <= cs.getRightMargin()) {
                if(spaceAroundAssignOps)
                    print(' ');
                break;
            }

            toColExactly(cs.alignMultilineAssignment() ? col : out.leftMargin + cs.getContinuationIndentSize());
            break;
        case WRAP_NEVER:
            if(spaceAroundAssignOps)
                print(' ');
            break;
        }


    @Override
    public void visitAnnotation(JCAnnotation tree) {
        boolean oldInsideAnnotation = insideAnnotation;
        insideAnnotation = true;
        if (!printAnnotationsFormatted(List.of(tree))) {
            print("@");
            printExpr(tree.annotationType);

                print(cs.spaceWithinAnnotationParens() ? " )" : ")");
            }
        }
        insideAnnotation = oldInsideAnnotation;
    }

    @Override

            printEmptyBlockComments(tree, members);
        } else {
            if (members)
                blankLines(enclClassName.isEmpty() ? cs.getBlankLinesAfterAnonymousClassHeader() : cs.getBlankLinesAfterClassHeader());
            else
                newline();
	    printStats(stats, members);




                          <attr name="instanceCreate" methodvalue="org.netbeans.modules.java.ui.FmtImports.getController"/>
                          <attr name="position" intvalue="800"/>
                      </file>
<!--
                      <file name="CodeGeneration.instance">
                          <attr name="instanceOf" stringvalue="org.netbeans.modules.options.editor.spi.PreferencesCustomizer$Factory"/>
                          <attr name="instanceCreate" methodvalue="org.netbeans.modules.java.ui.FmtCodeGeneration.getController"/>
                          <attr name="position" intvalue="900"/>
                      </file>
-->
                  </folder>
              </folder>
          </folder>




        return bounds[1];
    }

    protected int diffAssign(JCAssign oldT, JCAssign newT, JCTree parent, int[] bounds) {
        int localPointer = bounds[0];
        // lhs
        int[] lhsBounds = getBounds(oldT.lhs);

            tokenSequence.move(rhsBounds[0]);
            moveToSrcRelevant(tokenSequence, Direction.BACKWARD);
            if (tokenSequence.token().id() != JavaTokenId.EQ) {
                boolean spaceAroundAssignOps = parent.getKind() == Kind.ANNOTATION ? diffContext.style.spaceAroundAnnotationValueAssignOps() : diffContext.style.spaceAroundAssignOps();
                if (spaceAroundAssignOps)
                    printer.print(" = ");
                else
                    printer.print("=");

              retVal = diffParens((JCParens)oldT, (JCParens)newT, elementBounds);
              break;
          case JCTree.ASSIGN:
              retVal = diffAssign((JCAssign)oldT, (JCAssign)newT, parent, elementBounds);
              break;
          case JCTree.TYPECAST:
              retVal = diffTypeCast((JCTypeCast)oldT, (JCTypeCast)newT, elementBounds);

Lines 54-59 Link Here

(-)a/java.source/src/org/netbeans/modules/java/source/save/Reformatter.java (-59 / +103 lines)
54	import org.netbeans.api.java.platform.JavaPlatformManager;	54	import org.netbeans.api.java.platform.JavaPlatformManager;
55	import static org.netbeans.api.java.lexer.JavaTokenId.*;	55	import static org.netbeans.api.java.lexer.JavaTokenId.*;
56	import org.netbeans.api.java.source.*;	56	import org.netbeans.api.java.source.*;
		57	import org.netbeans.api.java.source.CodeStyle.WrapStyle;
57	import org.netbeans.api.lexer.Token;	58	import org.netbeans.api.lexer.Token;
58	import org.netbeans.api.lexer.TokenHierarchy;	59	import org.netbeans.api.lexer.TokenHierarchy;
59	import org.netbeans.api.lexer.TokenSequence;	60	import org.netbeans.api.lexer.TokenSequence;
Lines 136-142 Link Here
136	return;	137	return;
137	}	138	}
138	}	139	}
139	CodeStyle cs = CodeStyle.getDefault(doc);	140	CodeStyle cs = (CodeStyle) doc.getProperty(CodeStyle.class);
		141	if (cs == null)
		142	cs = CodeStyle.getDefault(doc);
140	List<Context.Region> indentRegions = context.indentRegions();	143	List<Context.Region> indentRegions = context.indentRegions();
141	Collections.reverse(indentRegions);	144	Collections.reverse(indentRegions);
142	for (Context.Region region : indentRegions)	145	for (Context.Region region : indentRegions)
Lines 426-431 Link Here
426	private int tpLevel;	429	private int tpLevel;
427	private boolean eof = false;	430	private boolean eof = false;
428	private boolean bof = false;	431	private boolean bof = false;
		432	private boolean insideAnnotation = false;
429		433
430	private Pretty(CompilationInfo info, TreePath path, CodeStyle cs, int startOffset, int endOffset, boolean templateEdit) {	434	private Pretty(CompilationInfo info, TreePath path, CodeStyle cs, int startOffset, int endOffset, boolean templateEdit) {
431	this(info.getText(), info.getTokenHierarchy().tokenSequence(JavaTokenId.language()),	435	this(info.getText(), info.getTokenHierarchy().tokenSequence(JavaTokenId.language()),
Lines 727-733 Link Here
727	} else {	731	} else {
728	if (!cs.indentTopLevelClassMembers())	732	if (!cs.indentTopLevelClassMembers())
729	indent = old;	733	indent = old;
730	blankLines(cs.getBlankLinesAfterClassHeader());	734	blankLines(node.getSimpleName().length() == 0 ? cs.getBlankLinesAfterAnonymousClassHeader() : cs.getBlankLinesAfterClassHeader());
731	JavaTokenId id = null;	735	JavaTokenId id = null;
732	boolean first = true;	736	boolean first = true;
733	boolean semiRead = false;	737	boolean semiRead = false;
Lines 1120-1126 Link Here
1120	accept(LPAREN);	1124	accept(LPAREN);
1121	if (args != null && !args.isEmpty()) {	1125	if (args != null && !args.isEmpty()) {
1122	spaces(cs.spaceWithinAnnotationParens() ? 1 : 0);	1126	spaces(cs.spaceWithinAnnotationParens() ? 1 : 0);
		1127	boolean oldInsideAnnotation = insideAnnotation;
		1128	insideAnnotation = true;
1123	wrapList(cs.wrapAnnotationArgs(), cs.alignMultilineAnnotationArgs(), false, COMMA, args);	1129	wrapList(cs.wrapAnnotationArgs(), cs.alignMultilineAnnotationArgs(), false, COMMA, args);
		1130	insideAnnotation = oldInsideAnnotation;
1124	spaces(cs.spaceWithinAnnotationParens() ? 1 : 0);	1131	spaces(cs.spaceWithinAnnotationParens() ? 1 : 0);
1125	}	1132	}
1126	accept(RPAREN);	1133	accept(RPAREN);
Lines 1453-1513 Link Here
1453	if (ms.getKind() == Tree.Kind.MEMBER_SELECT) {	1460	if (ms.getKind() == Tree.Kind.MEMBER_SELECT) {
1454	ExpressionTree exp = ((MemberSelectTree)ms).getExpression();	1461	ExpressionTree exp = ((MemberSelectTree)ms).getExpression();
1455	scan(exp, p);	1462	scan(exp, p);
1456	accept(DOT);	1463	WrapStyle wrapStyle = cs.wrapChainedMethodCalls();
1457	List<? extends Tree> targs = node.getTypeArguments();	1464	if (wrapStyle == WrapStyle.WRAP_ALWAYS && exp.getKind() != Tree.Kind.METHOD_INVOCATION)
1458	if (targs != null && !targs.isEmpty()) {	1465	wrapStyle = WrapStyle.WRAP_IF_LONG;
1459	if (LT == accept(LT))	1466	switch (wrapStyle) {
1460	tpLevel++;	1467	case WRAP_ALWAYS:
1461	for (Iterator<? extends Tree> it = targs.iterator(); it.hasNext();) {	1468	if (cs.wrapAfterDotInChainedMethodCalls()) {
1462	Tree targ = it.next();	1469	accept(DOT);
1463	scan(targ, p);	1470	newline();
1464	if (it.hasNext()) {	1471	} else {
1465	spaces(cs.spaceBeforeComma() ? 1 : 0);	1472	newline();
1466	accept(COMMA);	1473	accept(DOT);
1467	spaces(cs.spaceAfterComma() ? 1 : 0);
1468	}	1474	}
1469	}	1475	scanMethodCall(node);
1470	JavaTokenId accepted;	1476	break;
1471	if (tpLevel > 0 && (accepted = accept(GT, GTGT, GTGTGT)) != null) {	1477	case WRAP_IF_LONG:
1472	switch (accepted) {	1478	int index = tokens.index();
1473	case GTGTGT:	1479	int c = col;
1474	tpLevel -= 3;	1480	Diff d = diffs.isEmpty() ? null : diffs.getFirst();
1475	break;	1481	boolean oldCheckWrap = checkWrap;
1476	case GTGT:	1482	checkWrap = true;
1477	tpLevel -= 2;	1483	try {
1478	break;	1484	accept(DOT);
1479	case GT:	1485	scanMethodCall(node);
1480	tpLevel--;	1486	} catch (WrapAbort wa) {
1481	break;	1487	} finally {
		1488	checkWrap = oldCheckWrap;
1482	}	1489	}
1483	}	1490	if (col > rightMargin) {
1484	}	1491	rollback(index, c, d);
1485	CodeStyle.WrapStyle wrapStyle = cs.wrapChainedMethodCalls();	1492	if (cs.wrapAfterDotInChainedMethodCalls()) {
1486	if(exp.getKind() == Tree.Kind.METHOD_INVOCATION) {	1493	accept(DOT);
1487	wrapToken(wrapStyle, -1, 0, IDENTIFIER, THIS, SUPER);	1494	newline();
1488	} else {	1495	} else {
1489	int index = tokens.index();	1496	newline();
1490	int c = col;	1497	accept(DOT);
1491	Diff d = diffs.isEmpty() ? null : diffs.getFirst();	1498	}
1492	accept(IDENTIFIER, THIS, SUPER);	1499	scanMethodCall(node);
1493	if (wrapStyle != CodeStyle.WrapStyle.WRAP_NEVER && col > rightMargin && c > indent) {	1500	}
1494	rollback(index, c, d);	1501	break;
1495	newline();	1502	case WRAP_NEVER:
1496	accept(IDENTIFIER, THIS, SUPER);	1503	accept(DOT);
1497	}	1504	scanMethodCall(node);
		1505	break;
1498	}	1506	}
1499	} else {	1507	} else {
1500	scan(node.getMethodSelect(), p);	1508	scanMethodCall(node);
1501	}	1509	}
1502	spaces(cs.spaceBeforeMethodCallParen() ? 1 : 0);
1503	accept(LPAREN);
1504	List<? extends ExpressionTree> args = node.getArguments();
1505	if (args != null && !args.isEmpty()) {
1506	spaces(cs.spaceWithinMethodCallParens() ? 1 : 0, true);
1507	wrapList(cs.wrapMethodCallArgs(), cs.alignMultilineCallArgs(), false, COMMA, args);
1508	spaces(cs.spaceWithinMethodCallParens() ? 1 : 0);
1509	}
1510	accept(RPAREN);
1511	return true;	1510	return true;
1512	}	1511	}
1513		1512
Lines 1996-2013 Link Here
1996	int alignIndent = cs.alignMultilineAssignment() ? col : -1;	1995	int alignIndent = cs.alignMultilineAssignment() ? col : -1;
1997	boolean b = scan(node.getVariable(), p);	1996	boolean b = scan(node.getVariable(), p);
1998	if (b \|\| getCurrentPath().getParentPath().getLeaf().getKind() != Tree.Kind.ANNOTATION) {	1997	if (b \|\| getCurrentPath().getParentPath().getLeaf().getKind() != Tree.Kind.ANNOTATION) {
1999	spaces(cs.spaceAroundAssignOps() ? 1 : 0);	1998	boolean spaceAroundAssignOps = insideAnnotation ? cs.spaceAroundAnnotationValueAssignOps() : cs.spaceAroundAssignOps();
		1999	spaces(spaceAroundAssignOps ? 1 : 0);
2000	accept(EQ);	2000	accept(EQ);
2001	ExpressionTree expr = node.getExpression();	2001	ExpressionTree expr = node.getExpression();
2002	if (expr.getKind() == Tree.Kind.NEW_ARRAY && ((NewArrayTree)expr).getType() == null) {	2002	if (expr.getKind() == Tree.Kind.NEW_ARRAY && ((NewArrayTree)expr).getType() == null) {
2003	if (cs.getOtherBracePlacement() == CodeStyle.BracePlacement.SAME_LINE)	2003	if (cs.getOtherBracePlacement() == CodeStyle.BracePlacement.SAME_LINE)
2004	spaces(cs.spaceAroundAssignOps() ? 1 : 0);	2004	spaces(spaceAroundAssignOps ? 1 : 0);
2005	scan(expr, p);	2005	scan(expr, p);
2006	} else {	2006	} else {
2007	if (wrapAnnotation && expr.getKind() == Tree.Kind.ANNOTATION) {	2007	if (wrapAnnotation && expr.getKind() == Tree.Kind.ANNOTATION) {
2008	wrapTree(CodeStyle.WrapStyle.WRAP_ALWAYS, alignIndent, cs.spaceAroundAssignOps() ? 1 : 0, expr);	2008	wrapTree(CodeStyle.WrapStyle.WRAP_ALWAYS, alignIndent, spaceAroundAssignOps ? 1 : 0, expr);
2009	} else {	2009	} else {
2010	wrapTree(cs.wrapAssignOps(), alignIndent, cs.spaceAroundAssignOps() ? 1 : 0, expr);	2010	wrapTree(cs.wrapAssignOps(), alignIndent, spaceAroundAssignOps ? 1 : 0, expr);
2011	}	2011	}
2012	}	2012	}
2013	} else {	2013	} else {
Lines 3005-3010 Link Here
3005	int c = col;	3005	int c = col;
3006	Diff d = diffs.isEmpty() ? null : diffs.getFirst();	3006	Diff d = diffs.isEmpty() ? null : diffs.getFirst();
3007	old = indent;	3007	old = indent;
		3008	boolean oldCheckWrap = checkWrap;
3008	checkWrap = true;	3009	checkWrap = true;
3009	try {	3010	try {
3010	if (alignIndent >= 0)	3011	if (alignIndent >= 0)
Lines 3015-3021 Link Here
3015	accept(first, rest);	3016	accept(first, rest);
3016	} catch (WrapAbort wa) {	3017	} catch (WrapAbort wa) {
3017	} finally {	3018	} finally {
3018	checkWrap = false;	3019	checkWrap = oldCheckWrap;
3019	}	3020	}
3020	if (this.col > rightMargin) {	3021	if (this.col > rightMargin) {
3021	rollback(index, c, d);	3022	rollback(index, c, d);
Lines 3056-3061 Link Here
3056	int c = col;	3057	int c = col;
3057	Diff d = diffs.isEmpty() ? null : diffs.getFirst();	3058	Diff d = diffs.isEmpty() ? null : diffs.getFirst();
3058	old = indent;	3059	old = indent;
		3060	boolean oldCheckWrap = checkWrap;
3059	checkWrap = true;	3061	checkWrap = true;
3060	try {	3062	try {
3061	if (alignIndent >= 0)	3063	if (alignIndent >= 0)
Lines 3066-3072 Link Here
3066	scan(tree, null);	3068	scan(tree, null);
3067	} catch (WrapAbort wa) {	3069	} catch (WrapAbort wa) {
3068	} finally {	3070	} finally {
3069	checkWrap = false;	3071	checkWrap = oldCheckWrap;
3070	}	3072	}
3071	if (col > rightMargin) {	3073	if (col > rightMargin) {
3072	rollback(index, c, d);	3074	rollback(index, c, d);
Lines 3114-3119 Link Here
3114	int c = col;	3116	int c = col;
3115	Diff d = diffs.isEmpty() ? null : diffs.getFirst();	3117	Diff d = diffs.isEmpty() ? null : diffs.getFirst();
3116	old = indent;	3118	old = indent;
		3119	boolean oldCheckWrap = checkWrap;
3117	checkWrap = true;	3120	checkWrap = true;
3118	try {	3121	try {
3119	if (alignIndent >= 0)	3122	if (alignIndent >= 0)
Lines 3131-3137 Link Here
3131	scan(tree, null);	3134	scan(tree, null);
3132	} catch (WrapAbort wa) {	3135	} catch (WrapAbort wa) {
3133	} finally {	3136	} finally {
3134	checkWrap = false;	3137	checkWrap = oldCheckWrap;
3135	}	3138	}
3136	if (col > rightMargin) {	3139	if (col > rightMargin) {
3137	rollback(index, c, d);	3140	rollback(index, c, d);
Lines 3293-3298 Link Here
3293	}	3296	}
3294	}	3297	}
3295		3298
		3299	private void scanMethodCall(MethodInvocationTree node) {
		3300	List<? extends Tree> targs = node.getTypeArguments();
		3301	if (targs != null && !targs.isEmpty()) {
		3302	if (LT == accept(LT))
		3303	tpLevel++;
		3304	for (Iterator<? extends Tree> it = targs.iterator(); it.hasNext();) {
		3305	Tree targ = it.next();
		3306	scan(targ, null);
		3307	if (it.hasNext()) {
		3308	spaces(cs.spaceBeforeComma() ? 1 : 0);
		3309	accept(COMMA);
		3310	spaces(cs.spaceAfterComma() ? 1 : 0);
		3311	}
		3312	}
		3313	JavaTokenId accepted;
		3314	if (tpLevel > 0 && (accepted = accept(GT, GTGT, GTGTGT)) != null) {
		3315	switch (accepted) {
		3316	case GTGTGT:
		3317	tpLevel -= 3;
		3318	break;
		3319	case GTGT:
		3320	tpLevel -= 2;
		3321	break;
		3322	case GT:
		3323	tpLevel--;
		3324	break;
		3325	}
		3326	}
		3327	}
		3328	accept(IDENTIFIER, THIS, SUPER);
		3329	spaces(cs.spaceBeforeMethodCallParen() ? 1 : 0);
		3330	accept(LPAREN);
		3331	List<? extends ExpressionTree> args = node.getArguments();
		3332	if (args != null && !args.isEmpty()) {
		3333	spaces(cs.spaceWithinMethodCallParens() ? 1 : 0, true);
		3334	wrapList(cs.wrapMethodCallArgs(), cs.alignMultilineCallArgs(), false, COMMA, args);
		3335	spaces(cs.spaceWithinMethodCallParens() ? 1 : 0);
		3336	}
		3337	accept(RPAREN);
		3338	}
		3339
3296	private void reformatComment() {	3340	private void reformatComment() {
3297	if (tokens.token().id() != BLOCK_COMMENT && tokens.token().id() != JAVADOC_COMMENT)	3341	if (tokens.token().id() != BLOCK_COMMENT && tokens.token().id() != JAVADOC_COMMENT)
3298	return;	3342	return;




LBL_wrp_WRAP_IF_LONG=If Long
LBL_wrp_WRAP_NEVER=Never

LBL_ip_CARET_LOCATION=Caret Location
LBL_ip_FIRST_IN_CATEGORY=First In Category
LBL_ip_LAST_IN_CATEGORY=Last In Category

LBL_ExpandTabToSpaces=&Expand Tab to Spaces
LBL_TabSize=&Tab Size:
LBL_IndentSize=&Indentation Size:

LBL_AddLeadingStarInComment=A&dd Leading Star In Comment
LBL_RightMargin=&Right Margin:
 
LBL_gen_Naming=Naming Conventions\:
LBL_gen_PreferLongerNames=Prefer Longer Names
LBL_gen_UseIsForBooleanGetters=Use Is For Boolean Getters
LBL_gen_Prefix=Prefix
LBL_gen_Suffix=Suffix
LBL_gen_Field=Field\:
LBL_gen_StaticField=Static Field\:
LBL_gen_Parameter=Parameter\:
LBL_gen_LocalVariable=Local Variable\:
LBL_gen_Other=Other\:
LBL_gen_QualifyFieldAccess=Qualify Field Access
LBL_gen_AddOverrideAnnotation=Add Override Annotation
LBL_gen_ParametersFinal=Make Generated Parameters Final
LBL_gen_LocalVariablesFinal=Make Generated Local variables Final
LBL_gen_MembersOreder=Members Sort Order\:
LBL_gen_MembersOrederUp=Move Up
LBL_gen_MembersOrederDown=Move Down
LBL_gen_SortByVisibility=Sort Members By Visibility
LBL_gen_InsertionPoint=Insertion Point\:

VAL_gen_STATIC=Static
VAL_gen_CLASS=Classes
VAL_gen_CONSTRUCTOR=Constructors
VAL_gen_FIELD=Fields
VAL_gen_INSTANCE_INIT=Instance Initializers
VAL_gen_METHOD=Methods
VAL_gen_STATIC_INIT=Static Initializers

VAL_gen_PUBLIC=Public
VAL_gen_PRIVATE=Private
VAL_gen_PROTECTED=Protected
VAL_gen_DEFAULT=Default

LBL_blBeforePackage=Before &Package\:
LBL_blAfterPackage=After Packa&ge\:
LBL_blBeforeImports=Before &Imports\:
LBL_blAfterImports=After Imports\:
LBL_blBeforeClass=Before &Class\:
LBL_blAfterClass=After C&lass\:
LBL_blAfterClassHeader=After Class &Header\:
LBL_blAfterAnonymousClassHeader=After &Anonymous Class Header:
LBL_blBeforeFields=Before &Field\:
LBL_blAfterFields=After Fi&eld\:
LBL_blBeforeMethods=Before &Method\:

LBL_spaceAroundBinaryOps=Binary Operators
LBL_spaceAroundTernaryOps=Ternary Operators
LBL_spaceAroundAssignOps=Assignment Operators
LBL_spaceAroundAnnotationValueAssignOps=Annotation Value Assignment Operator

LBL_BeforeLeftBraces=Before Left Braces
LBL_spaceBeforeClassDeclLeftBrace=Class Declaration

LBL_spaceBeforeColon=Before Colon
LBL_spaceAfterColon=After Colon
LBL_spaceAfterTypeCast=After Type Cast

LBL_wrp_extendsImplementsKeyword=&Extends/Implements Keyword\: 
LBL_wrp_extendsImplementsList=E&xtends/Implements List\:
LBL_wrp_methodParameters=Method &Parameters\:

LBL_wrp_methodCallArgs=Method Call Arguments\:
LBL_wrp_annotationArgs=Annotation Arg&uments\:
LBL_wrp_chainedMethodCalls=C&hained Method Calls\:
LBL_wrp_afeterDot=Wrap After Dot In Chained Method Call
LBL_wrp_arrayInit=Array Initiali&zer\:
LBL_wrp_tryResources=Try Re&sources\:
LBL_wrp_multiCatches=Dis&junctive Catch Types\:


LBL_Comments=Comments
LBL_doc_enableCommentFormat=Enable Comments Formatting
LBL_doc_enableBlockCommentFormat=Format Block Comments
LBL_doc_generalLabel=General
LBL_doc_addLeadingStar=Add Leading Star
LBL_doc_wrapCommentText=Wrap Text At Right Margin

if (number==13 && object instanceof Runnable )\
method( "Some text", 12, new Object());\
for( int i = 1; i < 100; i++ )\
System.out.print(i);\
while ( this.number < 2 && number != 3 )\
this.number++;\
do \

public ClassA() {\
}\
public void methodA() {\
new Runnable() {\
public void run() {\
}\
};\
}\
public void methodB() {\
}\

}\
}

SAMPLE_CodeGen=public class ClassA {\
\
private String name;\
}

nlFinallyCheckBox1.text="finall&y"

AN_Preview=Preview

FmtTabsIndents.indentCasesFromSwitchCheckBox.AccessibleContext.accessibleDescription=Additional indent for case statements
FmtTabsIndents.indentTopLevelClassMembersCheckBox.AccessibleContext.accessibleDescription=Indent for top-level class members
FmtTabsIndents.continuationIndentSizeField.AccessibleContext.accessibleDescription=Indent size in spaces
FmtTabsIndents.labelIndentField.AccessibleContext.accessibleDescription=Label indentation size in spaces
LBL_doc_enableBlockCommentFormat=Format Block Comments




  <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"/>

                  <Component id="aClassHeaderLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                  <Component id="bFieldsLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                  <Component id="aFieldsLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                  <Component id="anAnonymousClassHeaderLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                  <Component id="bMethodsLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                  <Component id="aMethodsLabel" alignment="0" min="-2" max="-2" attributes="0"/>
              </Group>
              <EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
              <Group type="103" groupAlignment="0" max="-2" attributes="0">
                  <Component id="aImportsField" alignment="0" pref="0" max="32767" attributes="0"/>
                  <Component id="bImportsField" alignment="0" pref="0" max="32767" attributes="0"/>
                  <Component id="aPackageField" alignment="0" pref="0" max="32767" attributes="0"/>
                  <Component id="bPackageField" alignment="0" max="32767" attributes="0"/>
                  <Component id="aFieldsField" alignment="0" pref="0" max="32767" attributes="0"/>
                  <Component id="bFieldsField" alignment="0" pref="0" max="32767" attributes="0"/>
                  <Component id="anAnonymousClassHeaderField" alignment="0" max="32767" attributes="0"/>
                  <Component id="aClassHeaderField" alignment="0" pref="0" max="32767" attributes="0"/>
                  <Component id="aClassField" alignment="0" pref="0" max="32767" attributes="0"/>
                  <Component id="bClassField" alignment="0" pref="0" max="32767" attributes="0"/>
                  <Component id="bMethodsField" alignment="0" pref="0" max="32767" attributes="0"/>
                  <Component id="aMethodsField" pref="0" max="32767" attributes="0"/>
              </Group>
              <EmptySpace max="32767" attributes="0"/>
          </Group>
      </Group>
    </DimensionLayout>

                  <Component id="aClassHeaderField" linkSize="2" alignment="3" min="-2" max="-2" attributes="0"/>
                  <Component id="aClassHeaderLabel" alignment="3" min="-2" max="-2" attributes="0"/>
              </Group>
              <EmptySpace max="-2" attributes="0"/>
              <Group type="103" groupAlignment="3" attributes="0">
                  <Component id="anAnonymousClassHeaderLabel" alignment="3" min="-2" max="-2" attributes="0"/>
                  <Component id="anAnonymousClassHeaderField" alignment="3" min="-2" max="-2" attributes="0"/>
              </Group>
              <EmptySpace max="-2" attributes="0"/>
              <Group type="103" groupAlignment="3" attributes="0">
                  <Component id="bFieldsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
                  <Component id="bFieldsField" linkSize="2" alignment="3" min="-2" max="-2" attributes="0"/>
                  <Component id="bFieldsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
              </Group>
              <EmptySpace max="-2" attributes="0"/>
              <Group type="103" groupAlignment="3" attributes="0">
                  <Component id="aFieldsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
                  <Component id="aFieldsField" linkSize="2" alignment="3" min="-2" max="-2" attributes="0"/>
                  <Component id="aFieldsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
              </Group>
              <EmptySpace max="-2" attributes="0"/>
              <Group type="103" groupAlignment="3" attributes="0">
                  <Component id="bMethodsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
                  <Component id="bMethodsField" linkSize="2" alignment="3" min="-2" max="-2" attributes="0"/>
                  <Component id="bMethodsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
              </Group>
              <EmptySpace max="-2" attributes="0"/>
              <Group type="103" groupAlignment="3" attributes="0">
                  <Component id="aMethodsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
                  <Component id="aMethodsField" linkSize="2" alignment="3" min="-2" max="-2" attributes="0"/>
                  <Component id="aMethodsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
              </Group>
              <EmptySpace max="32767" attributes="0"/>
          </Group>
      </Group>
    </DimensionLayout>

    </Component>
    <Component class="javax.swing.JTextField" name="bPackageField">
      <Properties>
        <Property name="columns" type="int" value="2"/>
      </Properties>
    </Component>
    <Component class="javax.swing.JLabel" name="aPackageLabel">

        <Property name="columns" type="int" value="5"/>
      </Properties>
    </Component>
    <Component class="javax.swing.JLabel" name="anAnonymousClassHeaderLabel">
      <Properties>
        <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
          <ComponentRef name="anAnonymousClassHeaderField"/>
        </Property>
        <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_blAfterAnonymousClassHeader" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
      </Properties>
    </Component>
    <Component class="javax.swing.JTextField" name="anAnonymousClassHeaderField">
    </Component>
    <Component class="javax.swing.JLabel" name="bFieldsLabel">
      <Properties>
        <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">

Lines 66-71 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/FmtBlankLines.java (-29 / +43 lines)
66	bClassField.putClientProperty(OPTION_ID, blankLinesBeforeClass);	66	bClassField.putClientProperty(OPTION_ID, blankLinesBeforeClass);
67	aClassField.putClientProperty(OPTION_ID, blankLinesAfterClass);	67	aClassField.putClientProperty(OPTION_ID, blankLinesAfterClass);
68	aClassHeaderField.putClientProperty(OPTION_ID, blankLinesAfterClassHeader);	68	aClassHeaderField.putClientProperty(OPTION_ID, blankLinesAfterClassHeader);
		69	anAnonymousClassHeaderField.putClientProperty(OPTION_ID, blankLinesAfterAnonymousClassHeader);
69	bFieldsField.putClientProperty(OPTION_ID, blankLinesBeforeFields);	70	bFieldsField.putClientProperty(OPTION_ID, blankLinesBeforeFields);
70	aFieldsField.putClientProperty(OPTION_ID, blankLinesAfterFields);	71	aFieldsField.putClientProperty(OPTION_ID, blankLinesAfterFields);
71	bMethodsField.putClientProperty(OPTION_ID, blankLinesBeforeMethods );	72	bMethodsField.putClientProperty(OPTION_ID, blankLinesBeforeMethods );
Lines 78-83 Link Here
78	bClassField.addKeyListener(new NumericKeyListener());	79	bClassField.addKeyListener(new NumericKeyListener());
79	aClassField.addKeyListener(new NumericKeyListener());	80	aClassField.addKeyListener(new NumericKeyListener());
80	aClassHeaderField.addKeyListener(new NumericKeyListener());	81	aClassHeaderField.addKeyListener(new NumericKeyListener());
		82	anAnonymousClassHeaderField.addKeyListener(new NumericKeyListener());
81	bFieldsField.addKeyListener(new NumericKeyListener());	83	bFieldsField.addKeyListener(new NumericKeyListener());
82	aFieldsField.addKeyListener(new NumericKeyListener());	84	aFieldsField.addKeyListener(new NumericKeyListener());
83	bMethodsField.addKeyListener(new NumericKeyListener());	85	bMethodsField.addKeyListener(new NumericKeyListener());
Lines 112-117 Link Here
112	aClassField = new javax.swing.JTextField();	114	aClassField = new javax.swing.JTextField();
113	aClassHeaderLabel = new javax.swing.JLabel();	115	aClassHeaderLabel = new javax.swing.JLabel();
114	aClassHeaderField = new javax.swing.JTextField();	116	aClassHeaderField = new javax.swing.JTextField();
		117	anAnonymousClassHeaderLabel = new javax.swing.JLabel();
		118	anAnonymousClassHeaderField = new javax.swing.JTextField();
115	bFieldsLabel = new javax.swing.JLabel();	119	bFieldsLabel = new javax.swing.JLabel();
116	bFieldsField = new javax.swing.JTextField();	120	bFieldsField = new javax.swing.JTextField();
117	aFieldsLabel = new javax.swing.JLabel();	121	aFieldsLabel = new javax.swing.JLabel();
Lines 127-133 Link Here
127	bPackageLabel.setLabelFor(bPackageField);	131	bPackageLabel.setLabelFor(bPackageField);
128	org.openide.awt.Mnemonics.setLocalizedText(bPackageLabel, org.openide.util.NbBundle.getMessage(FmtBlankLines.class, "LBL_blBeforePackage")); // NOI18N	132	org.openide.awt.Mnemonics.setLocalizedText(bPackageLabel, org.openide.util.NbBundle.getMessage(FmtBlankLines.class, "LBL_blBeforePackage")); // NOI18N
129		133
130	bPackageField.setColumns(5);	134	bPackageField.setColumns(2);
131		135
132	aPackageLabel.setLabelFor(aPackageField);	136	aPackageLabel.setLabelFor(aPackageField);
133	org.openide.awt.Mnemonics.setLocalizedText(aPackageLabel, org.openide.util.NbBundle.getMessage(FmtBlankLines.class, "LBL_blAfterPackage")); // NOI18N	137	org.openide.awt.Mnemonics.setLocalizedText(aPackageLabel, org.openide.util.NbBundle.getMessage(FmtBlankLines.class, "LBL_blAfterPackage")); // NOI18N
Lines 159-164 Link Here
159		163
160	aClassHeaderField.setColumns(5);	164	aClassHeaderField.setColumns(5);
161		165
		166	anAnonymousClassHeaderLabel.setLabelFor(anAnonymousClassHeaderField);
		167	org.openide.awt.Mnemonics.setLocalizedText(anAnonymousClassHeaderLabel, org.openide.util.NbBundle.getMessage(FmtBlankLines.class, "LBL_blAfterAnonymousClassHeader")); // NOI18N
		168
162	bFieldsLabel.setLabelFor(bFieldsField);	169	bFieldsLabel.setLabelFor(bFieldsField);
163	org.openide.awt.Mnemonics.setLocalizedText(bFieldsLabel, org.openide.util.NbBundle.getMessage(FmtBlankLines.class, "LBL_blBeforeFields")); // NOI18N	170	org.openide.awt.Mnemonics.setLocalizedText(bFieldsLabel, org.openide.util.NbBundle.getMessage(FmtBlankLines.class, "LBL_blBeforeFields")); // NOI18N
164		171
Lines 194-218 Link Here
194	.addComponent(aClassHeaderLabel)	201	.addComponent(aClassHeaderLabel)
195	.addComponent(bFieldsLabel)	202	.addComponent(bFieldsLabel)
196	.addComponent(aFieldsLabel)	203	.addComponent(aFieldsLabel)
		204	.addComponent(anAnonymousClassHeaderLabel)
197	.addComponent(bMethodsLabel)	205	.addComponent(bMethodsLabel)
198	.addComponent(aMethodsLabel))	206	.addComponent(aMethodsLabel))
199	.addGap(6, 6, 6)	207	.addGap(6, 6, 6)
200	.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)	208	.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
201	.addComponent(aMethodsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)	209	.addComponent(aImportsField, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE)
202	.addComponent(bMethodsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)	210	.addComponent(bImportsField, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE)
203	.addComponent(aFieldsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)	211	.addComponent(aPackageField, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE)
204	.addComponent(bFieldsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)	212	.addComponent(bPackageField)
205	.addComponent(aClassHeaderField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)	213	.addComponent(aFieldsField, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE)
206	.addComponent(aClassField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)	214	.addComponent(bFieldsField, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE)
207	.addComponent(bClassField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)	215	.addComponent(anAnonymousClassHeaderField)
208	.addComponent(aImportsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)	216	.addComponent(aClassHeaderField, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE)
209	.addComponent(bImportsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)	217	.addComponent(aClassField, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE)
210	.addComponent(aPackageField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)	218	.addComponent(bClassField, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE)
211	.addComponent(bPackageField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))	219	.addComponent(bMethodsField, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE)
		220	.addComponent(aMethodsField, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE))
		221	.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
212	);	222	);
213
214	layout.linkSize( javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[]{aClassField, aClassHeaderField, aFieldsField, aImportsField, aMethodsField, aPackageField, bClassField, bFieldsField, bImportsField, bMethodsField, bPackageField});
215
216	layout.setVerticalGroup(	223	layout.setVerticalGroup(
217	layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)	224	layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
218	.addGroup(layout.createSequentialGroup()	225	.addGroup(layout.createSequentialGroup()
Lines 243-267 Link Here
243	.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)	250	.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
244	.addComponent(aClassHeaderField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)	251	.addComponent(aClassHeaderField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
245	.addComponent(aClassHeaderLabel))	252	.addComponent(aClassHeaderLabel))
246	.addGap(4, 4, 4)	253	.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
247	.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)	254	.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
248	.addComponent(bFieldsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)	255	.addComponent(anAnonymousClassHeaderLabel)
249	.addComponent(bFieldsLabel))	256	.addComponent(anAnonymousClassHeaderField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
250	.addGap(4, 4, 4)	257	.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
251	.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)	258	.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
252	.addComponent(aFieldsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)	259	.addComponent(bFieldsLabel)
253	.addComponent(aFieldsLabel))	260	.addComponent(bFieldsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
254	.addGap(4, 4, 4)	261	.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
255	.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)	262	.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
256	.addComponent(bMethodsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)	263	.addComponent(aFieldsLabel)
257	.addComponent(bMethodsLabel))	264	.addComponent(aFieldsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
258	.addGap(4, 4, 4)	265	.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
259	.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)	266	.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
260	.addComponent(aMethodsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)	267	.addComponent(bMethodsLabel)
261	.addComponent(aMethodsLabel)))	268	.addComponent(bMethodsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
		269	.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
		270	.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
		271	.addComponent(aMethodsLabel)
		272	.addComponent(aMethodsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
		273	.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
262	);	274	);
263		275
264	layout.linkSize( javax.swing.SwingConstants.VERTICAL, new java.awt.Component[]{aClassField, aClassHeaderField, aFieldsField, aImportsField, aMethodsField, aPackageField, bClassField, bFieldsField, bImportsField, bMethodsField, bPackageField});	276	layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {aClassField, aClassHeaderField, aFieldsField, aImportsField, aMethodsField, aPackageField, bClassField, bFieldsField, bImportsField, bMethodsField, bPackageField});
265		277
266	}// </editor-fold>//GEN-END:initComponents	278	}// </editor-fold>//GEN-END:initComponents
267		279
Lines 279-284 Link Here
279	private javax.swing.JLabel aMethodsLabel;	291	private javax.swing.JLabel aMethodsLabel;
280	private javax.swing.JTextField aPackageField;	292	private javax.swing.JTextField aPackageField;
281	private javax.swing.JLabel aPackageLabel;	293	private javax.swing.JLabel aPackageLabel;
		294	private javax.swing.JTextField anAnonymousClassHeaderField;
		295	private javax.swing.JLabel anAnonymousClassHeaderLabel;
282	private javax.swing.JTextField bClassField;	296	private javax.swing.JTextField bClassField;
283	private javax.swing.JLabel bClassLabel;	297	private javax.swing.JLabel bClassLabel;
284	private javax.swing.JTextField bFieldsField;	298	private javax.swing.JTextField bFieldsField;




<?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_CodeGeneration" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>

  <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"/>
    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-102,0,0,7,4"/>
  </AuxValues>

  <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"/>
                  <Group type="102" alignment="0" attributes="0">
                      <EmptySpace max="-2" attributes="0"/>
                      <Group type="103" groupAlignment="0" max="-2" attributes="0">
                          <Component id="qualifyFieldAccessCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
                          <Component id="addOverrideAnnortationCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
                          <Component id="parametersFinalCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
                          <Component id="localVarsFinalCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
                      </Group>
                  </Group>
              </Group>
              <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
          </Group>
          <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" max="-2" 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 type="102" attributes="0">
                              <Group type="103" groupAlignment="0" attributes="0">
                                  <Component id="jScrollPane1" max="32767" 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" max="32767" 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>
                  <Component id="sortByVisibilityCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
                  <Group type="102" alignment="0" attributes="0">
                      <EmptySpace min="-2" pref="5" max="-2" attributes="0"/>
                      <Component id="insertionPointLabel" min="-2" max="-2" attributes="0"/>
                      <EmptySpace max="-2" attributes="0"/>
                      <Component id="insertionPointComboBox" max="32767" attributes="0"/>
                  </Group>
              </Group>
              <EmptySpace max="32767" attributes="0"/>
          </Group>
          <Component id="jSeparator2" alignment="1" max="32767" attributes="0"/>
      </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="-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"/>
              <Component id="qualifyFieldAccessCheckBox" min="-2" max="-2" attributes="0"/>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="addOverrideAnnortationCheckBox" min="-2" max="-2" attributes="0"/>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="parametersFinalCheckBox" min="-2" max="-2" attributes="0"/>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="localVarsFinalCheckBox" min="-2" max="-2" attributes="0"/>
              <EmptySpace type="unrelated" max="-2" attributes="0"/>
              <Component id="jSeparator3" min="-2" max="-2" attributes="0"/>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="memberOrderLabel" min="-2" max="-2" attributes="0"/>
              <EmptySpace max="-2" attributes="0"/>
              <Group type="103" groupAlignment="0" attributes="0">
                  <Component id="jScrollPane1" min="-2" pref="156" max="-2" attributes="0"/>
                  <Group type="102" attributes="0">
                      <Component id="upButton" min="-2" max="-2" attributes="0"/>
                      <EmptySpace max="-2" attributes="0"/>
                      <Component id="downButton" min="-2" max="-2" attributes="0"/>
                  </Group>
              </Group>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="sortByVisibilityCheckBox" min="-2" max="-2" attributes="0"/>
              <EmptySpace max="-2" attributes="0"/>
              <Group type="103" groupAlignment="0" attributes="0">
                  <Component id="jScrollPane2" min="-2" pref="71" max="-2" attributes="0"/>
                  <Group type="102" alignment="0" attributes="0">
                      <Component id="visUpButton" min="-2" max="-2" attributes="0"/>
                      <EmptySpace max="-2" attributes="0"/>
                      <Component id="visDownButton" min="-2" max="-2" attributes="0"/>
                  </Group>
              </Group>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="jSeparator2" min="-2" max="-2" attributes="0"/>
              <EmptySpace min="-2" pref="10" max="-2" attributes="0"/>
              <Group type="103" groupAlignment="3" attributes="0">
                  <Component id="insertionPointLabel" alignment="3" min="-2" max="-2" attributes="0"/>
                  <Component id="insertionPointComboBox" alignment="3" min="-2" max="-2" attributes="0"/>
              </Group>
              <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>
      <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="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
        </Constraint>
      </Constraints>
    </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">

        </Property>
        <Property name="opaque" type="boolean" value="false"/>
      </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="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="18" weightX="1.0" weightY="0.0"/>
        </Constraint>
      </Constraints>
    </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>
      </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="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="18" weightX="0.0" 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_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="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="18" weightX="0.0" 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_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="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="18" 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="0" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="18" weightX="1.0" 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="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="18" weightX="1.0" 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_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="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="18" 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="-1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="18" weightX="1.0" 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="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="18" weightX="1.0" 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_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="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="18" 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="-1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="18" weightX="1.0" 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="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="18" weightX="1.0" 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_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="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="9" insetsRight="0" anchor="18" weightX="0.0" 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="-1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="9" insetsRight="0" anchor="18" weightX="1.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="-1" gridWidth="0" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="9" insetsRight="0" anchor="18" weightX="1.0" weightY="0.0"/>
        </Constraint>
      </Constraints>
    </Component>
    <Component class="javax.swing.JLabel" name="miscLabel">
      <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_Misc" 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="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
        </Constraint>
      </Constraints>
    </Component>
    <Component class="javax.swing.JCheckBox" name="qualifyFieldAccessCheckBox">
      <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_QualifyFieldAccess" 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">

        </Property>
        <Property name="opaque" type="boolean" value="false"/>
      </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="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
        </Constraint>
      </Constraints>
    </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">
          <ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_gen_Other" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
      </Properties>
    </Component>
    <Component class="javax.swing.JCheckBox" name="qualifyFieldAccessCheckBox">
      <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_QualifyFieldAccess" 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">

        </Property>
        <Property name="opaque" type="boolean" value="false"/>
      </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="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
        </Constraint>
      </Constraints>
    </Component>
    <Component class="javax.swing.JCheckBox" name="addOverrideAnnortationCheckBox">
      <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_AddOverrideAnnotation" 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">

        </Property>
        <Property name="opaque" type="boolean" value="false"/>
      </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="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="8" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
        </Constraint>
      </Constraints>
    </Component>
    <Component class="javax.swing.JLabel" name="finalLabel">
      <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_FinalMofier" 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="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
        </Constraint>
      </Constraints>
    </Component>
    <Component class="javax.swing.JCheckBox" name="parametersFinalCheckBox">
      <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_ParametersFinal" 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">

        </Property>
        <Property name="opaque" type="boolean" value="false"/>
      </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="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
        </Constraint>
      </Constraints>
    </Component>
    <Component class="javax.swing.JCheckBox" name="localVarsFinalCheckBox">
      <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_LocalVariablesFinal" 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">

        </Property>
        <Property name="opaque" type="boolean" value="false"/>
      </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="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="8" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
        </Constraint>
      </Constraints>
    </Component>
    <Component class="javax.swing.JLabel" name="memberOrderLabel">
      <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_MembersOreder" 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="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
        </Constraint>
      </Constraints>
    </Component>
    <Container class="javax.swing.JScrollPane" name="jScrollPane1">
      <Properties>
        <Property name="opaque" type="boolean" value="false"/>
      </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="0" gridHeight="0" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="1.0" weightY="1.0"/>
        </Constraint>
      </Constraints>

      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
      <SubComponents>
        <Component class="javax.swing.JList" name="membersOrderList">
          <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="2" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="4" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/>
            </Constraint>
          </Constraints>

          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
          <SubComponents>
            <Component class="javax.swing.JList" name="importsOrderList">
              <Properties>
                <Property name="model" type="javax.swing.ListModel" editor="org.netbeans.modules.form.editors2.ListModelEditor">
                  <StringArray count="5">
                    <StringItem index="0" value="Item 1"/>
                    <StringItem index="1" value="Item 2"/>
                    <StringItem index="2" value="Item 3"/>
                    <StringItem index="3" value="Item 4"/>
                    <StringItem index="4" value="Item 5"/>
                  </StringArray>
                </Property>
              </Properties>
            </Component>
          </SubComponents>
        </Container>
        <Component class="javax.swing.JButton" name="importUpButton">
          <Properties>
            <Property name="model" type="javax.swing.ListModel" editor="org.netbeans.modules.form.editors2.ListModelEditor">
              <StringArray count="9">
                <StringItem index="0" value="Item 1"/>
                <StringItem index="1" value="Item 2"/>
                <StringItem index="2" value="Item 3"/>
                <StringItem index="3" value="Item 4"/>
                <StringItem index="4" value="Item 5"/>
                <StringItem index="5" value="Item 6"/>
                <StringItem index="6" value="Item 7"/>
                <StringItem index="7" value="Item 8"/>
                <StringItem index="8" value="Item 9"/>
              </StringArray>
            </Property>
            <Property name="selectionMode" type="int" value="0"/>
          </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="0" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="4" insetsBottom="4" insetsRight="1" anchor="18" weightX="0.0" weightY="0.0"/>
            </Constraint>
          </Constraints>
        </Component>
        <Component class="javax.swing.JButton" name="importDownButton">
          <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_ImportDown" 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="-1" gridWidth="0" gridHeight="0" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="4" insetsBottom="4" insetsRight="1" anchor="18" weightX="0.0" weightY="1.0"/>
            </Constraint>
          </Constraints>
        </Component>
      </SubComponents>
    </Container>
    <Component class="javax.swing.JButton" name="upButton">
      <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_MembersOrederUp" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
      </Properties>
      <Events>
        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="upButtonActionPerformed"/>
      </Events>
    </Component>
    <Component class="javax.swing.JButton" name="downButton">
      <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_MembersOrederDown" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
      </Properties>
      <Events>
        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="downButtonActionPerformed"/>
      </Events>
    </Component>
    <Component class="javax.swing.JSeparator" name="jSeparator3">
    </Component>
    <Component class="javax.swing.JCheckBox" name="sortByVisibilityCheckBox">
      <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_SortByVisibility" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
      </Properties>
      <Events>
        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="sortByVisibilityCheckBoxActionPerformed"/>
      </Events>
    </Component>
    <Container class="javax.swing.JScrollPane" name="jScrollPane2">
      <AuxValues>
        <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
      </AuxValues>

      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
      <SubComponents>
        <Component class="javax.swing.JList" name="visibilityOrderList">
          <Properties>
            <Property name="model" type="javax.swing.ListModel" editor="org.netbeans.modules.form.editors2.ListModelEditor">
              <StringArray count="4">
                <StringItem index="0" value="Item 1"/>
                <StringItem index="1" value="Item 2"/>
                <StringItem index="2" value="Item 3"/>
                <StringItem index="3" value="Item 4"/>
              </StringArray>
            </Property>
            <Property name="selectionMode" type="int" value="0"/>
          </Properties>
        </Component>
      </SubComponents>
    </Container>
    <Component class="javax.swing.JButton" name="visUpButton">
      <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_MembersOrederUp" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
      </Properties>
      <Events>
        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="visUpButtonActionPerformed"/>
      </Events>
    </Component>
    <Component class="javax.swing.JButton" name="visDownButton">
      <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_MembersOrederDown" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
      </Properties>
      <Events>
        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="visDownButtonActionPerformed"/>
      </Events>
    </Component>
    <Component class="javax.swing.JSeparator" name="jSeparator2">
    </Component>
    <Component class="javax.swing.JLabel" name="insertionPointLabel">
      <Properties>
        <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
          <ComponentRef name="insertionPointComboBox"/>
        </Property>
        <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_InsertionPoint" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
      </Properties>
    </Component>
    <Component class="javax.swing.JComboBox" name="insertionPointComboBox">
      <Properties>
        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
          <StringArray count="4">
            <StringItem index="0" value="Item 1"/>
            <StringItem index="1" value="Item 2"/>
            <StringItem index="2" value="Item 3"/>
            <StringItem index="3" value="Item 4"/>
          </StringArray>
        </Property>
      </Properties>
    </Component>
  </SubComponents>
</Form>





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.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
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 org.netbeans.api.java.source.CodeStyle;
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.java.ui.FmtOptions.CategorySupport;
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 Petr Hrebejk, Dusan Balek
 */
public class FmtCodeGeneration extends javax.swing.JPanel implements Runnable, ListSelectionListener {
    
    /** Creates new form FmtCodeGeneration */
    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);

        localVarPrefixField.putClientProperty(OPTION_ID, localVarNamePrefix);
        localVarSuffixField.putClientProperty(OPTION_ID, localVarNameSuffix);
        qualifyFieldAccessCheckBox.putClientProperty(OPTION_ID, qualifyFieldAccess);
        isForBooleanGettersCheckBox.putClientProperty(OPTION_ID, useIsForBooleanGetters);
        addOverrideAnnortationCheckBox.putClientProperty(OPTION_ID, addOverrideAnnotation);
        parametersFinalCheckBox.putClientProperty(OPTION_ID, makeParametersFinal);
        localVarsFinalCheckBox.putClientProperty(OPTION_ID, makeLocalVarsFinal);
        membersOrderList.putClientProperty(OPTION_ID, classMembersOrder);
        sortByVisibilityCheckBox.putClientProperty(OPTION_ID, sortMembersByVisibility);
        visibilityOrderList.putClientProperty(OPTION_ID, visibilityOrder);
        insertionPointComboBox.putClientProperty(OPTION_ID, classMemberInsertionPoint);
    }
    
    public static PreferencesCustomizer.Factory getController() {
        return new PreferencesCustomizer.Factory() {
            public PreferencesCustomizer create(Preferences preferences) {
                CodeGenCategorySupport support = new CodeGenCategorySupport(preferences, new FmtCodeGeneration());
                ((Runnable)support.panel).run();
                return support;
            }
        };
    }
    
    @Override
    public void run() {
        membersOrderList.setSelectedIndex(0);
        membersOrderList.addListSelectionListener(this);
        enableMembersOrderButtons();
        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);
        parametersFinalCheckBox.setVisible(false);
        localVarsFinalCheckBox.setVisible(false);
        jSeparator3.setVisible(false);
    }
    
    @Override
    public void valueChanged(ListSelectionEvent e) {
        if (e.getSource() == membersOrderList)
            enableMembersOrderButtons();
        else
            enableVisibilityOrder();
    }

    /** This method is called from within the constructor to
     * initialize the form.
     * WARNING: Do NOT modify this code. The content of this method is

    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();

        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();
        isForBooleanGettersCheckBox = new javax.swing.JCheckBox();
        addOverrideAnnortationCheckBox = new javax.swing.JCheckBox();
        finalLabel = new javax.swing.JLabel();
        parametersFinalCheckBox = new javax.swing.JCheckBox();
        localVarsFinalCheckBox = new javax.swing.JCheckBox();
        memberOrderLabel = new javax.swing.JLabel();
        jPanel1 = new javax.swing.JPanel();
        jScrollPane1 = new javax.swing.JScrollPane();
        membersOrderList = new javax.swing.JList();
        upButton = new javax.swing.JButton();
        downButton = new javax.swing.JButton();
        jSeparator3 = new javax.swing.JSeparator();
        sortByVisibilityCheckBox = new javax.swing.JCheckBox();
        jScrollPane2 = new javax.swing.JScrollPane();
        visibilityOrderList = new javax.swing.JList();
        visUpButton = new javax.swing.JButton();
        visDownButton = new javax.swing.JButton();
        jSeparator2 = new javax.swing.JSeparator();
        insertionPointLabel = new javax.swing.JLabel();
        insertionPointComboBox = new javax.swing.JComboBox();

        setName(org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_CodeGeneration")); // NOI18N
        setOpaque(false);
        setLayout(new java.awt.GridBagLayout());

        org.openide.awt.Mnemonics.setLocalizedText(namingConventionsLabel, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_Naming")); // NOI18N
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
        gridBagConstraints.insets = new java.awt.Insets(0, 0, 4, 0);
        add(preferLongerNamesLabel, gridBagConstraints);

        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);
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
        gridBagConstraints.weightx = 1.0;
        gridBagConstraints.insets = new java.awt.Insets(0, 8, 4, 0);
        add(preferLongerNamesCheckBox, gridBagConstraints);

        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);
        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);
        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);
        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);
        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);
        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);
        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);
        add(localVarPrefixField, gridBagConstraints);

        org.openide.awt.Mnemonics.setLocalizedText(otherLabel, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_Other")); // NOI18N
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
        gridBagConstraints.weightx = 1.0;
        gridBagConstraints.insets = new java.awt.Insets(0, 8, 9, 0);
        add(localVarSuffixField, gridBagConstraints);

        org.openide.awt.Mnemonics.setLocalizedText(qualifyFieldAccessCheckBox, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_QualifyFieldAccess")); // NOI18N
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
        gridBagConstraints.insets = new java.awt.Insets(0, 0, 4, 0);
        add(miscLabel, gridBagConstraints);

        org.openide.awt.Mnemonics.setLocalizedText(qualifyFieldAccessCheckBox, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_QualifyFieldAccess")); // NOI18N
        qualifyFieldAccessCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
        qualifyFieldAccessCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
        qualifyFieldAccessCheckBox.setOpaque(false);
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
        gridBagConstraints.insets = new java.awt.Insets(0, 8, 4, 0);
        add(qualifyFieldAccessCheckBox, gridBagConstraints);

        org.openide.awt.Mnemonics.setLocalizedText(addOverrideAnnortationCheckBox, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_AddOverrideAnnotation")); // NOI18N
        isForBooleanGettersCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
        isForBooleanGettersCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
        isForBooleanGettersCheckBox.setOpaque(false);
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
        gridBagConstraints.insets = new java.awt.Insets(0, 8, 4, 0);
        add(isForBooleanGettersCheckBox, gridBagConstraints);

        org.openide.awt.Mnemonics.setLocalizedText(addOverrideAnnortationCheckBox, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_AddOverrideAnnotation")); // NOI18N
        addOverrideAnnortationCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
        addOverrideAnnortationCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
        addOverrideAnnortationCheckBox.setOpaque(false);
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
        gridBagConstraints.insets = new java.awt.Insets(0, 8, 8, 0);
        add(addOverrideAnnortationCheckBox, gridBagConstraints);

        org.openide.awt.Mnemonics.setLocalizedText(parametersFinalCheckBox, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_ParametersFinal")); // NOI18N
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
        gridBagConstraints.insets = new java.awt.Insets(0, 0, 4, 0);
        add(finalLabel, gridBagConstraints);

        org.openide.awt.Mnemonics.setLocalizedText(parametersFinalCheckBox, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_ParametersFinal")); // NOI18N
        parametersFinalCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
        parametersFinalCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
        parametersFinalCheckBox.setOpaque(false);
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
        gridBagConstraints.insets = new java.awt.Insets(0, 8, 4, 0);
        add(parametersFinalCheckBox, gridBagConstraints);

        org.openide.awt.Mnemonics.setLocalizedText(localVarsFinalCheckBox, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_LocalVariablesFinal")); // NOI18N
        localVarsFinalCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
        localVarsFinalCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
        localVarsFinalCheckBox.setOpaque(false);
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
        gridBagConstraints.insets = new java.awt.Insets(0, 8, 8, 0);
        add(localVarsFinalCheckBox, gridBagConstraints);

        org.openide.awt.Mnemonics.setLocalizedText(memberOrderLabel, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_MembersOreder")); // NOI18N
        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
        gridBagConstraints.insets = new java.awt.Insets(0, 0, 4, 0);
        add(jLabel10, gridBagConstraints);

        membersOrderList.setModel(new javax.swing.AbstractListModel() {
            String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5", "Item 6", "Item 7", "Item 8", "Item 9" };

        importsOrderList.setModel(new javax.swing.AbstractListModel() {
            String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" };
            public int getSize() { return strings.length; }
            public Object getElementAt(int i) { return strings[i]; }
        });
        membersOrderList.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
        jScrollPane1.setViewportView(membersOrderList);

        org.openide.awt.Mnemonics.setLocalizedText(upButton, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_MembersOrederUp")); // NOI18N
        upButton.addActionListener(new java.awt.event.ActionListener() {
            public void actionPerformed(java.awt.event.ActionEvent evt) {
                upButtonActionPerformed(evt);
            }
        });

        org.openide.awt.Mnemonics.setLocalizedText(downButton, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_MembersOrederDown")); // NOI18N
        downButton.addActionListener(new java.awt.event.ActionListener() {
            public void actionPerformed(java.awt.event.ActionEvent evt) {
                downButtonActionPerformed(evt);
            }
        });
        jPanel1.add(importUpButton, gridBagConstraints);

        org.openide.awt.Mnemonics.setLocalizedText(sortByVisibilityCheckBox, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_SortByVisibility")); // NOI18N
        sortByVisibilityCheckBox.addActionListener(new java.awt.event.ActionListener() {
            public void actionPerformed(java.awt.event.ActionEvent evt) {
                sortByVisibilityCheckBoxActionPerformed(evt);
            }
        });
        gridBagConstraints.weighty = 1.0;
        gridBagConstraints.insets = new java.awt.Insets(0, 4, 4, 1);
        jPanel1.add(importDownButton, gridBagConstraints);

        visibilityOrderList.setModel(new javax.swing.AbstractListModel() {
            String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4" };
            public int getSize() { return strings.length; }
            public Object getElementAt(int i) { return strings[i]; }
        });
        visibilityOrderList.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
        jScrollPane2.setViewportView(visibilityOrderList);

        org.openide.awt.Mnemonics.setLocalizedText(visUpButton, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_MembersOrederUp")); // NOI18N
        visUpButton.addActionListener(new java.awt.event.ActionListener() {
            public void actionPerformed(java.awt.event.ActionEvent evt) {
                visUpButtonActionPerformed(evt);
            }
        });

        org.openide.awt.Mnemonics.setLocalizedText(visDownButton, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_MembersOrederDown")); // NOI18N
        visDownButton.addActionListener(new java.awt.event.ActionListener() {
            public void actionPerformed(java.awt.event.ActionEvent evt) {
                visDownButtonActionPerformed(evt);
            }
        });

        insertionPointLabel.setLabelFor(insertionPointComboBox);
        org.openide.awt.Mnemonics.setLocalizedText(insertionPointLabel, org.openide.util.NbBundle.getMessage(FmtCodeGeneration.class, "LBL_gen_InsertionPoint")); // NOI18N

        insertionPointComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));

        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
        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)
                    .addGroup(layout.createSequentialGroup()
                        .addContainerGap()
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                            .addComponent(qualifyFieldAccessCheckBox)
                            .addComponent(addOverrideAnnortationCheckBox)
                            .addComponent(parametersFinalCheckBox)
                            .addComponent(localVarsFinalCheckBox))))
                .addGap(0, 0, Short.MAX_VALUE))
            .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, false)
                            .addComponent(isForBooleanGettersCheckBox)
                            .addComponent(preferLongerNamesCheckBox)
                            .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 274, javax.swing.GroupLayout.PREFERRED_SIZE)
                            .addGroup(layout.createSequentialGroup()
                                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                                    .addComponent(jScrollPane1)
                                    .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.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())
            .addComponent(jSeparator2, javax.swing.GroupLayout.Alignment.TRAILING)
        );
        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)
                .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)
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addComponent(addOverrideAnnortationCheckBox)
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addComponent(parametersFinalCheckBox)
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addComponent(localVarsFinalCheckBox)
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                .addComponent(jSeparator3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addComponent(memberOrderLabel)
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                    .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 156, javax.swing.GroupLayout.PREFERRED_SIZE)
                    .addGroup(layout.createSequentialGroup()
                        .addComponent(upButton)
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                        .addComponent(downButton)))
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addComponent(sortByVisibilityCheckBox)
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                    .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 71, javax.swing.GroupLayout.PREFERRED_SIZE)
                    .addGroup(layout.createSequentialGroup()
                        .addComponent(visUpButton)
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                        .addComponent(visDownButton)))
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addComponent(jSeparator2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                .addGap(10, 10, 10)
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                    .addComponent(insertionPointLabel)
                    .addComponent(insertionPointComboBox, 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

    private void upButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_upButtonActionPerformed
        int idx = membersOrderList.getSelectedIndex();
        if (idx > 0) {
            Object val = membersOrderList.getModel().getElementAt(idx);
            ((DefaultListModel)membersOrderList.getModel()).removeElementAt(idx);
            ((DefaultListModel)membersOrderList.getModel()).insertElementAt(val, idx - 1);
            membersOrderList.setSelectedIndex(idx - 1);
        }
    }//GEN-LAST:event_upButtonActionPerformed

    private void downButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_downButtonActionPerformed
        int idx = membersOrderList.getSelectedIndex();
        if (idx >= 0 && idx < membersOrderList.getModel().getSize() - 1) {
            Object val = membersOrderList.getModel().getElementAt(idx);
            ((DefaultListModel)membersOrderList.getModel()).removeElementAt(idx);
            ((DefaultListModel)membersOrderList.getModel()).insertElementAt(val, idx + 1);
            membersOrderList.setSelectedIndex(idx + 1);
        }
    }//GEN-LAST:event_downButtonActionPerformed

    private void visUpButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_visUpButtonActionPerformed
        int idx = visibilityOrderList.getSelectedIndex();
        if (idx > 0) {
            Object val = visibilityOrderList.getModel().getElementAt(idx);
            ((DefaultListModel)visibilityOrderList.getModel()).removeElementAt(idx);
            ((DefaultListModel)visibilityOrderList.getModel()).insertElementAt(val, idx - 1);
            visibilityOrderList.setSelectedIndex(idx - 1);
        }
    }//GEN-LAST:event_visUpButtonActionPerformed

    private void visDownButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_visDownButtonActionPerformed
        int idx = visibilityOrderList.getSelectedIndex();
        if (idx >= 0 && idx < visibilityOrderList.getModel().getSize() - 1) {
            Object val = visibilityOrderList.getModel().getElementAt(idx);
            ((DefaultListModel)visibilityOrderList.getModel()).removeElementAt(idx);
            ((DefaultListModel)visibilityOrderList.getModel()).insertElementAt(val, idx + 1);
            visibilityOrderList.setSelectedIndex(idx + 1);
        }
    }//GEN-LAST:event_visDownButtonActionPerformed

    private void sortByVisibilityCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_sortByVisibilityCheckBoxActionPerformed
        enableVisibilityOrder();
    }//GEN-LAST:event_sortByVisibilityCheckBoxActionPerformed
    
    private void enableMembersOrderButtons() {
        int idx = membersOrderList.getSelectedIndex();                
        upButton.setEnabled(idx > 0);
        downButton.setEnabled(idx >= 0 && idx < membersOrderList.getModel().getSize() - 1);
    }
    
    private void enableVisibilityOrder() {
        int idx = visibilityOrderList.getSelectedIndex();
        boolean b = sortByVisibilityCheckBox.isSelected();
        visibilityOrderList.setEnabled(b);
        visUpButton.setEnabled(b && idx > 0);
        visDownButton.setEnabled(b && idx >= 0 && idx < visibilityOrderList.getModel().getSize() - 1);
    }
    
    // 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.JButton importUpButton;
    private javax.swing.JList importsOrderList;
    private javax.swing.JCheckBox isForBooleanGettersCheckBox;
    private javax.swing.JLabel jLabel10;
    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 preferLongerNamesLabel;
    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;
    private javax.swing.JList visibilityOrderList;
    // End of variables declaration//GEN-END:variables

        private static final class CodeGenCategorySupport extends CategorySupport {
        
        private Source source = null;

        private CodeGenCategorySupport(Preferences preferences, JPanel panel) {
            super(preferences, "code-generation", panel, NbBundle.getMessage(FmtCodeGeneration.class, "SAMPLE_CodeGen"), //NOI18N
                    new String[] { FmtOptions.blankLinesBeforeFields, "1" }); //NOI18N
        }
    
        @Override
        protected void loadListData(JList list, String optionID, Preferences node) {
            DefaultListModel model = new DefaultListModel();
            String value = node.get(optionID, getDefaultAsString(optionID));
            for (String s : value.trim().split("\\s*[,;]\\s*")) { //NOI18N
                if (classMembersOrder.equals(optionID)) {
                    Element e = new Element();
                    if (s.startsWith("STATIC ")) { //NOI18N
                        e.isStatic = true;
                        s = s.substring(7);
                    }
                    e.kind = ElementKind.valueOf(s);
                    model.addElement(e);
                } else {
                    Visibility v = new Visibility();
                    v.kind = s;
                    model.addElement(v);
                }
            }
            list.setModel(model);
        }
        
        @Override
        protected void storeListData(final JList list, final String optionID, final Preferences node) {
            StringBuilder sb = null;
            for (int i = 0; i < list.getModel().getSize(); i++) {
                if (sb == null) {
                    sb = new StringBuilder();
                } else {
                    sb.append(';');
                }
                if (classMembersOrder.equals(optionID)) {
                    Element e = (Element) list.getModel().getElementAt(i);
                    if (e.isStatic)
                        sb.append("STATIC "); //NOI18N
                    sb.append(e.kind.name());
                } else {
                    Visibility v = (Visibility) list.getModel().getElementAt(i);
                    sb.append(v.kind);
                }
            }
            String value = sb != null ? sb.toString() : ""; //NOI18N
            if (getDefaultAsString(optionID).equals(value))
                node.remove(optionID);
            else
                node.put(optionID, value);            
        }

        @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);
                        VariableTree field = (VariableTree)ct.getMembers().get(1);
                        List<Tree> members = new ArrayList<Tree>();
                        AssignmentTree stat = tm.Assignment(tm.Identifier("name"), tm.Literal("Name")); //NOI18N
                        BlockTree init = tm.Block(Collections.singletonList(tm.ExpressionStatement(stat)), false);
                        members.add(init);
                        members.add(gu.createConstructor(ct, Collections.<VariableTree>emptyList()));
                        members.add(gu.createGetter(field));
                        ModifiersTree mods = tm.Modifiers(EnumSet.of(Modifier.PRIVATE));
                        ClassTree inner = tm.Class(mods, "Inner", Collections.<TypeParameterTree>emptyList(), null, Collections.<Tree>emptyList(), Collections.<Tree>emptyList()); //NOI18N
                        members.add(inner);
                        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
                        VariableTree staticField = tm.Variable(mods, "instance", nestedId, null); //NOI18N
                        members.add(staticField);
                        NewClassTree nct = tm.NewClass(null, Collections.<ExpressionTree>emptyList(), nestedId, Collections.<ExpressionTree>emptyList(), null);
                        stat = tm.Assignment(tm.Identifier("instance"), nct); //NOI18N
                        BlockTree staticInit = tm.Block(Collections.singletonList(tm.ExpressionStatement(stat)), true);
                        members.add(staticInit);
                        members.add(gu.createGetter(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(FmtCodeGeneration.class, "VAL_gen_STATIC") + " " : "") //NOI18N
                        + NbBundle.getMessage(FmtCodeGeneration.class, "VAL_gen_" + kind.name()); //NOI18N
            }
        }

        private static class Visibility {
            
            private String kind;

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

Lines 63-68 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/FmtOptions.java (-4 / +67 lines)
63	import javax.swing.JComboBox;	63	import javax.swing.JComboBox;
64	import javax.swing.JComponent;	64	import javax.swing.JComponent;
65	import javax.swing.JEditorPane;	65	import javax.swing.JEditorPane;
		66	import javax.swing.JList;
66	import javax.swing.JPanel;	67	import javax.swing.JPanel;
67	import javax.swing.JSpinner;	68	import javax.swing.JSpinner;
68	import javax.swing.JTable;	69	import javax.swing.JTable;
Lines 72-77 Link Here
72	import javax.swing.event.ChangeListener;	73	import javax.swing.event.ChangeListener;
73	import javax.swing.event.DocumentEvent;	74	import javax.swing.event.DocumentEvent;
74	import javax.swing.event.DocumentListener;	75	import javax.swing.event.DocumentListener;
		76	import javax.swing.event.ListDataEvent;
		77	import javax.swing.event.ListDataListener;
75	import javax.swing.event.TableModelEvent;	78	import javax.swing.event.TableModelEvent;
76	import javax.swing.event.TableModelListener;	79	import javax.swing.event.TableModelListener;
77	import org.netbeans.api.editor.settings.SimpleValueNames;	80	import org.netbeans.api.editor.settings.SimpleValueNames;
Lines 119-124 Link Here
119	public static final String makeLocalVarsFinal = "makeLocalVarsFinal"; //NOI18N	122	public static final String makeLocalVarsFinal = "makeLocalVarsFinal"; //NOI18N
120	public static final String makeParametersFinal = "makeParametersFinal"; //NOI18N	123	public static final String makeParametersFinal = "makeParametersFinal"; //NOI18N
121	public static final String classMembersOrder = "classMembersOrder"; //NOI18N	124	public static final String classMembersOrder = "classMembersOrder"; //NOI18N
		125	public static final String sortMembersByVisibility = "sortMembersByVisibility"; //NOI18N
		126	public static final String visibilityOrder = "visibilityOrder"; //NOI18N
		127	public static final String classMemberInsertionPoint = "classMemberInsertionPoint"; //NOI18N
122		128
123	public static final String classDeclBracePlacement = "classDeclBracePlacement"; //NOI18N	129	public static final String classDeclBracePlacement = "classDeclBracePlacement"; //NOI18N
124	public static final String methodDeclBracePlacement = "methodDeclBracePlacement"; //NOI18N	130	public static final String methodDeclBracePlacement = "methodDeclBracePlacement"; //NOI18N
Lines 155-160 Link Here
155	public static final String wrapMethodCallArgs = "wrapMethodCallArgs"; //NOI18N	161	public static final String wrapMethodCallArgs = "wrapMethodCallArgs"; //NOI18N
156	public static final String wrapAnnotationArgs = "wrapAnnotationArgs"; //NOI18N	162	public static final String wrapAnnotationArgs = "wrapAnnotationArgs"; //NOI18N
157	public static final String wrapChainedMethodCalls = "wrapChainedMethodCalls"; //NOI18N	163	public static final String wrapChainedMethodCalls = "wrapChainedMethodCalls"; //NOI18N
		164	public static final String wrapAfterDotInChainedMethodCalls = "wrapAfterDotInChainedMethodCalls"; //NOI18N
158	public static final String wrapArrayInit = "wrapArrayInit"; //NOI18N	165	public static final String wrapArrayInit = "wrapArrayInit"; //NOI18N
159	public static final String wrapTryResources = "wrapTryResources"; //NOI18N	166	public static final String wrapTryResources = "wrapTryResources"; //NOI18N
160	public static final String wrapDisjunctiveCatchTypes = "wrapDisjunctiveCatchTypes"; //NOI18N	167	public static final String wrapDisjunctiveCatchTypes = "wrapDisjunctiveCatchTypes"; //NOI18N
Lines 179-184 Link Here
179	public static final String blankLinesBeforeClass = "blankLinesBeforeClass"; //NOI18N	186	public static final String blankLinesBeforeClass = "blankLinesBeforeClass"; //NOI18N
180	public static final String blankLinesAfterClass = "blankLinesAfterClass"; //NOI18N	187	public static final String blankLinesAfterClass = "blankLinesAfterClass"; //NOI18N
181	public static final String blankLinesAfterClassHeader = "blankLinesAfterClassHeader"; //NOI18N	188	public static final String blankLinesAfterClassHeader = "blankLinesAfterClassHeader"; //NOI18N
		189	public static final String blankLinesAfterAnonymousClassHeader = "blankLinesAfterAnonymousClassHeader"; //NOI18N
182	public static final String blankLinesBeforeFields = "blankLinesBeforeFields"; //NOI18N	190	public static final String blankLinesBeforeFields = "blankLinesBeforeFields"; //NOI18N
183	public static final String blankLinesAfterFields = "blankLinesAfterFields"; //NOI18N	191	public static final String blankLinesAfterFields = "blankLinesAfterFields"; //NOI18N
184	public static final String blankLinesBeforeMethods = "blankLinesBeforeMethods"; //NOI18N	192	public static final String blankLinesBeforeMethods = "blankLinesBeforeMethods"; //NOI18N
Lines 202-207 Link Here
202	public static final String spaceAroundBinaryOps = "spaceAroundBinaryOps"; //NOI18N	210	public static final String spaceAroundBinaryOps = "spaceAroundBinaryOps"; //NOI18N
203	public static final String spaceAroundTernaryOps = "spaceAroundTernaryOps"; //NOI18N	211	public static final String spaceAroundTernaryOps = "spaceAroundTernaryOps"; //NOI18N
204	public static final String spaceAroundAssignOps = "spaceAroundAssignOps"; //NOI18N	212	public static final String spaceAroundAssignOps = "spaceAroundAssignOps"; //NOI18N
		213	public static final String spaceAroundAnnotationValueAssignOps = "spaceAroundAnnotationValueAssignOps"; //NOI18N
205	public static final String spaceBeforeClassDeclLeftBrace = "spaceBeforeClassDeclLeftBrace"; //NOI18N	214	public static final String spaceBeforeClassDeclLeftBrace = "spaceBeforeClassDeclLeftBrace"; //NOI18N
206	public static final String spaceBeforeMethodDeclLeftBrace = "spaceBeforeMethodDeclLeftBrace"; //NOI18N	215	public static final String spaceBeforeMethodDeclLeftBrace = "spaceBeforeMethodDeclLeftBrace"; //NOI18N
207	public static final String spaceBeforeIfLeftBrace = "spaceBeforeIfLeftBrace"; //NOI18N	216	public static final String spaceBeforeIfLeftBrace = "spaceBeforeIfLeftBrace"; //NOI18N
Lines 340-346 Link Here
340		349
341	private static final String BGS_ELIMINATE = BracesGenerationStyle.ELIMINATE.name();	350	private static final String BGS_ELIMINATE = BracesGenerationStyle.ELIMINATE.name();
342	private static final String BGS_LEAVE_ALONE = BracesGenerationStyle.LEAVE_ALONE.name();	351	private static final String BGS_LEAVE_ALONE = BracesGenerationStyle.LEAVE_ALONE.name();
343	private static final String BGS_GENERATE = BracesGenerationStyle.GENERATE.name();	352	private static final String BGS_GENERATE = BracesGenerationStyle.GENERATE.name();
		353
		354	private static final String IP_CARET = InsertionPoint.CARET_LOCATION.name();
		355	private static final String IP_FIRST = InsertionPoint.FIRST_IN_CATEGORY.name();
		356	private static final String IP_LAST = InsertionPoint.LAST_IN_CATEGORY.name();
344		357
345	private static Map<String,String> defaults;	358	private static Map<String,String> defaults;
346		359
Lines 376-382 Link Here
376	{ addOverrideAnnotation, TRUE}, //NOI18N	389	{ addOverrideAnnotation, TRUE}, //NOI18N
377	{ makeLocalVarsFinal, FALSE}, //NOI18N	390	{ makeLocalVarsFinal, FALSE}, //NOI18N
378	{ makeParametersFinal, FALSE}, //NOI18N	391	{ makeParametersFinal, FALSE}, //NOI18N
379	{ classMembersOrder, ""}, //NOI18N // XXX	392	{ classMembersOrder, "STATIC FIELD;STATIC_INIT;STATIC METHOD;FIELD;INSTANCE_INIT;CONSTRUCTOR;METHOD;STATIC CLASS;CLASS"}, //NOI18N
		393	{ sortMembersByVisibility, FALSE}, //NOI18N
		394	{ visibilityOrder, "PUBLIC;PRIVATE;PROTECTED;DEFAULT"}, //NOI18N
		395	{ classMemberInsertionPoint, IP_LAST},
380		396
381	{ classDeclBracePlacement, BP_SAME_LINE}, //NOI18N	397	{ classDeclBracePlacement, BP_SAME_LINE}, //NOI18N
382	{ methodDeclBracePlacement, BP_SAME_LINE}, //NOI18N	398	{ methodDeclBracePlacement, BP_SAME_LINE}, //NOI18N
Lines 413-418 Link Here
413	{ wrapMethodCallArgs, WRAP_NEVER}, //NOI18N	429	{ wrapMethodCallArgs, WRAP_NEVER}, //NOI18N
414	{ wrapAnnotationArgs, WRAP_NEVER}, //NOI18N	430	{ wrapAnnotationArgs, WRAP_NEVER}, //NOI18N
415	{ wrapChainedMethodCalls, WRAP_NEVER}, //NOI18N	431	{ wrapChainedMethodCalls, WRAP_NEVER}, //NOI18N
		432	{ wrapAfterDotInChainedMethodCalls, TRUE}, //NOI18N
416	{ wrapArrayInit, WRAP_NEVER}, //NOI18N	433	{ wrapArrayInit, WRAP_NEVER}, //NOI18N
417	{ wrapTryResources, WRAP_NEVER}, //NOI18N	434	{ wrapTryResources, WRAP_NEVER}, //NOI18N
418	{ wrapDisjunctiveCatchTypes, WRAP_NEVER}, //NOI18N	435	{ wrapDisjunctiveCatchTypes, WRAP_NEVER}, //NOI18N
Lines 437-442 Link Here
437	{ blankLinesBeforeClass, "1"}, //NOI18N	454	{ blankLinesBeforeClass, "1"}, //NOI18N
438	{ blankLinesAfterClass, "0"}, //NOI18N	455	{ blankLinesAfterClass, "0"}, //NOI18N
439	{ blankLinesAfterClassHeader, "1"}, //NOI18N	456	{ blankLinesAfterClassHeader, "1"}, //NOI18N
		457	{ blankLinesAfterAnonymousClassHeader, "0"}, //NOI18N
440	{ blankLinesBeforeFields, "0"}, //NOI18N	458	{ blankLinesBeforeFields, "0"}, //NOI18N
441	{ blankLinesAfterFields, "0"}, //NOI18N	459	{ blankLinesAfterFields, "0"}, //NOI18N
442	{ blankLinesBeforeMethods, "1"}, //NOI18N	460	{ blankLinesBeforeMethods, "1"}, //NOI18N
Lines 460-465 Link Here
460	{ spaceAroundBinaryOps, TRUE}, //NOI18N	478	{ spaceAroundBinaryOps, TRUE}, //NOI18N
461	{ spaceAroundTernaryOps, TRUE}, //NOI18N	479	{ spaceAroundTernaryOps, TRUE}, //NOI18N
462	{ spaceAroundAssignOps, TRUE}, //NOI18N	480	{ spaceAroundAssignOps, TRUE}, //NOI18N
		481	{ spaceAroundAnnotationValueAssignOps, TRUE}, //NOI18N
463	{ spaceBeforeClassDeclLeftBrace, TRUE}, //NOI18N	482	{ spaceBeforeClassDeclLeftBrace, TRUE}, //NOI18N
464	{ spaceBeforeMethodDeclLeftBrace, TRUE}, //NOI18N	483	{ spaceBeforeMethodDeclLeftBrace, TRUE}, //NOI18N
465	{ spaceBeforeIfLeftBrace, TRUE}, //NOI18N	484	{ spaceBeforeIfLeftBrace, TRUE}, //NOI18N
Lines 534-540 Link Here
534		553
535	// Support section ---------------------------------------------------------	554	// Support section ---------------------------------------------------------
536		555
537	public static class CategorySupport implements ActionListener, ChangeListener, TableModelListener, DocumentListener, PreviewProvider, PreferencesCustomizer {	556	public static class CategorySupport implements ActionListener, ChangeListener, ListDataListener, TableModelListener, DocumentListener, PreviewProvider, PreferencesCustomizer {
538		557
539	public static final String OPTION_ID = "org.netbeans.modules.java.ui.FormatingOptions.ID";	558	public static final String OPTION_ID = "org.netbeans.modules.java.ui.FormatingOptions.ID";
540		559
Lines 560-565 Link Here
560	new ComboItem( WrapStyle.WRAP_NEVER.name(), "LBL_wrp_WRAP_NEVER" ) // NOI18N	579	new ComboItem( WrapStyle.WRAP_NEVER.name(), "LBL_wrp_WRAP_NEVER" ) // NOI18N
561	};	580	};
562		581
		582	private static final ComboItem insertionPoint[] = new ComboItem[] {
		583	new ComboItem( InsertionPoint.LAST_IN_CATEGORY.name(), "LBL_ip_LAST_IN_CATEGORY" ), // NOI18N
		584	new ComboItem( InsertionPoint.FIRST_IN_CATEGORY.name(), "LBL_ip_FIRST_IN_CATEGORY" ), // NOI18N
		585	new ComboItem( InsertionPoint.CARET_LOCATION.name(), "LBL_ip_CARET_LOCATION" ) // NOI18N
		586	};
		587
563	protected final String previewText;	588	protected final String previewText;
564	// private String forcedOptions[][];	589	// private String forcedOptions[][];
565		590
Lines 619-624 Link Here
619	refreshPreview();	644	refreshPreview();
620	}	645	}
621		646
		647	protected void loadListData(final JList list, final String optionID, final Preferences p) {
		648	}
		649
		650	protected void storeListData(final JList list, final String optionID, final Preferences node) {
		651	}
		652
622	protected void loadTableData(final JTable table, final String optionID, final Preferences p) {	653	protected void loadTableData(final JTable table, final String optionID, final Preferences p) {
623	}	654	}
624		655
Lines 638-643 Link Here
638	notifyChanged();	669	notifyChanged();
639	}	670	}
640		671
		672	// ListDataListener implementation -----------------------------------
		673
		674	@Override
		675	public void contentsChanged(ListDataEvent e) {
		676	}
		677
		678	@Override
		679	public void intervalAdded(ListDataEvent e) {
		680	notifyChanged();
		681	}
		682
		683	@Override
		684	public void intervalRemoved(ListDataEvent e) {
		685	}
		686
641	// TableModelListener implementation -----------------------------------	687	// TableModelListener implementation -----------------------------------
642		688
643	@Override	689	@Override
Lines 812-817 Link Here
812	ComboItem item = whichItem(value, model);	858	ComboItem item = whichItem(value, model);
813	cb.setSelectedItem(item);	859	cb.setSelectedItem(item);
814	}	860	}
		861	else if ( jc instanceof JList ) {
		862	loadListData((JList)jc, optionID, node);
		863	}
815	else if ( jc instanceof JTable ) {	864	else if ( jc instanceof JTable ) {
816	loadTableData((JTable)jc, optionID, node);	865	loadTableData((JTable)jc, optionID, node);
817	}	866	}
Lines 871-876 Link Here
871	else	920	else
872	node.put(optionID,value);	921	node.put(optionID,value);
873	}	922	}
		923	else if ( jc instanceof JList ) {
		924	storeListData((JList)jc, optionID, node);
		925	}
874	else if ( jc instanceof JTable ) {	926	else if ( jc instanceof JTable ) {
875	storeTableData((JTable)jc, optionID, node);	927	storeTableData((JTable)jc, optionID, node);
876	}	928	}
Lines 894-899 Link Here
894	JComboBox cb = (JComboBox)jc;	946	JComboBox cb = (JComboBox)jc;
895	cb.addActionListener(this);	947	cb.addActionListener(this);
896	}	948	}
		949	else if ( jc instanceof JList) {
		950	JList jl = (JList)jc;
		951	jl.getModel().addListDataListener(this);
		952	}
897	else if ( jc instanceof JTable) {	953	else if ( jc instanceof JTable) {
898	JTable jt = (JTable)jc;	954	JTable jt = (JTable)jc;
899	jt.getModel().addTableModelListener(this);	955	jt.getModel().addTableModelListener(this);
Lines 917-929 Link Here
917	}	973	}
918	}	974	}
919		975
920	// is it wrap	976	// is it wrap?
921	for (ComboItem comboItem : wrap) {	977	for (ComboItem comboItem : wrap) {
922	if ( value.equals( comboItem.value) ) {	978	if ( value.equals( comboItem.value) ) {
923	return new DefaultComboBoxModel( wrap );	979	return new DefaultComboBoxModel( wrap );
924	}	980	}
925	}	981	}
926		982
		983	// is it insertion point?
		984	for (ComboItem comboItem : insertionPoint) {
		985	if ( value.equals( comboItem.value) ) {
		986	return new DefaultComboBoxModel( insertionPoint );
		987	}
		988	}
		989
927	return null;	990	return null;
928	}	991	}
929		992

Lines 244-250 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/FmtSpaces.java (-1 / +2 lines)
244	new Item(spaceAroundUnaryOps),	244	new Item(spaceAroundUnaryOps),
245	new Item(spaceAroundBinaryOps),	245	new Item(spaceAroundBinaryOps),
246	new Item(spaceAroundTernaryOps),	246	new Item(spaceAroundTernaryOps),
247	new Item(spaceAroundAssignOps) ),	247	new Item(spaceAroundAssignOps),
		248	new Item(spaceAroundAnnotationValueAssignOps) ),
248		249
249	new Item("BeforeLeftBraces", // NOI18N	250	new Item("BeforeLeftBraces", // NOI18N
250	new Item(spaceBeforeClassDeclLeftBrace),	251	new Item(spaceBeforeClassDeclLeftBrace),




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

<Form version="1.4" maxVersion="1.4" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
  <Properties>

                </Constraint>
              </Constraints>
            </Component>
            <Component class="javax.swing.JCheckBox" name="afterDotCheckBox">
              <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_wrp_afeterDot" 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>
              <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="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="8" insetsBottom="6" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
                </Constraint>
              </Constraints>
            </Component>
            <Component class="javax.swing.JLabel" name="throwsKeywordLabel">
              <Properties>
                <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">

Return to bug 208503

Lines 108-113 Link Here

(-)a/java.source/apichanges.xml (+15 lines)
108	<!-- ACTUAL CHANGES BEGIN HERE: -->	108	<!-- ACTUAL CHANGES BEGIN HERE: -->
109		109
110	<changes>	110	<changes>
		111	<change id="class-members-order">
		112	<api name="general"/>
		113	<summary>Added several methods to <code>CodeStyle</code> supporting customization of the generated class members order and other minor formatting enhancements.</summary>
		114	<version major="0" minor="96"/>
		115	<date day="16" month="2" year="2012"/>
		116	<author login="dbalek"/>
		117	<compatibility addition="yes" binary="compatible" deletion="no" deprecation="no" modification="no" semantic="compatible" source="compatible"/>
		118	<description>
		119	Added <code>CodeStyle.getClassMemberGroups</code>, <code>CodeStyle.getClassMemberInsertionPoint</code>,
		120	to support customization of the generated class members order, and <code>CodeStyle.wrapAfterDotInChainedMethodCalls</code>,
		121	<code>CodeStyle.getBlankLinesAfterAnonymousClassHeader</code>, <code>CodeStyle.spaceAroundAnnotationValueAssignOps</code>
		122	to support minor formatting enhancements.
		123	</description>
		124	<issue number="20672"/>
		125	</change>
111	<change id="SourceUtils-backgroundScan">	126	<change id="SourceUtils-backgroundScan">
112	<api name="general"/>	127	<api name="general"/>
113	<summary>Added <code>SourceUtils.waitUserActionTask</code>.</summary>	128	<summary>Added <code>SourceUtils.waitUserActionTask</code>.</summary>

Lines 111-119 Link Here

(-)a/java.source/src/org/netbeans/api/java/source/GeneratorUtilities.java (-47 / +27 lines)
111	import javax.lang.model.type.TypeVariable;	111	import javax.lang.model.type.TypeVariable;
112	import javax.lang.model.type.WildcardType;	112	import javax.lang.model.type.WildcardType;
113	import javax.lang.model.util.Elements;	113	import javax.lang.model.util.Elements;
114	import javax.lang.model.util.Types;
115	import javax.swing.text.Document;	114	import javax.swing.text.Document;
		115	import javax.swing.text.JTextComponent;
116		116
		117	import org.netbeans.api.editor.EditorRegistry;
117	import org.netbeans.api.java.lexer.JavaTokenId;	118	import org.netbeans.api.java.lexer.JavaTokenId;
118	import org.netbeans.api.lexer.TokenSequence;	119	import org.netbeans.api.lexer.TokenSequence;
119	import org.netbeans.editor.GuardedDocument;	120	import org.netbeans.editor.GuardedDocument;
Lines 162-193 Link Here
162	public ClassTree insertClassMember(ClassTree clazz, Tree member) {	163	public ClassTree insertClassMember(ClassTree clazz, Tree member) {
163	assert clazz != null && member != null;	164	assert clazz != null && member != null;
164	int idx = 0;	165	int idx = 0;
165	GuardedDocument gdoc = null;	166	Document doc = null;
166	SourcePositions sp = null;	167	int caretPos = -1;
167	try {	168	try {
168	Document doc = copy.getDocument();	169	doc = copy.getDocument();
169	if (doc == null) {	170	if (doc == null) {
170	DataObject data = DataObject.find(copy.getFileObject());	171	DataObject data = DataObject.find(copy.getFileObject());
171	EditorCookie cookie = data.getCookie(EditorCookie.class);	172	EditorCookie cookie = data.getCookie(EditorCookie.class);
172	doc = cookie.openDocument();	173	doc = cookie.openDocument();
173	}	174	}
174
175	if (doc != null && doc instanceof GuardedDocument) {
176	gdoc = (GuardedDocument)doc;
177	sp = copy.getTrees().getSourcePositions();
178	}
179	} catch (IOException ioe) {}	175	} catch (IOException ioe) {}
		176	CodeStyle codeStyle = DiffContext.getCodeStyle(copy);
		177	if (codeStyle.getClassMemberInsertionPoint() == CodeStyle.InsertionPoint.CARET_LOCATION) {
		178	JTextComponent jtc = EditorRegistry.lastFocusedComponent();
		179	if (jtc.getDocument() == doc)
		180	caretPos = jtc.getCaretPosition();
		181	}
		182	ClassMemberComparator comparator = caretPos < 0 ? new ClassMemberComparator(codeStyle) : null;
		183	SourcePositions sp = copy.getTrees().getSourcePositions();
180	TreeUtilities utils = copy.getTreeUtilities();	184	TreeUtilities utils = copy.getTreeUtilities();
181	CompilationUnitTree compilationUnit = copy.getCompilationUnit();	185	CompilationUnitTree compilationUnit = copy.getCompilationUnit();
182	Tree lastMember = null;	186	Tree lastMember = null;
183	for (Tree tree : clazz.getMembers()) {	187	for (Tree tree : clazz.getMembers()) {
184	TreePath path = TreePath.getPath(compilationUnit, tree);	188	TreePath path = TreePath.getPath(compilationUnit, tree);
185	if ((path == null \|\| !utils.isSynthetic(path)) && CLASS_MEMBER_COMPARATOR.compare(member, tree) < 0) {	189	if ((path == null \|\| !utils.isSynthetic(path)) && (caretPos < 0
186	if (gdoc == null)	190	&& (codeStyle.getClassMemberInsertionPoint() == CodeStyle.InsertionPoint.FIRST_IN_CATEGORY && comparator.compare(member, tree) <= 0
		191	\|\| comparator.compare(member, tree) < 0) \|\| caretPos >= 0 && caretPos < sp.getStartPosition(compilationUnit, tree))) {
		192	if (doc == null \|\| !(doc instanceof GuardedDocument))
187	break;	193	break;
188	int pos = (int)(lastMember != null ? sp.getEndPosition(compilationUnit, lastMember) : sp.getStartPosition( compilationUnit,clazz));	194	int pos = (int)(lastMember != null ? sp.getEndPosition(compilationUnit, lastMember) : sp.getStartPosition( compilationUnit,clazz));
189	pos = gdoc.getGuardedBlockChain().adjustToBlockEnd(pos);	195	pos = ((GuardedDocument)doc).getGuardedBlockChain().adjustToBlockEnd(pos);
190	if (pos <= sp.getStartPosition(compilationUnit, tree))	196	long treePos = sp.getStartPosition(compilationUnit, tree);
		197	if (treePos < 0 \|\| pos <= treePos)
191	break;	198	break;
192	}	199	}
193	idx++;	200	idx++;
Lines 1015-1061 Link Here
1015		1022
1016	private static class ClassMemberComparator implements Comparator<Tree> {	1023	private static class ClassMemberComparator implements Comparator<Tree> {
1017		1024
		1025	private CodeStyle.MemberGroups groups;
		1026
		1027	public ClassMemberComparator(CodeStyle cs) {
		1028	this.groups = cs.getClassMemberGroups();
		1029	}
		1030
1018	@Override	1031	@Override
1019	public int compare(Tree tree1, Tree tree2) {	1032	public int compare(Tree tree1, Tree tree2) {
1020	if (tree1 == tree2)	1033	if (tree1 == tree2)
1021	return 0;	1034	return 0;
1022	return getSortPriority(tree1) - getSortPriority(tree2);	1035	return groups.getGroupId(tree1) - groups.getGroupId(tree2);
1023	}
1024
1025	private static int getSortPriority(Tree tree) {
1026	int ret = 0;
1027	ModifiersTree modifiers = null;
1028	switch (tree.getKind()) {
1029	case ANNOTATION_TYPE:
1030	case CLASS:
1031	case ENUM:
1032	case INTERFACE:
1033	ret = 4000;
1034	modifiers = ((ClassTree)tree).getModifiers();
1035	break;
1036	case METHOD:
1037	MethodTree mt = (MethodTree)tree;
1038	if (mt.getName().contentEquals("<init>"))
1039	ret = 200;
1040	else
1041	ret = 300;
1042	modifiers = mt.getModifiers();
1043	break;
1044	case VARIABLE:
1045	ret = 100;
1046	modifiers = ((VariableTree)tree).getModifiers();
1047	break;
1048	}
1049	if (modifiers != null) {
1050	if (!modifiers.getFlags().contains(Modifier.STATIC))
1051	ret += 1000;
1052	}
1053	return ret;
1054	}	1036	}
1055	}	1037	}
1056		1038
1057	private static ClassMemberComparator CLASS_MEMBER_COMPARATOR = new ClassMemberComparator();
1058
1059	private static class ImportsComparator implements Comparator<Object> {	1039	private static class ImportsComparator implements Comparator<Object> {
1060		1040
1061	private CodeStyle.ImportGroups groups;	1041	private CodeStyle.ImportGroups groups;

Lines 124-129 Link Here

(-)a/java.source/src/org/netbeans/modules/java/source/pretty/VeryPretty.java (-5 / +10 lines)
124	private int fromOffset = -1;	124	private int fromOffset = -1;
125	private int toOffset = -1;	125	private int toOffset = -1;
126	private boolean containsError = false;	126	private boolean containsError = false;
		127	private boolean insideAnnotation = false;
127		128
128	private final Map<Tree, ?> tree2Tag;	129	private final Map<Tree, ?> tree2Tag;
129	private final Map<Object, int[]> tag2Span;	130	private final Map<Object, int[]> tag2Span;
Lines 672-678 Link Here
672	}	673	}
673	}	674	}
674	if (!emptyClass) {	675	if (!emptyClass) {
675	blankLines(cs.getBlankLinesAfterClassHeader());	676	blankLines(enclClassName.isEmpty() ? cs.getBlankLinesAfterAnonymousClassHeader() : cs.getBlankLinesAfterClassHeader());
676	if ((tree.mods.flags & ENUM) != 0) {	677	if ((tree.mods.flags & ENUM) != 0) {
677	printEnumConstants(tree.defs, false);	678	printEnumConstants(tree.defs, false);
678	}	679	}
Lines 1356-1369 Link Here
1356	public void visitAssign(JCAssign tree) {	1357	public void visitAssign(JCAssign tree) {
1357	int col = out.col;	1358	int col = out.col;
1358	printExpr(tree.lhs, TreeInfo.assignPrec + 1);	1359	printExpr(tree.lhs, TreeInfo.assignPrec + 1);
1359	if (cs.spaceAroundAssignOps())	1360	boolean spaceAroundAssignOps = cs.spaceAroundAssignOps();
		1361	if (spaceAroundAssignOps)
1360	print(' ');	1362	print(' ');
1361	print('=');	1363	print('=');
1362	int rm = cs.getRightMargin();	1364	int rm = cs.getRightMargin();
1363	switch(cs.wrapAssignOps()) {	1365	switch(cs.wrapAssignOps()) {
1364	case WRAP_IF_LONG:	1366	case WRAP_IF_LONG:
1365	if (widthEstimator.estimateWidth(tree.rhs, rm - out.col) + out.col <= cs.getRightMargin()) {	1367	if (widthEstimator.estimateWidth(tree.rhs, rm - out.col) + out.col <= cs.getRightMargin()) {
1366	if(cs.spaceAroundAssignOps())	1368	if(spaceAroundAssignOps)
1367	print(' ');	1369	print(' ');
1368	break;	1370	break;
1369	}	1371	}
Lines 1372-1378 Link Here
1372	toColExactly(cs.alignMultilineAssignment() ? col : out.leftMargin + cs.getContinuationIndentSize());	1374	toColExactly(cs.alignMultilineAssignment() ? col : out.leftMargin + cs.getContinuationIndentSize());
1373	break;	1375	break;
1374	case WRAP_NEVER:	1376	case WRAP_NEVER:
1375	if(cs.spaceAroundAssignOps())	1377	if(spaceAroundAssignOps)
1376	print(' ');	1378	print(' ');
1377	break;	1379	break;
1378	}	1380	}
Lines 1622-1627 Link Here
1622		1624
1623	@Override	1625	@Override
1624	public void visitAnnotation(JCAnnotation tree) {	1626	public void visitAnnotation(JCAnnotation tree) {
		1627	boolean oldInsideAnnotation = insideAnnotation;
		1628	insideAnnotation = true;
1625	if (!printAnnotationsFormatted(List.of(tree))) {	1629	if (!printAnnotationsFormatted(List.of(tree))) {
1626	print("@");	1630	print("@");
1627	printExpr(tree.annotationType);	1631	printExpr(tree.annotationType);
Lines 1633-1638 Link Here
1633	print(cs.spaceWithinAnnotationParens() ? " )" : ")");	1637	print(cs.spaceWithinAnnotationParens() ? " )" : ")");
1634	}	1638	}
1635	}	1639	}
		1640	insideAnnotation = oldInsideAnnotation;
1636	}	1641	}
1637		1642
1638	@Override	1643	@Override
Lines 2142-2148 Link Here
2142	printEmptyBlockComments(tree, members);	2147	printEmptyBlockComments(tree, members);
2143	} else {	2148	} else {
2144	if (members)	2149	if (members)
2145	blankLines(cs.getBlankLinesAfterClassHeader());	2150	blankLines(enclClassName.isEmpty() ? cs.getBlankLinesAfterAnonymousClassHeader() : cs.getBlankLinesAfterClassHeader());
2146	else	2151	else
2147	newline();	2152	newline();
2148	printStats(stats, members);	2153	printStats(stats, members);

Lines 215-227 Link Here

(-)a/java.source/src/org/netbeans/modules/java/source/resources/layer.xml (-4 / +2 lines)
215	<attr name="instanceCreate" methodvalue="org.netbeans.modules.java.ui.FmtImports.getController"/>	215	<attr name="instanceCreate" methodvalue="org.netbeans.modules.java.ui.FmtImports.getController"/>
216	<attr name="position" intvalue="800"/>	216	<attr name="position" intvalue="800"/>
217	</file>	217	</file>
218	<!--
219	<file name="CodeGeneration.instance">	218	<file name="CodeGeneration.instance">
220	<attr name="instanceOf" stringvalue="org.netbeans.spi.options.OptionsPanelController"/>	219	<attr name="instanceOf" stringvalue="org.netbeans.modules.options.editor.spi.PreferencesCustomizer$Factory"/>
221	<attr name="instanceCreate" methodvalue="org.netbeans.modules.java.ui.FmtCodeGeneration.getController"/>	220	<attr name="instanceCreate" methodvalue="org.netbeans.modules.java.ui.FmtCodeGeneration.getController"/>
222	<attr name="position" intvalue="700"/>	221	<attr name="position" intvalue="900"/>
223	</file>	222	</file>
224	-->
225	</folder>	223	</folder>
226	</folder>	224	</folder>
227	</folder>	225	</folder>

Lines 1503-1509 Link Here

(-)a/java.source/src/org/netbeans/modules/java/source/save/CasualDiff.java (-3 / +4 lines)
1503	return bounds[1];	1503	return bounds[1];
1504	}	1504	}
1505		1505
1506	protected int diffAssign(JCAssign oldT, JCAssign newT, int[] bounds) {	1506	protected int diffAssign(JCAssign oldT, JCAssign newT, JCTree parent, int[] bounds) {
1507	int localPointer = bounds[0];	1507	int localPointer = bounds[0];
1508	// lhs	1508	// lhs
1509	int[] lhsBounds = getBounds(oldT.lhs);	1509	int[] lhsBounds = getBounds(oldT.lhs);
Lines 1518-1524 Link Here
1518	tokenSequence.move(rhsBounds[0]);	1518	tokenSequence.move(rhsBounds[0]);
1519	moveToSrcRelevant(tokenSequence, Direction.BACKWARD);	1519	moveToSrcRelevant(tokenSequence, Direction.BACKWARD);
1520	if (tokenSequence.token().id() != JavaTokenId.EQ) {	1520	if (tokenSequence.token().id() != JavaTokenId.EQ) {
1521	if (diffContext.style.spaceAroundAssignOps())	1521	boolean spaceAroundAssignOps = parent.getKind() == Kind.ANNOTATION ? diffContext.style.spaceAroundAnnotationValueAssignOps() : diffContext.style.spaceAroundAssignOps();
		1522	if (spaceAroundAssignOps)
1522	printer.print(" = ");	1523	printer.print(" = ");
1523	else	1524	else
1524	printer.print("=");	1525	printer.print("=");
Lines 3307-3313 Link Here
3307	retVal = diffParens((JCParens)oldT, (JCParens)newT, elementBounds);	3308	retVal = diffParens((JCParens)oldT, (JCParens)newT, elementBounds);
3308	break;	3309	break;
3309	case JCTree.ASSIGN:	3310	case JCTree.ASSIGN:
3310	retVal = diffAssign((JCAssign)oldT, (JCAssign)newT, elementBounds);	3311	retVal = diffAssign((JCAssign)oldT, (JCAssign)newT, parent, elementBounds);
3311	break;	3312	break;
3312	case JCTree.TYPECAST:	3313	case JCTree.TYPECAST:
3313	retVal = diffTypeCast((JCTypeCast)oldT, (JCTypeCast)newT, elementBounds);	3314	retVal = diffTypeCast((JCTypeCast)oldT, (JCTypeCast)newT, elementBounds);

Lines 64-69 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/Bundle.properties (-22 / +54 lines)
64	LBL_wrp_WRAP_IF_LONG=If Long	64	LBL_wrp_WRAP_IF_LONG=If Long
65	LBL_wrp_WRAP_NEVER=Never	65	LBL_wrp_WRAP_NEVER=Never
66		66
		67	LBL_ip_CARET_LOCATION=Caret Location
		68	LBL_ip_FIRST_IN_CATEGORY=First In Category
		69	LBL_ip_LAST_IN_CATEGORY=Last In Category
		70
67	LBL_ExpandTabToSpaces=&Expand Tab to Spaces	71	LBL_ExpandTabToSpaces=&Expand Tab to Spaces
68	LBL_TabSize=&Tab Size:	72	LBL_TabSize=&Tab Size:
69	LBL_IndentSize=&Indentation Size:	73	LBL_IndentSize=&Indentation Size:
Lines 74-104 Link Here
74	LBL_AddLeadingStarInComment=A&dd Leading Star In Comment	78	LBL_AddLeadingStarInComment=A&dd Leading Star In Comment
75	LBL_RightMargin=&Right Margin:	79	LBL_RightMargin=&Right Margin:
76		80
77	LBL_Naming=Naming\:	81	LBL_gen_Naming=Naming Conventions\:
78	LBL_PreferLongerNames=Prefer Longer Names	82	LBL_gen_PreferLongerNames=Prefer Longer Names
79	LBL_Prefix=Prefix	83	LBL_gen_UseIsForBooleanGetters=Use Is For Boolean Getters
80	LBL_Suffix=Suffix	84	LBL_gen_Prefix=Prefix
81	LBL_Field=Field\:	85	LBL_gen_Suffix=Suffix
82	LBL_StaticField=Static Field\:	86	LBL_gen_Field=Field\:
83	LBL_Parameter=Parameter\:	87	LBL_gen_StaticField=Static Field\:
84	LBL_LocalVariable=Local Variable\:	88	LBL_gen_Parameter=Parameter\:
85	LBL_Misc=Misc\:	89	LBL_gen_LocalVariable=Local Variable\:
86	LBL_QualifyFieldAccess=Qualify Field Access	90	LBL_gen_Other=Other\:
87	LBL_UseIsForBooleanGetters=Use Is For Boolean Getters	91	LBL_gen_QualifyFieldAccess=Qualify Field Access
88	LBL_AddOverrideAnnotation=Add Override Annotation	92	LBL_gen_AddOverrideAnnotation=Add Override Annotation
89	LBL_FinalMofier=Final Modifier\:	93	LBL_gen_ParametersFinal=Make Generated Parameters Final
90	LBL_ParametersFinal=Make Generated Parameters Final	94	LBL_gen_LocalVariablesFinal=Make Generated Local variables Final
91	LBL_LocalVariablesFinal=Make Generated Local variables Final	95	LBL_gen_MembersOreder=Members Sort Order\:
92	LBL_ImportOredering=Import Ordering\:	96	LBL_gen_MembersOrederUp=Move Up
93	LBL_ImportUp=Move Up	97	LBL_gen_MembersOrederDown=Move Down
94	LBL_ImportDown=Move Down	98	LBL_gen_SortByVisibility=Sort Members By Visibility
		99	LBL_gen_InsertionPoint=Insertion Point\:
		100
		101	VAL_gen_STATIC=Static
		102	VAL_gen_CLASS=Classes
		103	VAL_gen_CONSTRUCTOR=Constructors
		104	VAL_gen_FIELD=Fields
		105	VAL_gen_INSTANCE_INIT=Instance Initializers
		106	VAL_gen_METHOD=Methods
		107	VAL_gen_STATIC_INIT=Static Initializers
		108
		109	VAL_gen_PUBLIC=Public
		110	VAL_gen_PRIVATE=Private
		111	VAL_gen_PROTECTED=Protected
		112	VAL_gen_DEFAULT=Default
		113
95	LBL_blBeforePackage=Before &Package\:	114	LBL_blBeforePackage=Before &Package\:
96	LBL_blAfterPackage=After P&ackage\:	115	LBL_blAfterPackage=After Packa&ge\:
97	LBL_blBeforeImports=Before &Imports\:	116	LBL_blBeforeImports=Before &Imports\:
98	LBL_blAfterImports=After Imports\:	117	LBL_blAfterImports=After Imports\:
99	LBL_blBeforeClass=Before &Class\:	118	LBL_blBeforeClass=Before &Class\:
100	LBL_blAfterClass=After C&lass\:	119	LBL_blAfterClass=After C&lass\:
101	LBL_blAfterClassHeader=After Class &Header\:	120	LBL_blAfterClassHeader=After Class &Header\:
		121	LBL_blAfterAnonymousClassHeader=After &Anonymous Class Header:
102	LBL_blBeforeFields=Before &Field\:	122	LBL_blBeforeFields=Before &Field\:
103	LBL_blAfterFields=After Fi&eld\:	123	LBL_blAfterFields=After Fi&eld\:
104	LBL_blBeforeMethods=Before &Method\:	124	LBL_blBeforeMethods=Before &Method\:
Lines 127-132 Link Here
127	LBL_spaceAroundBinaryOps=Binary Operators	147	LBL_spaceAroundBinaryOps=Binary Operators
128	LBL_spaceAroundTernaryOps=Ternary Operators	148	LBL_spaceAroundTernaryOps=Ternary Operators
129	LBL_spaceAroundAssignOps=Assignment Operators	149	LBL_spaceAroundAssignOps=Assignment Operators
		150	LBL_spaceAroundAnnotationValueAssignOps=Annotation Value Assignment Operator
130		151
131	LBL_BeforeLeftBraces=Before Left Braces	152	LBL_BeforeLeftBraces=Before Left Braces
132	LBL_spaceBeforeClassDeclLeftBrace=Class Declaration	153	LBL_spaceBeforeClassDeclLeftBrace=Class Declaration
Lines 168-173 Link Here
168	LBL_spaceBeforeColon=Before Colon	189	LBL_spaceBeforeColon=Before Colon
169	LBL_spaceAfterColon=After Colon	190	LBL_spaceAfterColon=After Colon
170	LBL_spaceAfterTypeCast=After Type Cast	191	LBL_spaceAfterTypeCast=After Type Cast
		192
171	LBL_wrp_extendsImplementsKeyword=&Extends/Implements Keyword\:	193	LBL_wrp_extendsImplementsKeyword=&Extends/Implements Keyword\:
172	LBL_wrp_extendsImplementsList=E&xtends/Implements List\:	194	LBL_wrp_extendsImplementsList=E&xtends/Implements List\:
173	LBL_wrp_methodParameters=Method &Parameters\:	195	LBL_wrp_methodParameters=Method &Parameters\:
Lines 176-181 Link Here
176	LBL_wrp_methodCallArgs=Method Call Arguments\:	198	LBL_wrp_methodCallArgs=Method Call Arguments\:
177	LBL_wrp_annotationArgs=Annotation Arg&uments\:	199	LBL_wrp_annotationArgs=Annotation Arg&uments\:
178	LBL_wrp_chainedMethodCalls=C&hained Method Calls\:	200	LBL_wrp_chainedMethodCalls=C&hained Method Calls\:
		201	LBL_wrp_afeterDot=Wrap After Dot In Chained Method Call
179	LBL_wrp_arrayInit=Array Initiali&zer\:	202	LBL_wrp_arrayInit=Array Initiali&zer\:
180	LBL_wrp_tryResources=Try Re&sources\:	203	LBL_wrp_tryResources=Try Re&sources\:
181	LBL_wrp_multiCatches=Dis&junctive Catch Types\:	204	LBL_wrp_multiCatches=Dis&junctive Catch Types\:
Lines 228-233 Link Here
228		251
229	LBL_Comments=Comments	252	LBL_Comments=Comments
230	LBL_doc_enableCommentFormat=Enable Comments Formatting	253	LBL_doc_enableCommentFormat=Enable Comments Formatting
		254	LBL_doc_enableBlockCommentFormat=Format Block Comments
231	LBL_doc_generalLabel=General	255	LBL_doc_generalLabel=General
232	LBL_doc_addLeadingStar=Add Leading Star	256	LBL_doc_addLeadingStar=Add Leading Star
233	LBL_doc_wrapCommentText=Wrap Text At Right Margin	257	LBL_doc_wrapCommentText=Wrap Text At Right Margin
Lines 355-361 Link Here
355	if (number==13 && object instanceof Runnable )\	379	if (number==13 && object instanceof Runnable )\
356	method( "Some text", 12, new Object());\	380	method( "Some text", 12, new Object());\
357	for( int i = 1; i < 100; i++ )\	381	for( int i = 1; i < 100; i++ )\
358	System.out.println(i);\	382	System.out.print(i);\
359	while ( this.number < 2 && number != 3 )\	383	while ( this.number < 2 && number != 3 )\
360	this.number++;\	384	this.number++;\
361	do \	385	do \
Lines 380-385 Link Here
380	public ClassA() {\	404	public ClassA() {\
381	}\	405	}\
382	public void methodA() {\	406	public void methodA() {\
		407	new Runnable() {\
		408	public void run() {\
		409	}\
		410	};\
383	}\	411	}\
384	public void methodB() {\	412	public void methodB() {\
385	}\	413	}\
Lines 463-468 Link Here
463	}\	491	}\
464	}	492	}
465		493
		494	SAMPLE_CodeGen=public class ClassA {\
		495	\
		496	private String name;\
		497	}
		498
466	nlFinallyCheckBox1.text="finall&y"	499	nlFinallyCheckBox1.text="finall&y"
467		500
468	AN_Preview=Preview	501	AN_Preview=Preview
Lines 472-476 Link Here
472	FmtTabsIndents.indentCasesFromSwitchCheckBox.AccessibleContext.accessibleDescription=Additional indent for case statements	505	FmtTabsIndents.indentCasesFromSwitchCheckBox.AccessibleContext.accessibleDescription=Additional indent for case statements
473	FmtTabsIndents.indentTopLevelClassMembersCheckBox.AccessibleContext.accessibleDescription=Indent for top-level class members	506	FmtTabsIndents.indentTopLevelClassMembersCheckBox.AccessibleContext.accessibleDescription=Indent for top-level class members
474	FmtTabsIndents.continuationIndentSizeField.AccessibleContext.accessibleDescription=Indent size in spaces	507	FmtTabsIndents.continuationIndentSizeField.AccessibleContext.accessibleDescription=Indent size in spaces
475	FmtTabsIndents.labelIndentField.AccessibleContext.accessibleDescription=Label indentation size in spaces	508	FmtTabsIndents.labelIndentField.AccessibleContext.accessibleDescription=Label indentation size in spaces
476	LBL_doc_enableBlockCommentFormat=Format Block Comments

Lines 10-15 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/FmtBlankLines.form (-21 / +43 lines)
10	<AuxValues>	10	<AuxValues>
11	<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>	11	<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
12	<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>	12	<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
		13	<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
13	<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>	14	<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
14	<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>	15	<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
15	<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>	16	<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
Lines 32-54 Link Here
32	<Component id="aClassHeaderLabel" alignment="0" min="-2" max="-2" attributes="0"/>	33	<Component id="aClassHeaderLabel" alignment="0" min="-2" max="-2" attributes="0"/>
33	<Component id="bFieldsLabel" alignment="0" min="-2" max="-2" attributes="0"/>	34	<Component id="bFieldsLabel" alignment="0" min="-2" max="-2" attributes="0"/>
34	<Component id="aFieldsLabel" alignment="0" min="-2" max="-2" attributes="0"/>	35	<Component id="aFieldsLabel" alignment="0" min="-2" max="-2" attributes="0"/>
		36	<Component id="anAnonymousClassHeaderLabel" alignment="0" min="-2" max="-2" attributes="0"/>
35	<Component id="bMethodsLabel" alignment="0" min="-2" max="-2" attributes="0"/>	37	<Component id="bMethodsLabel" alignment="0" min="-2" max="-2" attributes="0"/>
36	<Component id="aMethodsLabel" alignment="0" min="-2" max="-2" attributes="0"/>	38	<Component id="aMethodsLabel" alignment="0" min="-2" max="-2" attributes="0"/>
37	</Group>	39	</Group>
38	<EmptySpace min="-2" pref="6" max="-2" attributes="0"/>	40	<EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
39	<Group type="103" groupAlignment="0" attributes="0">	41	<Group type="103" groupAlignment="0" max="-2" attributes="0">
40	<Component id="aMethodsField" linkSize="1" alignment="0" min="-2" max="-2" attributes="0"/>	42	<Component id="aImportsField" alignment="0" pref="0" max="32767" attributes="0"/>
41	<Component id="bMethodsField" linkSize="1" alignment="0" min="-2" max="-2" attributes="0"/>	43	<Component id="bImportsField" alignment="0" pref="0" max="32767" attributes="0"/>
42	<Component id="aFieldsField" linkSize="1" alignment="0" min="-2" max="-2" attributes="0"/>	44	<Component id="aPackageField" alignment="0" pref="0" max="32767" attributes="0"/>
43	<Component id="bFieldsField" linkSize="1" alignment="0" min="-2" max="-2" attributes="0"/>	45	<Component id="bPackageField" alignment="0" max="32767" attributes="0"/>
44	<Component id="aClassHeaderField" linkSize="1" alignment="0" min="-2" max="-2" attributes="0"/>	46	<Component id="aFieldsField" alignment="0" pref="0" max="32767" attributes="0"/>
45	<Component id="aClassField" linkSize="1" alignment="0" min="-2" max="-2" attributes="0"/>	47	<Component id="bFieldsField" alignment="0" pref="0" max="32767" attributes="0"/>
46	<Component id="bClassField" linkSize="1" alignment="0" min="-2" max="-2" attributes="0"/>	48	<Component id="anAnonymousClassHeaderField" alignment="0" max="32767" attributes="0"/>
47	<Component id="aImportsField" linkSize="1" alignment="0" min="-2" max="-2" attributes="0"/>	49	<Component id="aClassHeaderField" alignment="0" pref="0" max="32767" attributes="0"/>
48	<Component id="bImportsField" linkSize="1" alignment="0" min="-2" max="-2" attributes="0"/>	50	<Component id="aClassField" alignment="0" pref="0" max="32767" attributes="0"/>
49	<Component id="aPackageField" linkSize="1" alignment="0" min="-2" max="-2" attributes="0"/>	51	<Component id="bClassField" alignment="0" pref="0" max="32767" attributes="0"/>
50	<Component id="bPackageField" linkSize="1" alignment="0" min="-2" max="-2" attributes="0"/>	52	<Component id="bMethodsField" alignment="0" pref="0" max="32767" attributes="0"/>
		53	<Component id="aMethodsField" pref="0" max="32767" attributes="0"/>
51	</Group>	54	</Group>
		55	<EmptySpace max="32767" attributes="0"/>
52	</Group>	56	</Group>
53	</Group>	57	</Group>
54	</DimensionLayout>	58	</DimensionLayout>
Lines 89-114 Link Here
89	<Component id="aClassHeaderField" linkSize="2" alignment="3" min="-2" max="-2" attributes="0"/>	93	<Component id="aClassHeaderField" linkSize="2" alignment="3" min="-2" max="-2" attributes="0"/>
90	<Component id="aClassHeaderLabel" alignment="3" min="-2" max="-2" attributes="0"/>	94	<Component id="aClassHeaderLabel" alignment="3" min="-2" max="-2" attributes="0"/>
91	</Group>	95	</Group>
92	<EmptySpace min="4" pref="4" max="4" attributes="0"/>	96	<EmptySpace max="-2" attributes="0"/>
93	<Group type="103" groupAlignment="3" attributes="0">	97	<Group type="103" groupAlignment="3" attributes="0">
		98	<Component id="anAnonymousClassHeaderLabel" alignment="3" min="-2" max="-2" attributes="0"/>
		99	<Component id="anAnonymousClassHeaderField" alignment="3" min="-2" max="-2" attributes="0"/>
		100	</Group>
		101	<EmptySpace max="-2" attributes="0"/>
		102	<Group type="103" groupAlignment="3" attributes="0">
		103	<Component id="bFieldsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
94	<Component id="bFieldsField" linkSize="2" alignment="3" min="-2" max="-2" attributes="0"/>	104	<Component id="bFieldsField" linkSize="2" alignment="3" min="-2" max="-2" attributes="0"/>
95	<Component id="bFieldsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
96	</Group>	105	</Group>
97	<EmptySpace min="4" pref="4" max="4" attributes="0"/>	106	<EmptySpace max="-2" attributes="0"/>
98	<Group type="103" groupAlignment="3" attributes="0">	107	<Group type="103" groupAlignment="3" attributes="0">
		108	<Component id="aFieldsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
99	<Component id="aFieldsField" linkSize="2" alignment="3" min="-2" max="-2" attributes="0"/>	109	<Component id="aFieldsField" linkSize="2" alignment="3" min="-2" max="-2" attributes="0"/>
100	<Component id="aFieldsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
101	</Group>	110	</Group>
102	<EmptySpace min="4" pref="4" max="4" attributes="0"/>	111	<EmptySpace max="-2" attributes="0"/>
103	<Group type="103" groupAlignment="3" attributes="0">	112	<Group type="103" groupAlignment="3" attributes="0">
		113	<Component id="bMethodsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
104	<Component id="bMethodsField" linkSize="2" alignment="3" min="-2" max="-2" attributes="0"/>	114	<Component id="bMethodsField" linkSize="2" alignment="3" min="-2" max="-2" attributes="0"/>
105	<Component id="bMethodsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
106	</Group>	115	</Group>
107	<EmptySpace min="4" pref="4" max="4" attributes="0"/>	116	<EmptySpace max="-2" attributes="0"/>
108	<Group type="103" groupAlignment="3" attributes="0">	117	<Group type="103" groupAlignment="3" attributes="0">
		118	<Component id="aMethodsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
109	<Component id="aMethodsField" linkSize="2" alignment="3" min="-2" max="-2" attributes="0"/>	119	<Component id="aMethodsField" linkSize="2" alignment="3" min="-2" max="-2" attributes="0"/>
110	<Component id="aMethodsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
111	</Group>	120	</Group>
		121	<EmptySpace max="32767" attributes="0"/>
112	</Group>	122	</Group>
113	</Group>	123	</Group>
114	</DimensionLayout>	124	</DimensionLayout>
Lines 126-132 Link Here
126	</Component>	136	</Component>
127	<Component class="javax.swing.JTextField" name="bPackageField">	137	<Component class="javax.swing.JTextField" name="bPackageField">
128	<Properties>	138	<Properties>
129	<Property name="columns" type="int" value="5"/>	139	<Property name="columns" type="int" value="2"/>
130	</Properties>	140	</Properties>
131	</Component>	141	</Component>
132	<Component class="javax.swing.JLabel" name="aPackageLabel">	142	<Component class="javax.swing.JLabel" name="aPackageLabel">
Lines 219-224 Link Here
219	<Property name="columns" type="int" value="5"/>	229	<Property name="columns" type="int" value="5"/>
220	</Properties>	230	</Properties>
221	</Component>	231	</Component>
		232	<Component class="javax.swing.JLabel" name="anAnonymousClassHeaderLabel">
		233	<Properties>
		234	<Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
		235	<ComponentRef name="anAnonymousClassHeaderField"/>
		236	</Property>
		237	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
		238	<ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_blAfterAnonymousClassHeader" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
		239	</Property>
		240	</Properties>
		241	</Component>
		242	<Component class="javax.swing.JTextField" name="anAnonymousClassHeaderField">
		243	</Component>
222	<Component class="javax.swing.JLabel" name="bFieldsLabel">	244	<Component class="javax.swing.JLabel" name="bFieldsLabel">
223	<Properties>	245	<Properties>
224	<Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">	246	<Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">

Lines 1-4 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/FmtWrapping.form (-1 / +22 lines)
1	<?xml version="1.1" encoding="UTF-8" ?>	1	<?xml version="1.0" encoding="UTF-8" ?>
2		2
3	<Form version="1.4" maxVersion="1.4" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">	3	<Form version="1.4" maxVersion="1.4" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
4	<Properties>	4	<Properties>
Lines 241-246 Link Here
241	</Constraint>	241	</Constraint>
242	</Constraints>	242	</Constraints>
243	</Component>	243	</Component>
		244	<Component class="javax.swing.JCheckBox" name="afterDotCheckBox">
		245	<Properties>
		246	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
		247	<ResourceString bundle="org/netbeans/modules/java/ui/Bundle.properties" key="LBL_wrp_afeterDot" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
		248	</Property>
		249	<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
		250	<Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
		251	<EmptyBorder bottom="0" left="0" right="0" top="0"/>
		252	</Border>
		253	</Property>
		254	<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
		255	<Insets value="[0, 0, 0, 0]"/>
		256	</Property>
		257	<Property name="opaque" type="boolean" value="false"/>
		258	</Properties>
		259	<Constraints>
		260	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
		261	<GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="8" insetsBottom="6" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
		262	</Constraint>
		263	</Constraints>
		264	</Component>
244	<Component class="javax.swing.JLabel" name="throwsKeywordLabel">	265	<Component class="javax.swing.JLabel" name="throwsKeywordLabel">
245	<Properties>	266	<Properties>
246	<Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">	267	<Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">

Lines 77-82 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/FmtWrapping.java (-1 / +15 lines)
77	annotationArgsCombo.addFocusListener(this);	77	annotationArgsCombo.addFocusListener(this);
78	chainedMethodCallsCombo.putClientProperty(OPTION_ID, wrapChainedMethodCalls);	78	chainedMethodCallsCombo.putClientProperty(OPTION_ID, wrapChainedMethodCalls);
79	chainedMethodCallsCombo.addFocusListener(this);	79	chainedMethodCallsCombo.addFocusListener(this);
		80	afterDotCheckBox.putClientProperty(OPTION_ID, wrapAfterDotInChainedMethodCalls);
		81	afterDotCheckBox.addFocusListener(this);
80	throwsKeywordCombo.putClientProperty(OPTION_ID, wrapThrowsKeyword);	82	throwsKeywordCombo.putClientProperty(OPTION_ID, wrapThrowsKeyword);
81	throwsKeywordCombo.addFocusListener(this);	83	throwsKeywordCombo.addFocusListener(this);
82	throwsListCombo.putClientProperty(OPTION_ID, wrapThrowsList);	84	throwsListCombo.putClientProperty(OPTION_ID, wrapThrowsList);
Lines 118-124 Link Here
118	public static PreferencesCustomizer.Factory getController() {	120	public static PreferencesCustomizer.Factory getController() {
119	return new CategorySupport.Factory("wrapping", FmtWrapping.class, //NOI18N	121	return new CategorySupport.Factory("wrapping", FmtWrapping.class, //NOI18N
120	org.openide.util.NbBundle.getMessage(FmtWrapping.class, "SAMPLE_Wrapping"), //NOI18N	122	org.openide.util.NbBundle.getMessage(FmtWrapping.class, "SAMPLE_Wrapping"), //NOI18N
121	new String[] { FmtOptions.rightMargin, "30" }, //NOI18N	123	new String[] { FmtOptions.rightMargin, "35" }, //NOI18N
122	new String[] { FmtOptions.redundantDoWhileBraces, CodeStyle.BracesGenerationStyle.LEAVE_ALONE.name() },	124	new String[] { FmtOptions.redundantDoWhileBraces, CodeStyle.BracesGenerationStyle.LEAVE_ALONE.name() },
123	new String[] { FmtOptions.redundantForBraces, CodeStyle.BracesGenerationStyle.LEAVE_ALONE.name() },	125	new String[] { FmtOptions.redundantForBraces, CodeStyle.BracesGenerationStyle.LEAVE_ALONE.name() },
124	new String[] { FmtOptions.redundantIfBraces, CodeStyle.BracesGenerationStyle.LEAVE_ALONE.name() },	126	new String[] { FmtOptions.redundantIfBraces, CodeStyle.BracesGenerationStyle.LEAVE_ALONE.name() },
Lines 158-163 Link Here
158	annotationArgsCombo = new javax.swing.JComboBox();	160	annotationArgsCombo = new javax.swing.JComboBox();
159	chainedMethodCallsLabel = new javax.swing.JLabel();	161	chainedMethodCallsLabel = new javax.swing.JLabel();
160	chainedMethodCallsCombo = new javax.swing.JComboBox();	162	chainedMethodCallsCombo = new javax.swing.JComboBox();
		163	afterDotCheckBox = new javax.swing.JCheckBox();
161	throwsKeywordLabel = new javax.swing.JLabel();	164	throwsKeywordLabel = new javax.swing.JLabel();
162	throwsKeywordCombo = new javax.swing.JComboBox();	165	throwsKeywordCombo = new javax.swing.JComboBox();
163	throwsListLabel = new javax.swing.JLabel();	166	throwsListLabel = new javax.swing.JLabel();
Lines 290-295 Link Here
290	gridBagConstraints.insets = new java.awt.Insets(0, 6, 4, 8);	293	gridBagConstraints.insets = new java.awt.Insets(0, 6, 4, 8);
291	panel1.add(chainedMethodCallsCombo, gridBagConstraints);	294	panel1.add(chainedMethodCallsCombo, gridBagConstraints);
292		295
		296	org.openide.awt.Mnemonics.setLocalizedText(afterDotCheckBox, org.openide.util.NbBundle.getMessage(FmtWrapping.class, "LBL_wrp_afeterDot")); // NOI18N
		297	afterDotCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
		298	afterDotCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
		299	afterDotCheckBox.setOpaque(false);
		300	gridBagConstraints = new java.awt.GridBagConstraints();
		301	gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
		302	gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
		303	gridBagConstraints.insets = new java.awt.Insets(2, 8, 6, 0);
		304	panel1.add(afterDotCheckBox, gridBagConstraints);
		305
293	throwsKeywordLabel.setLabelFor(throwsKeywordCombo);	306	throwsKeywordLabel.setLabelFor(throwsKeywordCombo);
294	org.openide.awt.Mnemonics.setLocalizedText(throwsKeywordLabel, org.openide.util.NbBundle.getMessage(FmtWrapping.class, "LBL_wrp_throwsKeyword")); // NOI18N	307	org.openide.awt.Mnemonics.setLocalizedText(throwsKeywordLabel, org.openide.util.NbBundle.getMessage(FmtWrapping.class, "LBL_wrp_throwsKeyword")); // NOI18N
295	gridBagConstraints = new java.awt.GridBagConstraints();	308	gridBagConstraints = new java.awt.GridBagConstraints();
Lines 550-555 Link Here
550		563
551	// Variables declaration - do not modify//GEN-BEGIN:variables	564	// Variables declaration - do not modify//GEN-BEGIN:variables
552	private javax.swing.JCheckBox afterBinaryOpsCheckBox;	565	private javax.swing.JCheckBox afterBinaryOpsCheckBox;
		566	private javax.swing.JCheckBox afterDotCheckBox;
553	private javax.swing.JCheckBox afterTernaryOpsCheckBox;	567	private javax.swing.JCheckBox afterTernaryOpsCheckBox;
554	private javax.swing.JComboBox annotationArgsCombo;	568	private javax.swing.JComboBox annotationArgsCombo;
555	private javax.swing.JLabel annotationArgsLabel;	569	private javax.swing.JLabel annotationArgsLabel;