Attachment #163037 for bug #269050

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




        private WrapAbort checkWrap;
        private boolean fieldGroup;
        private boolean templateEdit;
        private final LinkedList<Diff> diffs = new LinkedList<>();
        private DanglingElseChecker danglingElseChecker = new DanglingElseChecker();
        private CompilationUnitTree root;
        private int startOffset;

        }

        private boolean wrapStatement(CodeStyle.WrapStyle wrapStyle, CodeStyle.BracesGenerationStyle bracesGenerationStyle, int spacesCnt, boolean preserveNewLine, StatementTree tree) {
            Tree.Kind kind = tree.getKind();
            if (kind == Tree.Kind.EMPTY_STATEMENT) {
                scan(tree, null);
                return true;
            }

            if (kind == Tree.Kind.BLOCK || kind == Tree.Kind.TRY || kind == Tree.Kind.SYNCHRONIZED ) {
                if (tree.getKind() == Tree.Kind.BLOCK && bracesGenerationStyle == CodeStyle.BracesGenerationStyle.ELIMINATE) {
                    Iterator<? extends StatementTree> stats = ((BlockTree)tree).getStatements().iterator();
                    if (stats.hasNext()) {
                        StatementTree stat = stats.next();

Return to bug 269050

Lines 454-460 Link Here

(-)a/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java (-4 / +6 lines)
454	private WrapAbort checkWrap;	454	private WrapAbort checkWrap;
455	private boolean fieldGroup;	455	private boolean fieldGroup;
456	private boolean templateEdit;	456	private boolean templateEdit;
457	private LinkedList<Diff> diffs = new LinkedList<Diff>();	457	private final LinkedList<Diff> diffs = new LinkedList<>();
458	private DanglingElseChecker danglingElseChecker = new DanglingElseChecker();	458	private DanglingElseChecker danglingElseChecker = new DanglingElseChecker();
459	private CompilationUnitTree root;	459	private CompilationUnitTree root;
460	private int startOffset;	460	private int startOffset;
Lines 4111-4122 Link Here
4111	}	4111	}
4112		4112
4113	private boolean wrapStatement(CodeStyle.WrapStyle wrapStyle, CodeStyle.BracesGenerationStyle bracesGenerationStyle, int spacesCnt, boolean preserveNewLine, StatementTree tree) {	4113	private boolean wrapStatement(CodeStyle.WrapStyle wrapStyle, CodeStyle.BracesGenerationStyle bracesGenerationStyle, int spacesCnt, boolean preserveNewLine, StatementTree tree) {
4114	if (tree.getKind() == Tree.Kind.EMPTY_STATEMENT) {	4114	Tree.Kind kind = tree.getKind();
		4115	if (kind == Tree.Kind.EMPTY_STATEMENT) {
4115	scan(tree, null);	4116	scan(tree, null);
4116	return true;	4117	return true;
4117	}	4118	}
4118	if (tree.getKind() == Tree.Kind.BLOCK) {	4119
4119	if (bracesGenerationStyle == CodeStyle.BracesGenerationStyle.ELIMINATE) {	4120	if (kind == Tree.Kind.BLOCK \|\| kind == Tree.Kind.TRY \|\| kind == Tree.Kind.SYNCHRONIZED ) {
		4121	if (tree.getKind() == Tree.Kind.BLOCK && bracesGenerationStyle == CodeStyle.BracesGenerationStyle.ELIMINATE) {
4120	Iterator<? extends StatementTree> stats = ((BlockTree)tree).getStatements().iterator();	4122	Iterator<? extends StatementTree> stats = ((BlockTree)tree).getStatements().iterator();
4121	if (stats.hasNext()) {	4123	if (stats.hasNext()) {
4122	StatementTree stat = stats.next();	4124	StatementTree stat = stats.next();