Attachment #123746 for bug #217633

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




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

import java.beans.PropertyChangeListener;
import java.util.prefs.Preferences;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import javax.swing.text.JTextComponent;
import org.netbeans.api.editor.EditorRegistry;
import org.netbeans.editor.GuardedDocument;
import org.netbeans.modules.editor.indent.api.IndentUtils;
import org.netbeans.modules.editor.indent.spi.CodeStylePreferences;
import org.netbeans.modules.java.preprocessorbridge.api.FmtConstants;
import org.netbeans.modules.java.preprocessorbridge.spi.TalkToEditor;
import org.openide.filesystems.FileObject;
import org.openide.util.lookup.ServiceProvider;

/**
 *
 * @author Jaroslav Tulach <jtulach@netbeans.org>
 */
@ServiceProvider(service=TalkToEditor.class)
public final class TalkToEditorImpl extends TalkToEditor {
    @Override
    protected Preferences implCodePreferences(FileObject file) {
        return CodeStylePreferences.get(file, FmtConstants.JAVA_MIME_TYPE).getPreferences();
    }

    @Override
    protected Preferences implCodePreferences(Document doc) {
        return CodeStylePreferences.get(doc, FmtConstants.JAVA_MIME_TYPE).getPreferences();
    }

    @Override
    protected JTextComponent implLastFocusedComponent() {
        return EditorRegistry.lastFocusedComponent();
    }
    
    @Override
    protected JTextComponent implFocusedComponent() {
        return EditorRegistry.focusedComponent();
    }

    @Override
    protected void implAddRemoveListener(PropertyChangeListener pcl, boolean toAdd) {
        if (toAdd) {
            EditorRegistry.addPropertyChangeListener(pcl);
        } else {
            EditorRegistry.removePropertyChangeListener(pcl);
        }
    }

    @Override
    protected int implOffsetIndent(Document doc, int offset) throws BadLocationException {
        int lineStartOffset = IndentUtils.lineStartOffset(doc, offset);
        return IndentUtils.lineIndent(doc, lineStartOffset);
    }

    @Override
    protected boolean implCheckGuarded(Document doc, int pos, long treePos) {
        if (!(doc instanceof GuardedDocument)) {
            return true;
        }
        pos = ((GuardedDocument) doc).getGuardedBlockChain().adjustToBlockEnd(pos);
        if (treePos < 0 || pos <= treePos) {
            return true;
        }
        return false;
    }
}




# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
#
# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
# Other names may be trademarks of their respective owners.

# your own identifying information:
# "Portions Copyrighted [year] [name of copyright owner]"
#
# Contributor(s):
#
# The Original Software is NetBeans. The Initial Developer of the Original
# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
# Microsystems, Inc. All Rights Reserved.
#
# If you wish your version of this file to be governed by only the CDDL
# or only the GPL Version 2, indicate your decision by adding
# "[Contributor] elects to include this software in this distribution

# However, if you add GPL Version 2 code and therefore, elected the GPL
# Version 2 license, then the option applies only if the new code is
# made subject to such option by the copyright holder.
#
# Contributor(s):
#
# Portions Copyrighted 2012 Sun Microsystems, Inc.

FmtTabsIndents.continuationIndentSizeField.AccessibleContext.accessibleDescription=Indent size in spaces

LBL_TabsAndIndents=Tabs and Indents
LBL_CodeGeneration=Code Generation
LBL_Alignment=Alignment
LBL_Braces=Braces
LBL_Wrapping=Wrapping
LBL_BlankLines=Blank Lines
LBL_Spaces=Spaces
LBL_Imports=Imports

LBL_bp_SAME_LINE=Same Line
LBL_bp_NEW_LINE=New Line
LBL_bp_NEW_LINE_HALF_INDENTED=New Line Half Indented
LBL_bp_NEW_LINE_INDENTED= New Line Indented
    
LBL_bg_GENERATE=Generate
LBL_bg_LEAVE_ALONE=Leave Alone
LBL_bg_ELIMINATE=Eliminate
       
LBL_wrp_WRAP_ALWAYS=Always
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_ContinuationIndentSize=&Continuation Indentation Size:
LBL_LabelIndent=&Label Indentation\:
LBL_AbsoluteLabelIndent=&Absolute Label Indentation
LBL_IndentTopLevelClassMemberts=&Indent Top Level Class Members
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_blAfterMethods=After Me&thod\:

LBL_BeforeKeywords=Before Keywords
LBL_spaceBeforeWhile="while"
LBL_spaceBeforeElse="else"
LBL_spaceBeforeCatch="catch"
LBL_spaceBeforeFinally="finally"

LBL_BeforeParentheses=Before Parentheses
LBL_spaceBeforeMethodDeclParen=Method Declaration
LBL_spaceBeforeMethodCallParen=Method Call
LBL_spaceBeforeIfParen="if"
LBL_spaceBeforeForParen="for"
LBL_spaceBeforeWhileParen="while"
LBL_spaceBeforeTryParen="try"
LBL_spaceBeforeCatchParen="catch"
LBL_spaceBeforeSwitchParen="switch"
LBL_spaceBeforeSynchronizedParen="synchronized"
LBL_spaceBeforeAnnotationParen=Annotation Parameters

LBL_AroundOperators=Around Operators
LBL_spaceAroundUnaryOps=Unary Operators
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_spaceBeforeMethodDeclLeftBrace=Method Declaration
LBL_spaceBeforeIfLeftBrace="if"
LBL_spaceBeforeElseLeftBrace="else"
LBL_spaceBeforeWhileLeftBrace="while"
LBL_spaceBeforeForLeftBrace="for"
LBL_spaceBeforeDoLeftBrace="do"
LBL_spaceBeforeSwitchLeftBrace="switch"
LBL_spaceBeforeTryLeftBrace="try"
LBL_spaceBeforeCatchLeftBrace="catch"
LBL_spaceBeforeFinallyLeftBrace="finally"
LBL_spaceBeforeSynchronizedLeftBrace="synchronized"
LBL_spaceBeforeStaticInitLeftBrace=Static Initializer
LBL_spaceBeforeArrayInitLeftBrace=Array Initializer

LBL_WithinParentheses=Within Parentheses
LBL_spaceWithinParens=Parentheses
LBL_spaceWithinMethodDeclParens=Method Declaration
LBL_spaceWithinMethodCallParens=Method Call
LBL_spaceWithinIfParens="if"
LBL_spaceWithinForParens="for"
LBL_spaceWithinWhileParens="while"
LBL_spaceWithinSwitchParens="switch"
LBL_spaceWithinTryParens="try"
LBL_spaceWithinCatchParens="catch"
LBL_spaceWithinSynchronizedParens="synchronized"
LBL_spaceWithinTypeCastParens=Type Cast
LBL_spaceWithinAnnotationParens=Annotation
LBL_spaceWithinBraces=Braces
LBL_spaceWithinArrayInitBrackets=Array Initializer Brackets

LBL_Other=Other
LBL_spaceBeforeComma=Before Comma
LBL_spaceAfterComma=After Comma
LBL_spaceBeforeSemi=Before Semicolon
LBL_spaceAfterSemi=After Semicolon
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_throwsKeyword=&Throws Keyword\:
LBL_wrp_throwsList=Th&rows List\:
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_wrp_for=&For\:
LBL_wrp_forStatement=F&or Statement\:
LBL_wrp_ifStatement=&If Statement\:
LBL_wrp_whileStatement=&While Statement\:
LBL_wrp_doWhileStatement=&Do ... While Statement
LBL_wrp_assert=&Assert\:
LBL_wrp_enumConstants=Enum &Constants\:
LBL_wrp_annotations=A&nnotations\:
LBL_wrp_binaryOps=&Binary Operators\:
LBL_wrp_afeterBinaryOps=Wrap After Binary Operators
LBL_wrp_ternaryOps=Ternar&y Operators\:
LBL_wrp_afterTernaryOps=Wrap After Ternary Operators
LBL_wrp_assignOps=Assi&gnment Operators\:

LBL_br_bracesPlacement=Braces Placement
LBL_br_bracesGeneration=Braces Generation
LBL_al_newLines=New Lines
LBL_al_multilineAlignment=Multiline Alignment
LBL_bp_ClassDecl=&Class Declaration\:
LBL_bp_MethodDecl=&Method Declaration\:
LBL_bp_Other=&Other\:
LBL_bp_SpecialElseIf=&Special "else if" Treatment
LBL_bg_If="&if"\:
LBL_bg_For="&for"\:
LBL_bg_While="&while"\:
LBL_bg_DoWhile="&do ... while"\:
LBL_nl_Else="&else"
LBL_nl_While="w&hile"
LBL_nl_Catch="c&atch"
LBL_nl_Finally="finall&y"
LBL_nl_Modifiers=After modifie&rs
LBL_am_MethodParams=Method &Parameters
LBL_am_CallArgs=Method Call Arg&uments
LBL_am_AnnotationArgs=&Annotation Arguments
LBL_an_Implements=I&mplements List
LBL_am_Throws=&Throws List
LBL_am_Paren=Parenthesize&d
LBL_am_BinaryOp=&Binary Operators
LBL_am_TernaryOp=Ter&nary Operators
LBL_am_Assign=Assi&gnment
LBL_am_For=&For
LBL_am_ArrayInit=Array Initiali&zer
LBL_am_TryResources=Try Re&sources
LBL_am_MultiCatch=Dis&junctive Catch Types

LBL_IndentCasesFromSwitch=Indent Case Statements In &Switch

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
LBL_doc_wrapOneLineCheckBox=Wrap One Line Comments
LBL_doc_preserveNewLinesCheckBox=Preserve New Lines
LBL_doc_javadocLabel=Javadoc
LBL_doc_blankLineAfterDescCheckBox=Add Blank Line After Description
LBL_doc_blankLineAfterParamsCheckBox=Add Blank Line After Parameter Descriptions
LBL_doc_blankLineAfterReturnCheckBox=Add Blank Line After Return Tag
LBL_doc_generatePCheckBox=Generate "<p/>" On Blank Lines
LBL_doc_alignParamsCheckBox=Align Parameter Descriptions
LBL_doc_alignReturnCheckBox=Align Return Value Descriptions
LBL_doc_alignExceptionsCheckBox=Align Exception Descriptions

LBL_imp_useSingleClass=Use Single Class Imports
LBL_imp_usePackage=Use Package Imports
LBL_imp_useFQN=Use Fully Qualified Names
LBL_imp_importTreshold=Class Count To Use Star Import
LBL_imp_staticImportTreshold=Members Count To Use Static Star Import
LBL_imp_importInnerClasses=Import Inner Classes
LBL_imp_starImportPackages=Packages To Use Star Import: 
LBL_imp_importLayout=Import Layout:
LBL_imp_separateStaticImports=Separate Static Imports
LBL_imp_add=Add
LBL_imp_remove=Remove
LBL_imp_moveUp=Move Up
LBL_imp_moveDown=Move Down
LBL_imp_separateGroups=Separate Groups
LBL_imp_allOtherImports=<all other imports>
LBL_imp_Package=Package
LBL_imp_WithSub=*
LBL_imp_Static=Static

# Following entries (marked) as samples are used as examples in the formating
# options. It is highly discourage to localize them unless absolutely necessary.

SAMPLE_Default=public class ClassA {\
public int number = 1;\
private String text ="A";\
public ClassA() {\
}\
public void meth(String text, int number) {\
}\
}

SAMPLE_TabsIndents=public class ClassA {\
public int number = 1;\
private String letters[] = new String[]{ "A", "B" };\
public int meth(String text, int number) {\
if ( text == null ) {\
    text = "a";\
}\
else if (text.length() == 0) {\
    text = "empty";\
}\
else {\
    number++;\
}\
label:\
switch(number) {\
case 1\:\
    return meth("text", 22);\
case 2\:\
    return 20;\
default\:\
    return -1;\
}\
} }

SAMPLE_Align=@Anno(paramA="aValue", paramB="bValue")\
public class ClassA implements InterfaceA, InterfaceB {\
private String letters[] = new String[]{"A", "B"};\
public int meth(String text, int number) throws ExceptionA, ExceptionB {\
if ( text != null ) {\
try {\
meth( "Some text", text.length());\
} catch ( Throwable t ) {\
} finally {\
}\
} else {\
text = number == 0 ? "empty" : "nonempty";\
}\
do {\
number =\nnumber + 1;\
} while (number < 2);\
for( int i = 1; i < 100; i++ ) {\
number = (number +\ni) * 2;\
}\
}\
}

SAMPLE_Braces=public class ClassA {\
private String letters[] = new String[]{"A", "B"};\
public int meth(String text, int number) {\
if ( text != null ) {\
try {\
meth( "Some text", text.length());\
} catch ( Throwable t ) {\
} finally {\
}\
} else {\
text = number == 0 ? "empty" : "nonempty";\
}\
do {\
number = number + 1;\
} while (number < 2);\
for( int i = 1; i < 100; i++ ) {\
number = number + i;\
}\
while(number > 0) {\
number--;\
}\
}\
}

SAMPLE_Wrapping=@Anno(paramA="a Value", paramB="bValue")\
@Deprecated \
public class ClassA extends Object implements InterfaceA, InterfaceB, InterfaceC {\
private static final String letters[] = new String[]{ "A", "B", "C", "D" };\
public int number = 1;\
public ClassA() {\
}\
public int method(String text, int number, Object object) throws ExceptionA, ExceptionB {\
assert nuber + text.length() < 20 : "message";\
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 \
method1().method2().method3();\
while ( this.number < 2 && number != 3 );\
return number > 100 ? -1 : -2;\
}\
public enum Where {\
NORTH, EAST, SOUTH, WEST;\
}\
}


SAMPLE_BlankLines=package org.netbeans.samples;\
import java.util.List;\
import java.util.Map;\
\
public class ClassA {\
public int i;\
public int j;\
\
public ClassA() {\
}\
public void methodA() {\
new Runnable() {\
public void run() {\
}\
};\
}\
public void methodB() {\
}\
public class innerClass {\
}\
public static interface innerInterface {\
}\
}

SAMPLE_Spaces=@Anno(paramA="aValue", paramB="bValue")\
public class ClassA {\
public int number = 1;\
private String text ="A";\
static float[] floats = new float[3];\
protected double[] doubles = new double[]{3.67,40,2e-30};\
\
static {\
    floats[0]=12.6f;\
}\
\
public ClassA() {\
}\
public int meth(String text, int number) {\
if (number==13) {\
return (int)System.currentTimeMillis();\
}else {\
}\
\
for( int i = 20; i < 100; i++) {\
    synchronized(this) {\
        while(i%13>5)\
            meth( text + " ", number++);\
    }\
}\
\
for(float f : floats)\
    System.out.println(f);\
\
switch(number) {\
case 1\:\
    do { out( (2+3)*this.number--); } while(this.number > 6);\
    return 10;\
case 2\:\
    try {\
        toString();\
    }\
    catch ( IllegalStateException illegalStateException ) {\
        illegalStateException.printStackTrace();\
    }\
    finally {\
        return 20;\
    }\
default\:\
   return number > 100 ? -1 : -2;\
}\
} }

SAMPLE_Comments=public class ClassA {\n\
/**\n\
This  is  the first part of a  sample  method  description.\n\
The second part is placed after a manual newline.\n\
\n\
The last part is placed after an empty line.\n\
@param text the first parameter description\n\
@param number the second parameter description\n\
@return this is the return value description\n\
@throws ExcepA the first exception description\n\
@throws ExcB the second exception description\n\
*/\n\
public String meth(String text, int number) throws ExceptionA, ExcB {\n\
/*This is one line comment*/\n\
return number > 0 ? text : null;\n\
}\n\
}

SAMPLE_Imports=package org.netbeans.samples;\
\
public class ClassA {\
\
public void method() {\
}\
}

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

nlFinallyCheckBox1.text="finall&y"

AN_Preview=Preview
AD_Preview=Preview
FmtTabsIndents.absoluteLabelIndentCheckBox.AccessibleContext.accessibleDescription=Indent Labels absolutely
FmtTabsIndents.labelIndentField.AccessibleContext.accessibleDescription=Label indentation size in spaces
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




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

import java.awt.Component;
import java.awt.Container;
import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.LinkedList;
import java.util.List;
import java.util.prefs.Preferences;
import javax.swing.ComboBoxModel;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JComboBox;
import javax.swing.JComponent;
import javax.swing.JEditorPane;
import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.JSpinner;
import javax.swing.JTable;
import javax.swing.JTextField;
import javax.swing.JToggleButton;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.event.ListDataEvent;
import javax.swing.event.ListDataListener;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
import org.netbeans.api.editor.settings.SimpleValueNames;
import org.netbeans.api.java.source.CodeStyle;
import org.netbeans.api.java.source.CodeStyle.BracePlacement;
import org.netbeans.api.java.source.CodeStyle.BracesGenerationStyle;
import org.netbeans.api.java.source.CodeStyle.InsertionPoint;
import org.netbeans.api.java.source.CodeStyle.WrapStyle;
import org.netbeans.modules.java.preprocessorbridge.api.FmtConstants;
//XXX: import org.netbeans.modules.java.source.save.Reformatter;
import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
import org.netbeans.modules.options.editor.spi.PreviewProvider;
import org.openide.text.CloneableEditorSupport;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;

// Support section ---------------------------------------------------------

public class CategorySupport implements ActionListener, ChangeListener, ListDataListener, TableModelListener, DocumentListener, PreviewProvider, PreferencesCustomizer {
    public static final String OPTION_ID = "org.netbeans.modules.java.ui.FormatingOptions.ID";
    private static final int LOAD = 0;
    private static final int STORE = 1;
    private static final int ADD_LISTENERS = 2;
    private static final ComboItem[] bracePlacement = new ComboItem[]{new ComboItem(BracePlacement.SAME_LINE.name(), "LBL_bp_SAME_LINE"), new ComboItem(BracePlacement.NEW_LINE.name(), "LBL_bp_NEW_LINE"), new ComboItem(BracePlacement.NEW_LINE_HALF_INDENTED.name(), "LBL_bp_NEW_LINE_HALF_INDENTED"), new ComboItem(BracePlacement.NEW_LINE_INDENTED.name(), "LBL_bp_NEW_LINE_INDENTED")};
    private static final ComboItem[] bracesGeneration = new ComboItem[]{new ComboItem(BracesGenerationStyle.GENERATE.name(), "LBL_bg_GENERATE"), new ComboItem(BracesGenerationStyle.LEAVE_ALONE.name(), "LBL_bg_LEAVE_ALONE"), new ComboItem(BracesGenerationStyle.ELIMINATE.name(), "LBL_bg_ELIMINATE")};
    private static final ComboItem[] wrap = new ComboItem[]{new ComboItem(WrapStyle.WRAP_ALWAYS.name(), "LBL_wrp_WRAP_ALWAYS"), new ComboItem(WrapStyle.WRAP_IF_LONG.name(), "LBL_wrp_WRAP_IF_LONG"), new ComboItem(WrapStyle.WRAP_NEVER.name(), "LBL_wrp_WRAP_NEVER")};
    private static final ComboItem[] insertionPoint = new ComboItem[]{new ComboItem(InsertionPoint.LAST_IN_CATEGORY.name(), "LBL_ip_LAST_IN_CATEGORY"), new ComboItem(InsertionPoint.FIRST_IN_CATEGORY.name(), "LBL_ip_FIRST_IN_CATEGORY"), new ComboItem(InsertionPoint.CARET_LOCATION.name(), "LBL_ip_CARET_LOCATION")};
    protected final String previewText;
    //        private String forcedOptions[][];
    //        private boolean changed = false;
    //        private boolean loaded = false;
    private final String id;
    protected final JPanel panel;
    private final List<JComponent> components = new LinkedList<JComponent>();
    private JEditorPane previewPane;
    protected final Preferences preferences;
    protected final Preferences previewPrefs;

    protected CategorySupport(Preferences preferences, String id, JPanel panel, String previewText, String[]... forcedOptions) {
        this.preferences = preferences;
        this.id = id;
        this.panel = panel;
        this.previewText = previewText != null ? previewText : NbBundle.getMessage(CategorySupport.class, "SAMPLE_Default"); //NOI18N
        // Scan the panel for its components
        scan(panel, components);
        // Initialize the preview preferences
        Preferences forcedPrefs = new PreviewPreferences();
        for (String[] option : forcedOptions) {
            forcedPrefs.put(option[0], option[1]);
        }
        this.previewPrefs = new ProxyPreferences(forcedPrefs, preferences);
        // Load and hook up all the components
        loadFrom(preferences);
        addListeners();
    }

    protected void addListeners() {
        scan(ADD_LISTENERS, null);
    }

    protected void loadFrom(Preferences preferences) {
        //            loaded = true;
        scan(LOAD, preferences);
        //            loaded = false;
    }

    //
    //        public void applyChanges() {
    //            storeTo(preferences);
    //        }
    //
    protected void storeTo(Preferences p) {
        scan(STORE, p);
    }

    protected void notifyChanged() {
        //            if (loaded)
        //                return;
        storeTo(preferences);
        refreshPreview();
    }

    protected void loadListData(final JList list, final String optionID, final Preferences p) {
    }

    protected void storeListData(final JList list, final String optionID, final Preferences node) {
    }

    protected void loadTableData(final JTable table, final String optionID, final Preferences p) {
    }

    protected void storeTableData(final JTable table, final String optionID, final Preferences node) {
    }

    // ActionListener implementation ---------------------------------------
    public void actionPerformed(ActionEvent e) {
        notifyChanged();
    }

    // ChangeListener implementation ---------------------------------------
    @Override
    public void stateChanged(ChangeEvent e) {
        notifyChanged();
    }

    // ListDataListener implementation -----------------------------------
    @Override
    public void contentsChanged(ListDataEvent e) {
    }

    @Override
    public void intervalAdded(ListDataEvent e) {
        notifyChanged();
    }

    @Override
    public void intervalRemoved(ListDataEvent e) {
    }

    // TableModelListener implementation -----------------------------------
    @Override
    public void tableChanged(TableModelEvent e) {
        notifyChanged();
    }

    // DocumentListener implementation -------------------------------------
    public void insertUpdate(DocumentEvent e) {
        notifyChanged();
    }

    public void removeUpdate(DocumentEvent e) {
        notifyChanged();
    }

    public void changedUpdate(DocumentEvent e) {
        notifyChanged();
    }

    // PreviewProvider methods -----------------------------------------------------
    public JComponent getPreviewComponent() {
        if (previewPane == null) {
            previewPane = new JEditorPane();
            previewPane.getAccessibleContext().setAccessibleName(NbBundle.getMessage(CategorySupport.class, "AN_Preview")); //NOI18N
            previewPane.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(CategorySupport.class, "AD_Preview")); //NOI18N
            previewPane.putClientProperty("HighlightsLayerIncludes", "^org\\.netbeans\\.modules\\.editor\\.lib2\\.highlighting\\.SyntaxHighlighting$"); //NOI18N
            previewPane.setEditorKit(CloneableEditorSupport.getEditorKit("text/x-java"));
            previewPane.setEditable(false);
        }
        return previewPane;
    }

    public void refreshPreview() {
        JEditorPane jep = (JEditorPane) getPreviewComponent();
        try {
            int rm = previewPrefs.getInt(FmtConstants.rightMargin, FmtConstants.getDefaultAsInt(FmtConstants.rightMargin));
            jep.putClientProperty("TextLimitLine", rm); //NOI18N
            jep.getDocument().putProperty(SimpleValueNames.TEXT_LINE_WRAP, ""); //NOI18N
            jep.getDocument().putProperty(SimpleValueNames.TAB_SIZE, ""); //NOI18N
            jep.getDocument().putProperty(SimpleValueNames.TEXT_LIMIT_WIDTH, ""); //NOI18N
        } catch (NumberFormatException e) {
            // Ignore it
        }
        try {
            Class.forName(CodeStyle.class.getName(), true, CodeStyle.class.getClassLoader());
        } catch (ClassNotFoundException cnfe) {
            // ignore
        }
        
        /** XXX: Another reference to Reformatter:
        CodeStyle codeStyle = FmtConstants.codeStyleProducer.create(previewPrefs);
        jep.setIgnoreRepaint(true);
        jep.setText(Reformatter.reformat(previewText, codeStyle));
        */
        jep.setIgnoreRepaint(false);
        jep.scrollRectToVisible(new Rectangle(0, 0, 10, 10));
        jep.repaint(100);
    }

    // PreferencesCustomizer implementation --------------------------------
    public JComponent getComponent() {
        return panel;
    }

    public String getDisplayName() {
        return panel.getName();
    }

    public String getId() {
        return id;
    }

    public HelpCtx getHelpCtx() {
        return null;
    }

    // PreferencesCustomizer.Factory implementation ------------------------
    public static final class Factory implements PreferencesCustomizer.Factory {

        private final String id;
        private final Class<? extends JPanel> panelClass;
        private final String previewText;
        private final String[][] forcedOptions;

        public Factory(String id, Class<? extends JPanel> panelClass, String previewText, String[]... forcedOptions) {
            this.id = id;
            this.panelClass = panelClass;
            this.previewText = previewText;
            this.forcedOptions = forcedOptions;
        }

        public PreferencesCustomizer create(Preferences preferences) {
            try {
                CategorySupport categorySupport = new CategorySupport(preferences, id, panelClass.newInstance(), previewText, forcedOptions);
                if (categorySupport.panel instanceof Runnable) {
                    ((Runnable) categorySupport.panel).run();
                }
                return categorySupport;
            } catch (Exception e) {
                return null;
            }
        }
    } // End of CategorySupport.Factory class

    // Private methods -----------------------------------------------------
    private void performOperation(int operation, JComponent jc, String optionID, Preferences p) {
        switch (operation) {
            case LOAD:
                loadData(jc, optionID, p);
                break;
            case STORE:
                storeData(jc, optionID, p);
                break;
            case ADD_LISTENERS:
                addListener(jc);
                break;
        }
    }

    private void scan(int what, Preferences p) {
        for (JComponent jc : components) {
            Object o = jc.getClientProperty(OPTION_ID);
            if (o instanceof String) {
                performOperation(what, jc, (String) o, p);
            } else if (o instanceof String[]) {
                for (String oid : (String[]) o) {
                    performOperation(what, jc, oid, p);
                }
            }
        }
    }

    private void scan(Container container, List<JComponent> components) {
        for (Component c : container.getComponents()) {
            if (c instanceof JComponent) {
                JComponent jc = (JComponent) c;
                Object o = jc.getClientProperty(OPTION_ID);
                if (o instanceof String || o instanceof String[]) {
                    components.add(jc);
                }
            }
            if (c instanceof Container) {
                scan((Container) c, components);
            }
        }
    }

    /** Very smart method which tries to set the values in the components correctly
     */
    private void loadData(JComponent jc, String optionID, Preferences node) {
        if (jc instanceof JTextField) {
            JTextField field = (JTextField) jc;
            field.setText(node.get(optionID, FmtConstants.getDefaultAsString(optionID)));
        } else if (jc instanceof JSpinner) {
            JSpinner js = (JSpinner) jc;
            js.setValue(node.getInt(optionID, FmtConstants.getDefaultAsInt(optionID)));
        } else if (jc instanceof JToggleButton) {
            JToggleButton toggle = (JToggleButton) jc;
            boolean df = FmtConstants.getDefaultAsBoolean(optionID);
            toggle.setSelected(node.getBoolean(optionID, df));
        } else if (jc instanceof JComboBox) {
            JComboBox cb = (JComboBox) jc;
            String value = node.get(optionID, FmtConstants.getDefaultAsString(optionID));
            ComboBoxModel model = createModel(value);
            cb.setModel(model);
            ComboItem item = whichItem(value, model);
            cb.setSelectedItem(item);
        } else if (jc instanceof JList) {
            loadListData((JList) jc, optionID, node);
        } else if (jc instanceof JTable) {
            loadTableData((JTable) jc, optionID, node);
        }
    }

    private void storeData(JComponent jc, String optionID, Preferences node) {
        if (jc instanceof JTextField) {
            JTextField field = (JTextField) jc;
            String text = field.getText();
            // XXX test for numbers
            String val = FmtConstants.getDefaultAsString(optionID);
            try {
                Integer.parseInt(val);
                try {
                    int i = Integer.parseInt(text);
                } catch (NumberFormatException e) {
                    return;
                }
            } catch (NumberFormatException ex) {
                // OK, default is not number
            }
            // XXX: watch out, tabSize, spacesPerTab, indentSize and expandTabToSpaces
            // fall back on getGlopalXXX() values and not getDefaultAsXXX value,
            // which is why we must not remove them. Proper solution would be to
            // store formatting preferences to MimeLookup and not use NbPreferences.
            // The problem currently is that MimeLookup based Preferences do not support subnodes.
            if (!optionID.equals(FmtConstants.tabSize) && !optionID.equals(FmtConstants.spacesPerTab) && !optionID.equals(FmtConstants.indentSize) && FmtConstants.getDefaultAsString(optionID).equals(text)) {
                node.remove(optionID);
            } else {
                node.put(optionID, text);
            }
        } else if (jc instanceof JSpinner) {
            JSpinner js = (JSpinner) jc;
            Object value = js.getValue();
            if (FmtConstants.getDefaultAsInt(optionID) == ((Integer) value).intValue()) {
                node.remove(optionID);
            } else {
                node.putInt(optionID, ((Integer) value).intValue());
            }
        } else if (jc instanceof JToggleButton) {
            JToggleButton toggle = (JToggleButton) jc;
            if (!optionID.equals(FmtConstants.expandTabToSpaces) && FmtConstants.getDefaultAsBoolean(optionID) == toggle.isSelected()) {
                node.remove(optionID);
            } else {
                node.putBoolean(optionID, toggle.isSelected());
            }
        } else if (jc instanceof JComboBox) {
            JComboBox cb = (JComboBox) jc;
            // Logger.global.info( cb.getSelectedItem() + " " + optionID);
            String value = ((ComboItem) cb.getSelectedItem()).value;
            if (FmtConstants.getDefaultAsString(optionID).equals(value)) {
                node.remove(optionID);
            } else {
                node.put(optionID, value);
            }
        } else if (jc instanceof JList) {
            storeListData((JList) jc, optionID, node);
        } else if (jc instanceof JTable) {
            storeTableData((JTable) jc, optionID, node);
        }
    }

    private void addListener(JComponent jc) {
        if (jc instanceof JTextField) {
            JTextField field = (JTextField) jc;
            field.addActionListener(this);
            field.getDocument().addDocumentListener(this);
        } else if (jc instanceof JSpinner) {
            JSpinner spinner = (JSpinner) jc;
            spinner.addChangeListener(this);
        } else if (jc instanceof JToggleButton) {
            JToggleButton toggle = (JToggleButton) jc;
            toggle.addActionListener(this);
        } else if (jc instanceof JComboBox) {
            JComboBox cb = (JComboBox) jc;
            cb.addActionListener(this);
        } else if (jc instanceof JList) {
            JList jl = (JList) jc;
            jl.getModel().addListDataListener(this);
        } else if (jc instanceof JTable) {
            JTable jt = (JTable) jc;
            jt.getModel().addTableModelListener(this);
        }
    }

    private ComboBoxModel createModel(String value) {
        // is it braces placement?
        for (ComboItem comboItem : bracePlacement) {
            if (value.equals(comboItem.value)) {
                return new DefaultComboBoxModel(bracePlacement);
            }
        }
        // is it braces generation?
        for (ComboItem comboItem : bracesGeneration) {
            if (value.equals(comboItem.value)) {
                return new DefaultComboBoxModel(bracesGeneration);
            }
        }
        // is it wrap?
        for (ComboItem comboItem : wrap) {
            if (value.equals(comboItem.value)) {
                return new DefaultComboBoxModel(wrap);
            }
        }
        // is it insertion point?
        for (ComboItem comboItem : insertionPoint) {
            if (value.equals(comboItem.value)) {
                return new DefaultComboBoxModel(insertionPoint);
            }
        }
        return null;
    }

    private static ComboItem whichItem(String value, ComboBoxModel model) {
        for (int i = 0; i < model.getSize(); i++) {
            ComboItem item = (ComboItem) model.getElementAt(i);
            if (value.equals(item.value)) {
                return item;
            }
        }
        return null;
    }

    private static class ComboItem {

        String value;
        String displayName;

        public ComboItem(String value, String key) {
            this.value = value;
            this.displayName = NbBundle.getMessage(FmtConstants.class, key);
        }

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

Lines 1-4 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/FmtAlignment.form (-1 / +1 lines)
1	<?xml version="1.1" encoding="UTF-8" ?>	1	<?xml version="1.0" encoding="UTF-8" ?>
2		2
3	<Form version="1.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>




package org.netbeans.modules.java.ui;

import org.netbeans.api.java.source.CodeStyle.WrapStyle;
import static org.netbeans.modules.java.preprocessorbridge.api.FmtConstants.*;
import static org.netbeans.modules.java.ui.CategorySupport.OPTION_ID;
import org.netbeans.modules.java.ui.FmtOptions.CategorySupport;
import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;



    public static PreferencesCustomizer.Factory getController() {
        return new CategorySupport.Factory("alignment", FmtAlignment.class, //NOI18N
                org.openide.util.NbBundle.getMessage(FmtAlignment.class, "SAMPLE_Align"), // NOI18N
                new String[] { wrapArrayInit, WrapStyle.WRAP_ALWAYS.name() },
                new String[] { wrapEnumConstants, WrapStyle.WRAP_ALWAYS.name() },
                new String[] { wrapExtendsImplementsList, WrapStyle.WRAP_ALWAYS.name() },
                new String[] { wrapFor, WrapStyle.WRAP_ALWAYS.name() },
                new String[] { wrapMethodCallArgs, WrapStyle.WRAP_ALWAYS.name() },
                new String[] { wrapAnnotationArgs, WrapStyle.WRAP_ALWAYS.name() },
                new String[] { wrapMethodParams, WrapStyle.WRAP_ALWAYS.name() },
                new String[] { wrapTernaryOps, WrapStyle.WRAP_ALWAYS.name() },
                new String[] { wrapThrowsList, WrapStyle.WRAP_ALWAYS.name() },
                new String[] { blankLinesBeforeClass, "0" });
    }
    
    /** This method is called from within the constructor to

Lines 44-52 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/FmtBlankLines.java (-3 / +2 lines)
44		44
45	package org.netbeans.modules.java.ui;	45	package org.netbeans.modules.java.ui;
46		46
47	import static org.netbeans.modules.java.ui.FmtOptions.*;	47	import static org.netbeans.modules.java.preprocessorbridge.api.FmtConstants.*;
48	import static org.netbeans.modules.java.ui.FmtOptions.CategorySupport.OPTION_ID;	48	import static org.netbeans.modules.java.ui.CategorySupport.OPTION_ID;
49	import org.netbeans.modules.java.ui.FmtOptions.CategorySupport;
50	import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;	49	import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
51		50
52	/**	51	/**




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

          <Group type="102" attributes="0">
              <Group type="103" groupAlignment="0" attributes="0">
                  <Group type="102" alignment="0" attributes="0">
                      <Component id="bracesPlacementLabel" min="-2" max="-2" attributes="0"/>
                      <EmptySpace max="-2" attributes="0"/>
                      <Component id="jSeparator1" pref="103" max="32767" attributes="0"/>
                  </Group>
                  <Group type="102" alignment="0" attributes="0">
                      <Component id="bracesGenerationLabel" min="-2" max="-2" attributes="0"/>
                      <EmptySpace max="-2" attributes="0"/>
                      <Component id="jSeparator2" pref="98" max="32767" attributes="0"/>
                  </Group>
                  <Group type="102" attributes="0">
                      <EmptySpace max="-2" attributes="0"/>
                      <Group type="103" groupAlignment="0" attributes="0">
                          <Group type="102" alignment="0" attributes="0">
                              <Group type="103" groupAlignment="0" attributes="0">
                                  <Component id="doWhileBracesLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                                  <Component id="otherLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                                  <Component id="methodDeclLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                                  <Component id="whileBracesLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                              </Group>
                              <EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
                              <Group type="103" groupAlignment="1" attributes="0">
                                  <Group type="103" groupAlignment="0" attributes="0">
                                      <Component id="otherCombo" linkSize="1" alignment="0" min="-2" max="-2" attributes="1"/>

                                      <Component id="whileBracesCombo" linkSize="1" alignment="1" min="-2" max="-2" attributes="0"/>
                                  </Group>
                                  <Component id="doWhileBracesCombo" linkSize="1" min="-2" max="-2" attributes="0"/>
                                  <Component id="methodDeclCombo" linkSize="1" alignment="1" min="-2" max="-2" attributes="1"/>
                              </Group>
                              <EmptySpace max="-2" attributes="0"/>
                          </Group>
                          <Component id="classDeclLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                          <Component id="specialElseIfCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
                          <Component id="ifBracesLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                          <Component id="forBracesLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                      </Group>
                  </Group>
                  <Group type="102" alignment="0" attributes="0">
                      <Component id="bracesPlacementLabel" min="-2" max="-2" attributes="0"/>
                      <EmptySpace max="-2" attributes="0"/>
                      <Component id="jSeparator1" pref="103" max="32767" attributes="0"/>
                  </Group>
                  <Group type="102" alignment="0" attributes="0">
                      <EmptySpace max="-2" attributes="0"/>
                      <Component id="classDeclLabel" min="-2" max="-2" attributes="0"/>
                  </Group>
                  <Group type="102" alignment="0" attributes="0">
                      <EmptySpace max="-2" attributes="0"/>
                      <Component id="specialElseIfCheckBox" min="-2" max="-2" attributes="0"/>
                  </Group>
                  <Group type="102" alignment="0" attributes="0">
                      <EmptySpace max="-2" attributes="0"/>
                      <Component id="ifBracesLabel" min="-2" max="-2" attributes="0"/>
                  </Group>
                  <Group type="102" alignment="0" attributes="0">
                      <EmptySpace max="-2" attributes="0"/>
                      <Component id="forBracesLabel" min="-2" max="-2" attributes="0"/>
                  </Group>
                  <Group type="102" alignment="0" attributes="0">
                      <Component id="bracesGenerationLabel" min="-2" max="-2" attributes="0"/>
                      <EmptySpace max="-2" attributes="0"/>
                      <Component id="jSeparator2" pref="98" max="32767" attributes="0"/>
                  </Group>
              </Group>
              <EmptySpace max="-2" attributes="0"/>
          </Group>





package org.netbeans.modules.java.ui;

import static org.netbeans.modules.java.ui.CategorySupport.OPTION_ID;
import static org.netbeans.modules.java.preprocessorbridge.api.FmtConstants.*;
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;



    public static PreferencesCustomizer.Factory getController() {
        return new CategorySupport.Factory("braces", FmtBraces.class, //NOI18N
                org.openide.util.NbBundle.getMessage(FmtBraces.class, "SAMPLE_Braces"), // NOI18N
                new String[] { blankLinesBeforeClass, "0" });
    }
    
    /** This method is called from within the constructor to

                                    .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                                        .addComponent(otherCombo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                        .addComponent(classDeclCombo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                        .addComponent(ifBracesCombo, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                        .addComponent(forBracesCombo, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                        .addComponent(whileBracesCombo, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                    .addComponent(doWhileBracesCombo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED))
                            .addComponent(methodDeclCombo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))

                .addContainerGap())
        );

        layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {classDeclCombo, doWhileBracesCombo, forBracesCombo, ifBracesCombo, methodDeclCombo, otherCombo, whileBracesCombo});

        layout.setVerticalGroup(
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)




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.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.WorkingCopy;
import org.netbeans.editor.BaseDocument;
import org.netbeans.modules.editor.indent.api.Reformat;
import static org.netbeans.modules.java.ui.CategorySupport.OPTION_ID;
import static org.netbeans.modules.java.preprocessorbridge.api.FmtConstants.*;
import static org.netbeans.modules.java.ui.FmtOptions.CategorySupport.OPTION_ID;
import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
import org.netbeans.modules.parsing.api.ResultIterator;
import org.netbeans.modules.parsing.api.Source;


        private CodeGenCategorySupport(Preferences preferences, JPanel panel) {
            super(preferences, "code-generation", panel, NbBundle.getMessage(FmtCodeGeneration.class, "SAMPLE_CodeGen"), //NOI18N
                    new String[] { blankLinesBeforeFields, "1" }); //NOI18N
        }
    
        @Override

                // ignore
            }

            // XXX: CodeStyleProducer is not visible
            Object codeStyle = null;
            //final CodeStyle codeStyle = codeStyleProducer.create(previewPrefs);
            jep.setIgnoreRepaint(true);
            try {
                if (source == null) {





package org.netbeans.modules.java.ui;

import static org.netbeans.modules.java.ui.CategorySupport.OPTION_ID;
import static org.netbeans.modules.java.preprocessorbridge.api.FmtConstants.*;
import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;

/**

    public static PreferencesCustomizer.Factory getController() {
        return new CategorySupport.Factory("comments", FmtComments.class, //NOI18N
                org.openide.util.NbBundle.getMessage(FmtComments.class, "SAMPLE_Comments"), // NOI18N
                new String[] { rightMargin, "45" }, //NOI18N
                new String[] { blankLinesBeforeClass, "0" }); //NOI18N
    }    

    @Override

Lines 81-88 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/FmtImports.java (-3 / +5 lines)
81	import org.openide.filesystems.FileObject;	81	import org.openide.filesystems.FileObject;
82	import org.openide.loaders.DataObject;	82	import org.openide.loaders.DataObject;
83	import org.openide.util.NbBundle;	83	import org.openide.util.NbBundle;
84	import static org.netbeans.modules.java.ui.FmtOptions.*;	84	import static org.netbeans.modules.java.ui.CategorySupport.OPTION_ID;
85	import static org.netbeans.modules.java.ui.FmtOptions.CategorySupport.OPTION_ID;	85	import static org.netbeans.modules.java.preprocessorbridge.api.FmtConstants.*;
86	import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;	86	import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
87	import org.netbeans.modules.parsing.api.Source;	87	import org.netbeans.modules.parsing.api.Source;
88	import org.netbeans.modules.parsing.api.UserTask;	88	import org.netbeans.modules.parsing.api.UserTask;
Lines 659-665 Link Here
659	// ignore	659	// ignore
660	}	660	}
661		661
662	final CodeStyle codeStyle = codeStyleProducer.create(previewPrefs);	662	// XXX: CodeStyleProducer is not visible
		663	Object codeStyle = null;
		664	//final CodeStyle codeStyle = codeStyleProducer.create(previewPrefs);
663	jep.setIgnoreRepaint(true);	665	jep.setIgnoreRepaint(true);
664	try {	666	try {
665	if (source == null) {	667	if (source == null) {




import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeCellRenderer;
import javax.swing.tree.TreePath;
import static org.netbeans.modules.java.preprocessorbridge.api.FmtConstants.*;
import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
import org.openide.util.NbBundle;
import static org.netbeans.modules.java.ui.FmtOptions.*;

/**
 *

        
    }
    
    private static final class SpacesCategorySupport extends CategorySupport {

        public SpacesCategorySupport(Preferences preferences, FmtSpaces panel) {
            super(preferences, "spaces", panel, //NOI18N
                  NbBundle.getMessage( FmtSpaces.class ,"SAMPLE_Spaces"), // NOI18N
                  new String[] {placeCatchOnNewLine, Boolean.FALSE.toString()},
                  new String[] {placeElseOnNewLine, Boolean.FALSE.toString()},
                  new String[] {placeWhileOnNewLine, Boolean.FALSE.toString()},
                  new String[] {placeFinallyOnNewLine, Boolean.FALSE.toString()},
                  new String[] {blankLinesBeforeClass, "0" });
            panel.scs = this;
        }


        @Override
        protected void loadFrom(Preferences preferences) {
            for (Item item : getAllItems()) {
                boolean df = getDefaultAsBoolean(item.id);
                item.value = preferences.getBoolean(item.id, df);
            }
        }

        @Override
        protected void storeTo(Preferences preferences) {
            for (Item item : getAllItems()) {
                boolean df = getDefaultAsBoolean(item.id);
                if (df == item.value)
                    preferences.remove(item.id);
                else

Lines 1-4 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/FmtTabsIndents.form (-1 / +1 lines)
1	<?xml version="1.1" encoding="UTF-8" ?>	1	<?xml version="1.0" encoding="UTF-8" ?>
2		2
3	<Form version="1.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>





package org.netbeans.modules.java.ui;

import static org.netbeans.modules.java.ui.CategorySupport.OPTION_ID;
import static org.netbeans.modules.java.preprocessorbridge.api.FmtConstants.*;
import org.netbeans.modules.java.ui.FmtOptions.CategorySupport;
import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;

/**

    public static PreferencesCustomizer.Factory getController() {
        return new CategorySupport.Factory(PreferencesCustomizer.TABS_AND_INDENTS_ID, FmtTabsIndents.class, //NOI18N
                org.openide.util.NbBundle.getMessage(FmtTabsIndents.class, "SAMPLE_TabsIndents"), // NOI18N
                new String[] { blankLinesBeforeClass, "0" }
                );
    }
    

            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(layout.createSequentialGroup()
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                    .addComponent(continuationIndentSizeLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 200, Short.MAX_VALUE)
                    .addComponent(labelIndentLabel))
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)




import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
import org.netbeans.api.java.source.CodeStyle;
import static org.netbeans.modules.java.ui.CategorySupport.OPTION_ID;
import org.netbeans.modules.java.preprocessorbridge.api.FmtConstants;
import static org.netbeans.modules.java.preprocessorbridge.api.FmtConstants.*;
import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;



    public static PreferencesCustomizer.Factory getController() {
        return new CategorySupport.Factory("wrapping", FmtWrapping.class, //NOI18N
                org.openide.util.NbBundle.getMessage(FmtWrapping.class, "SAMPLE_Wrapping"), //NOI18N
                new String[] { FmtConstants.rightMargin, "35" }, //NOI18N
                new String[] { FmtConstants.redundantDoWhileBraces, CodeStyle.BracesGenerationStyle.LEAVE_ALONE.name() },
                new String[] { FmtConstants.redundantForBraces, CodeStyle.BracesGenerationStyle.LEAVE_ALONE.name() },
                new String[] { FmtConstants.redundantIfBraces, CodeStyle.BracesGenerationStyle.LEAVE_ALONE.name() },
                new String[] { FmtConstants.redundantWhileBraces, CodeStyle.BracesGenerationStyle.LEAVE_ALONE.name() },
                new String[] { FmtConstants.blankLinesBeforeClass, "0" },
                new String[] { FmtConstants.blankLinesAfterMethods, "1" }
        ); // NOI18N
    }





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

import java.util.HashMap;
import java.util.Map;
import java.util.prefs.AbstractPreferences;
import java.util.prefs.BackingStoreException;

/**
 *
 * @author Jaroslav Tulach <jtulach@netbeans.org>
 */
public class PreviewPreferences extends AbstractPreferences {
    private Map<String, Object> map = new HashMap<String, Object>();

    public PreviewPreferences() {
        super(null, ""); // NOI18N
    }

    protected void putSpi(String key, String value) {
        map.put(key, value);
    }

    protected String getSpi(String key) {
        return (String) map.get(key);
    }

    protected void removeSpi(String key) {
        map.remove(key);
    }

    protected void removeNodeSpi() throws BackingStoreException {
        throw new UnsupportedOperationException("Not supported yet.");
    }

    protected String[] keysSpi() throws BackingStoreException {
        String[] array = new String[map.keySet().size()];
        return map.keySet().toArray(array);
    }

    protected String[] childrenNamesSpi() throws BackingStoreException {
        throw new UnsupportedOperationException("Not supported yet.");
    }

    protected AbstractPreferences childSpi(String name) {
        throw new UnsupportedOperationException("Not supported yet.");
    }

    protected void syncSpi() throws BackingStoreException {
        throw new UnsupportedOperationException("Not supported yet.");
    }

    protected void flushSpi() throws BackingStoreException {
        throw new UnsupportedOperationException("Not supported yet.");
    }
    
}




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

import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.prefs.AbstractPreferences;
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;

// read-only, no subnodes

public final class ProxyPreferences extends AbstractPreferences {
    private final Preferences[] delegates;

    public ProxyPreferences(Preferences... delegates) {
        super(null, ""); // NOI18N
        this.delegates = delegates;
    }

    protected void putSpi(String key, String value) {
        throw new UnsupportedOperationException("Not supported yet.");
    }

    protected String getSpi(String key) {
        for (Preferences p : delegates) {
            String value = p.get(key, null);
            if (value != null) {
                return value;
            }
        }
        return null;
    }

    protected void removeSpi(String key) {
        throw new UnsupportedOperationException("Not supported yet.");
    }

    protected void removeNodeSpi() throws BackingStoreException {
        throw new UnsupportedOperationException("Not supported yet.");
    }

    protected String[] keysSpi() throws BackingStoreException {
        Set<String> keys = new HashSet<String>();
        for (Preferences p : delegates) {
            keys.addAll(Arrays.asList(p.keys()));
        }
        return keys.toArray(new String[keys.size()]);
    }

    protected String[] childrenNamesSpi() throws BackingStoreException {
        throw new UnsupportedOperationException("Not supported yet.");
    }

    protected AbstractPreferences childSpi(String name) {
        throw new UnsupportedOperationException("Not supported yet.");
    }

    protected void syncSpi() throws BackingStoreException {
        throw new UnsupportedOperationException("Not supported yet.");
    }

    protected void flushSpi() throws BackingStoreException {
        throw new UnsupportedOperationException("Not supported yet.");
    }
    
} // End of ProxyPreferences class

Lines 47-53 Link Here

(-)a/java.editor/test/unit/src/org/netbeans/modules/editor/java/JavaFormatterUnitTest.java (-1 / +1 lines)
47	import java.util.prefs.Preferences;	47	import java.util.prefs.Preferences;
48	import org.netbeans.api.editor.mimelookup.MimeLookup;	48	import org.netbeans.api.editor.mimelookup.MimeLookup;
49	import org.netbeans.api.java.source.CodeStyle;	49	import org.netbeans.api.java.source.CodeStyle;
50	import org.netbeans.modules.java.ui.FmtOptions;	50	import org.netbeans.modules.java.uisupport.FmtOptions;
51	import org.openide.modules.ModuleInfo;	51	import org.openide.modules.ModuleInfo;
52	import org.openide.util.Lookup;	52	import org.openide.util.Lookup;
53		53




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

import junit.framework.Test;
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.junit.NbModuleSuite;
import org.netbeans.junit.NbTestCase;
import org.openide.modules.ModuleInfo;
import org.openide.modules.Modules;
import org.openide.util.Lookup;

/**
 *
 * @author Jaroslav Tulach <jtulach@netbeans.org>
 */
public class VerifyJavaSourceDependenciesTest extends NbTestCase {
    public VerifyJavaSourceDependenciesTest(String n) {
        super(n);
    }
    
    public static Test suite() {
        return NbModuleSuite.emptyConfiguration().
            honorAutoloadEager(true).
            enableClasspathModules(false).gui(false).
            addTest(VerifyJavaSourceDependenciesTest.class).
            clusters("ide|java").
            autoloadModules("ide", ".*").
            autoloadModules("java", ".*").
            enableModules("java", "org.netbeans.modules.java.source").suite();
    }
    
    public void testJavaSourceEnabled() {
        ModuleInfo mi = Modules.getDefault().ownerOf(JavaSource.class);
        assertTrue("Module is enabled", mi.isEnabled());
    }
    
    public void testEditorDisabled() {
        StringBuilder sb = new StringBuilder();
        for (ModuleInfo mi : Lookup.getDefault().lookupAll(ModuleInfo.class)) {
            if (mi.getCodeNameBase().contains("mimelookup")) {
                continue;
            }
            if (mi.getCodeNameBase().equals("org.netbeans.modules.editor.util")) {
                // this one is lightweight
                continue;
            }
            if (mi.getCodeNameBase().equals("org.netbeans.modules.editor.guards")) {
                // this one is lightweight and already in JDev anyway
                continue;
            }
            if (mi.getCodeNameBase().contains("editor")) {
                if (mi.isEnabled()) {
                    sb.append(mi.getCodeNameBase()).append('\n');
                }
            }
        }
        if (sb.length() > 0) {
            fail("Enabled editor module:\n" + sb);
        }
    }
}

Lines 23-28 Link Here

(-)a/java.preprocessorbridge/nbproject/project.xml (+9 lines)
23	</run-dependency>	23	</run-dependency>
24	</dependency>	24	</dependency>
25	<dependency>	25	<dependency>
		26	<code-name-base>org.netbeans.modules.editor.settings</code-name-base>
		27	<build-prerequisite/>
		28	<compile-dependency/>
		29	<run-dependency>
		30	<release-version>1</release-version>
		31	<specification-version>1.43</specification-version>
		32	</run-dependency>
		33	</dependency>
		34	<dependency>
26	<code-name-base>org.netbeans.modules.parsing.api</code-name-base>	35	<code-name-base>org.netbeans.modules.parsing.api</code-name-base>
27	<build-prerequisite/>	36	<build-prerequisite/>
28	<compile-dependency/>	37	<compile-dependency/>




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

import org.netbeans.api.editor.settings.SimpleValueNames;
import org.openide.util.Lookup;

/**
 *
 * @author Jaroslav Tulach <jtulach@netbeans.org>
 */
public abstract class FmtConstants {
    public static final String expandTabToSpaces = SimpleValueNames.EXPAND_TABS;
    public static final String tabSize = SimpleValueNames.TAB_SIZE;
    public static final String spacesPerTab = SimpleValueNames.SPACES_PER_TAB;
    public static final String indentSize = SimpleValueNames.INDENT_SHIFT_WIDTH;
    public static final String continuationIndentSize = "continuationIndentSize"; //NOI18N
    public static final String labelIndent = "labelIndent"; //NOI18N
    public static final String absoluteLabelIndent = "absoluteLabelIndent"; //NOI18N
    public static final String indentTopLevelClassMembers = "indentTopLevelClassMembers"; //NOI18N
    public static final String indentCasesFromSwitch = "indentCasesFromSwitch"; //NOI18N
    public static final String rightMargin = SimpleValueNames.TEXT_LIMIT_WIDTH;
    
    public static final String addLeadingStarInComment = "addLeadingStarInComment"; //NOI18N

    public static final String preferLongerNames = "preferLongerNames"; //NOI18N
    public static final String fieldNamePrefix = "fieldNamePrefix"; //NOI18N
    public static final String fieldNameSuffix = "fieldNameSuffix"; //NOI18N
    public static final String staticFieldNamePrefix = "staticFieldNamePrefix"; //NOI18N
    public static final String staticFieldNameSuffix = "staticFieldNameSuffix"; //NOI18N
    public static final String parameterNamePrefix = "parameterNamePrefix"; //NOI18N
    public static final String parameterNameSuffix = "parameterNameSuffix"; //NOI18N
    public static final String localVarNamePrefix = "localVarNamePrefix"; //NOI18N
    public static final String localVarNameSuffix = "localVarNameSuffix"; //NOI18N
    public static final String qualifyFieldAccess = "qualifyFieldAccess"; //NOI18N
    public static final String useIsForBooleanGetters = "useIsForBooleanGetters"; //NOI18N
    public static final String addOverrideAnnotation = "addOverrideAnnotation"; //NOI18N
    public static final String makeLocalVarsFinal = "makeLocalVarsFinal"; //NOI18N
    public static final String makeParametersFinal = "makeParametersFinal"; //NOI18N
    public static final String classMembersOrder = "classMembersOrder"; //NOI18N
    public static final String sortMembersByVisibility = "sortMembersByVisibility"; //NOI18N
    public static final String visibilityOrder = "visibilityOrder"; //NOI18N
    public static final String classMemberInsertionPoint = "classMemberInsertionPoint"; //NOI18N
    
    public static final String classDeclBracePlacement = "classDeclBracePlacement"; //NOI18N
    public static final String methodDeclBracePlacement = "methodDeclBracePlacement"; //NOI18N
    public static final String otherBracePlacement = "otherBracePlacement"; //NOI18N
    public static final String specialElseIf = "specialElseIf"; //NOI18N
    public static final String redundantIfBraces = "redundantIfBraces"; //NOI18N
    public static final String redundantForBraces = "redundantForBraces"; //NOI18N
    public static final String redundantWhileBraces = "redundantWhileBraces"; //NOI18N
    public static final String redundantDoWhileBraces = "redundantDoWhileBraces"; //NOI18N
    public static final String alignMultilineMethodParams = "alignMultilineMethodParams"; //NOI18N
    public static final String alignMultilineCallArgs = "alignMultilineCallArgs"; //NOI18N
    public static final String alignMultilineAnnotationArgs = "alignMultilineAnnotationArgs"; //NOI18N
    public static final String alignMultilineImplements = "alignMultilineImplements"; //NOI18N
    public static final String alignMultilineThrows = "alignMultilineThrows"; //NOI18N
    public static final String alignMultilineParenthesized = "alignMultilineParenthesized"; //NOI18N
    public static final String alignMultilineBinaryOp = "alignMultilineBinaryOp"; //NOI18N
    public static final String alignMultilineTernaryOp = "alignMultilineTernaryOp"; //NOI18N
    public static final String alignMultilineAssignment = "alignMultilineAssignment"; //NOI18N
    public static final String alignMultilineTryResources = "alignMultilineTryResources"; //NOI18N
    public static final String alignMultilineDisjunctiveCatchTypes = "alignMultilineDisjunctiveCatchTypes"; //NOI18N
    public static final String alignMultilineFor = "alignMultilineFor"; //NOI18N
    public static final String alignMultilineArrayInit = "alignMultilineArrayInit"; //NOI18N
    public static final String placeElseOnNewLine = "placeElseOnNewLine"; //NOI18N
    public static final String placeWhileOnNewLine = "placeWhileOnNewLine"; //NOI18N
    public static final String placeCatchOnNewLine = "placeCatchOnNewLine"; //NOI18N
    public static final String placeFinallyOnNewLine = "placeFinallyOnNewLine"; //NOI18N
    public static final String placeNewLineAfterModifiers = "placeNewLineAfterModifiers"; //NOI18N
    
    public static final String wrapExtendsImplementsKeyword = "wrapExtendsImplementsKeyword"; //NOI18N
    public static final String wrapExtendsImplementsList = "wrapExtendsImplementsList"; //NOI18N
    public static final String wrapMethodParams = "wrapMethodParams"; //NOI18N
    public static final String wrapThrowsKeyword = "wrapThrowsKeyword"; //NOI18N
    public static final String wrapThrowsList = "wrapThrowsList"; //NOI18N
    public static final String wrapMethodCallArgs = "wrapMethodCallArgs"; //NOI18N
    public static final String wrapAnnotationArgs = "wrapAnnotationArgs"; //NOI18N
    public static final String wrapChainedMethodCalls = "wrapChainedMethodCalls"; //NOI18N
    public static final String wrapAfterDotInChainedMethodCalls = "wrapAfterDotInChainedMethodCalls"; //NOI18N
    public static final String wrapArrayInit = "wrapArrayInit"; //NOI18N
    public static final String wrapTryResources = "wrapTryResources"; //NOI18N
    public static final String wrapDisjunctiveCatchTypes = "wrapDisjunctiveCatchTypes"; //NOI18N
    public static final String wrapFor = "wrapFor"; //NOI18N
    public static final String wrapForStatement = "wrapForStatement"; //NOI18N
    public static final String wrapIfStatement = "wrapIfStatement"; //NOI18N
    public static final String wrapWhileStatement = "wrapWhileStatement"; //NOI18N
    public static final String wrapDoWhileStatement = "wrapDoWhileStatement"; //NOI18N
    public static final String wrapAssert = "wrapAssert"; //NOI18N
    public static final String wrapEnumConstants = "wrapEnumConstants"; //NOI18N
    public static final String wrapAnnotations = "wrapAnnotations"; //NOI18N
    public static final String wrapBinaryOps = "wrapBinaryOps"; //NOI18N
    public static final String wrapAfterBinaryOps = "wrapAfterBinaryOps"; //NOI18N
    public static final String wrapTernaryOps = "wrapTernaryOps"; //NOI18N
    public static final String wrapAfterTernaryOps = "wrapAfterTernaryOps"; //NOI18N
    public static final String wrapAssignOps = "wrapAssignOps"; //NOI18N
    
    public static final String blankLinesBeforePackage = "blankLinesBeforePackage"; //NOI18N
    public static final String blankLinesAfterPackage = "blankLinesAfterPackage"; //NOI18N
    public static final String blankLinesBeforeImports = "blankLinesBeforeImports"; //NOI18N
    public static final String blankLinesAfterImports = "blankLinesAfterImports"; //NOI18N
    public static final String blankLinesBeforeClass = "blankLinesBeforeClass"; //NOI18N
    public static final String blankLinesAfterClass = "blankLinesAfterClass"; //NOI18N
    public static final String blankLinesAfterClassHeader = "blankLinesAfterClassHeader"; //NOI18N
    public static final String blankLinesAfterAnonymousClassHeader = "blankLinesAfterAnonymousClassHeader"; //NOI18N
    public static final String blankLinesBeforeFields = "blankLinesBeforeFields"; //NOI18N
    public static final String blankLinesAfterFields = "blankLinesAfterFields"; //NOI18N
    public static final String blankLinesBeforeMethods = "blankLinesBeforeMethods"; //NOI18N
    public static final String blankLinesAfterMethods = "blankLinesAfterMethods"; //NOI18N
    
    public static final String spaceBeforeWhile = "spaceBeforeWhile"; //NOI18N
    public static final String spaceBeforeElse = "spaceBeforeElse"; //NOI18N
    public static final String spaceBeforeCatch = "spaceBeforeCatch"; //NOI18N
    public static final String spaceBeforeFinally = "spaceBeforeFinally"; //NOI18N
    public static final String spaceBeforeMethodDeclParen = "spaceBeforeMethodDeclParen"; //NOI18N
    public static final String spaceBeforeMethodCallParen = "spaceBeforeMethodCallParen"; //NOI18N
    public static final String spaceBeforeIfParen = "spaceBeforeIfParen"; //NOI18N
    public static final String spaceBeforeForParen = "spaceBeforeForParen"; //NOI18N
    public static final String spaceBeforeWhileParen = "spaceBeforeWhileParen"; //NOI18N
    public static final String spaceBeforeTryParen = "spaceBeforeTryParen"; //NOI18N
    public static final String spaceBeforeCatchParen = "spaceBeforeCatchParen"; //NOI18N
    public static final String spaceBeforeSwitchParen = "spaceBeforeSwitchParen"; //NOI18N
    public static final String spaceBeforeSynchronizedParen = "spaceBeforeSynchronizedParen"; //NOI18N
    public static final String spaceBeforeAnnotationParen = "spaceBeforeAnnotationParen"; //NOI18N    
    public static final String spaceAroundUnaryOps = "spaceAroundUnaryOps"; //NOI18N
    public static final String spaceAroundBinaryOps = "spaceAroundBinaryOps"; //NOI18N
    public static final String spaceAroundTernaryOps = "spaceAroundTernaryOps"; //NOI18N
    public static final String spaceAroundAssignOps = "spaceAroundAssignOps"; //NOI18N
    public static final String spaceAroundAnnotationValueAssignOps = "spaceAroundAnnotationValueAssignOps"; //NOI18N
    public static final String spaceBeforeClassDeclLeftBrace = "spaceBeforeClassDeclLeftBrace"; //NOI18N
    public static final String spaceBeforeMethodDeclLeftBrace = "spaceBeforeMethodDeclLeftBrace"; //NOI18N
    public static final String spaceBeforeIfLeftBrace = "spaceBeforeIfLeftBrace"; //NOI18N
    public static final String spaceBeforeElseLeftBrace = "spaceBeforeElseLeftBrace"; //NOI18N
    public static final String spaceBeforeWhileLeftBrace = "spaceBeforeWhileLeftBrace"; //NOI18N
    public static final String spaceBeforeForLeftBrace = "spaceBeforeForLeftBrace"; //NOI18N
    public static final String spaceBeforeDoLeftBrace = "spaceBeforeDoLeftBrace"; //NOI18N
    public static final String spaceBeforeSwitchLeftBrace = "spaceBeforeSwitchLeftBrace"; //NOI18N
    public static final String spaceBeforeTryLeftBrace = "spaceBeforeTryLeftBrace"; //NOI18N
    public static final String spaceBeforeCatchLeftBrace = "spaceBeforeCatchLeftBrace"; //NOI18N
    public static final String spaceBeforeFinallyLeftBrace = "spaceBeforeFinallyLeftBrace"; //NOI18N
    public static final String spaceBeforeSynchronizedLeftBrace = "spaceBeforeSynchronizedLeftBrace"; //NOI18N
    public static final String spaceBeforeStaticInitLeftBrace = "spaceBeforeStaticInitLeftBrace"; //NOI18N
    public static final String spaceBeforeArrayInitLeftBrace = "spaceBeforeArrayInitLeftBrace"; //NOI18N
    public static final String spaceWithinParens = "spaceWithinParens"; //NOI18N
    public static final String spaceWithinMethodDeclParens = "spaceWithinMethodDeclParens"; //NOI18N
    public static final String spaceWithinMethodCallParens = "spaceWithinMethodCallParens"; //NOI18N
    public static final String spaceWithinIfParens = "spaceWithinIfParens"; //NOI18N
    public static final String spaceWithinForParens = "spaceWithinForParens"; //NOI18N
    public static final String spaceWithinWhileParens = "spaceWithinWhileParens"; //NOI18N
    public static final String spaceWithinSwitchParens = "spaceWithinSwitchParens"; //NOI18N
    public static final String spaceWithinTryParens = "spaceWithinTryParens"; //NOI18N
    public static final String spaceWithinCatchParens = "spaceWithinCatchParens"; //NOI18N
    public static final String spaceWithinSynchronizedParens = "spaceWithinSynchronizedParens"; //NOI18N
    public static final String spaceWithinTypeCastParens = "spaceWithinTypeCastParens"; //NOI18N
    public static final String spaceWithinAnnotationParens = "spaceWithinAnnotationParens"; //NOI18N
    public static final String spaceWithinBraces = "spaceWithinBraces"; //NOI18N
    public static final String spaceWithinArrayInitBrackets = "spaceWithinArrayInitBrackets"; //NOI18N
    public static final String spaceBeforeComma = "spaceBeforeComma"; //NOI18N
    public static final String spaceAfterComma = "spaceAfterComma"; //NOI18N
    public static final String spaceBeforeSemi = "spaceBeforeSemi"; //NOI18N
    public static final String spaceAfterSemi = "spaceAfterSemi"; //NOI18N
    public static final String spaceBeforeColon = "spaceBeforeColon"; //NOI18N
    public static final String spaceAfterColon = "spaceAfterColon"; //NOI18N
    public static final String spaceAfterTypeCast = "spaceAfterTypeCast"; //NOI18N
    
    public static final String useSingleClassImport = "useSingleClassImport"; //NOI18N
    public static final String usePackageImport = "usePackageImport"; //NOI18N
    public static final String useFQNs = "useFQNs"; //NOI18N
    public static final String importInnerClasses = "importInnerClasses"; //NOI18N
    public static final String allowConvertToStarImport = "allowConvertToStarImport"; //NOI18N
    public static final String countForUsingStarImport = "countForUsingStarImport"; //NOI18N
    public static final String allowConvertToStaticStarImport = "allowConvertToStaticStarImport"; //NOI18N
    public static final String countForUsingStaticStarImport = "countForUsingStaticStarImport"; //NOI18N
    public static final String packagesForStarImport = "packagesForStarImport"; //NOI18N
    public static final String separateStaticImports = "separateStaticImports"; //NOI18N
    public static final String importGroupsOrder = "importGroupsOrder"; //NOI18N
    public static final String separateImportGroups = "separateImportGroups"; //NOI18N
    
    public static final String enableCommentFormatting = "enableCommentFormatting"; //NOI18N
    public static final String enableBlockCommentFormatting = "enableBlockCommentFormatting"; //NOI18N
    public static final String wrapCommentText = "wrapCommentText"; //NOI18N
    public static final String wrapOneLineComment = "wrapOneLineComment"; //NOI18N
    public static final String preserveNewLinesInComments = "preserveNewLinesInComments"; //NOI18N
    public static final String blankLineAfterJavadocDescription = "blankLineAfterJavadocDescription"; //NOI18N
    public static final String blankLineAfterJavadocParameterDescriptions = "blankLineAfterJavadocParameterDescriptions"; //NOI18N
    public static final String blankLineAfterJavadocReturnTag = "blankLineAfterJavadocReturnTag"; //NOI18N
    public static final String generateParagraphTagOnBlankLines = "generateParagraphTagOnBlankLines"; //NOI18N
    public static final String alignJavadocParameterDescriptions = "alignJavadocParameterDescriptions"; //NOI18N
    public static final String alignJavadocReturnDescription = "alignJavadocReturnDescription"; //NOI18N
    public static final String alignJavadocExceptionDescriptions = "alignJavadocExceptionDescriptions"; //NOI18N
    public static String JAVA_MIME_TYPE = "text/x-java"; // NOI18N

    public static int getDefaultAsInt(String key) {
        return Lookup.getDefault().lookup(FmtConstants.class).defaultAsInt(key);
    }

    public static boolean getDefaultAsBoolean(String key) {
        return Lookup.getDefault().lookup(FmtConstants.class).defaultAsBoolean(key);
    }

    public static String getDefaultAsString(String key) {
        return Lookup.getDefault().lookup(FmtConstants.class).defaultAsString(key);
    }

    protected abstract int defaultAsInt(String key);
    protected abstract boolean defaultAsBoolean(String key);
    protected abstract String defaultAsString(String key);
    
}




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

import java.beans.PropertyChangeListener;
import java.util.prefs.Preferences;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import javax.swing.text.JTextComponent;
import org.openide.filesystems.FileObject;
import org.openide.util.Lookup;

/**
 *
 * @author Jaroslav Tulach <jtulach@netbeans.org>
 */
public abstract class TalkToEditor {
    protected TalkToEditor() {
    }

    private static TalkToEditor getDefault() {
        return Lookup.getDefault().lookup(TalkToEditor.class);
    }

    public static JTextComponent findFocusedComponent() {
        return getDefault().implFocusedComponent();
    }

    
    public static Preferences findCodePreferences(FileObject file) {
        return getDefault().implCodePreferences(file);
    }
    public static Preferences findCodePreferences(Document doc) {
        return getDefault().implCodePreferences(doc);
    }
    public static JTextComponent findLastFocusedComponent() {
        return getDefault().implLastFocusedComponent();
    }
    public static void addEditorRegistryListener(PropertyChangeListener propertyChangeListener) {
        getDefault().implAddRemoveListener(propertyChangeListener, true);
    }
    public static void removeEditorRegistryListener(PropertyChangeListener propertyChangeListener) {
        getDefault().implAddRemoveListener(propertyChangeListener, false);
    }
    public static int findOffsetIndent(Document doc, int offset) throws BadLocationException {
        return getDefault().implOffsetIndent(doc, offset);
    }
    public static boolean checkGuarded(Document doc, int pos, long treePos) {
        return getDefault().implCheckGuarded(doc, pos, treePos);
    }


    protected abstract Preferences implCodePreferences(FileObject file);
    protected abstract Preferences implCodePreferences(Document doc);
    protected abstract JTextComponent implLastFocusedComponent();
    protected abstract JTextComponent implFocusedComponent();
    protected abstract void implAddRemoveListener(PropertyChangeListener pcl, boolean toAdd);
    protected abstract int implOffsetIndent(Document doc, int offset) throws BadLocationException;
    protected abstract boolean implCheckGuarded(Document doc, int pos, long treePos);
}




                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.17</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.indent</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>2</release-version>
                        <specification-version>1.11</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.indent.project</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>0-1</release-version>
                        <specification-version>1.0</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>3</release-version>
                        <specification-version>3.1</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.11</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.settings</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.18</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.49</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.options.editor</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.20</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.parsing.api</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.settings</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.43</specification-version>
                    </run-dependency>
                </dependency>
            </module-dependencies>
            <test-dependencies>
                <test-type>




import com.sun.source.tree.VariableTree;

import org.netbeans.api.project.Project;
import org.netbeans.modules.java.preprocessorbridge.spi.TalkToEditor;
import org.netbeans.modules.java.uisupport.FmtOptions;
import static org.netbeans.modules.java.uisupport.FmtOptions.*;
import static org.netbeans.modules.java.ui.FmtOptions.*;
import org.openide.filesystems.FileObject;

/** 

     * @since 0.39
     */
    public synchronized static CodeStyle getDefault(FileObject file) {
        Preferences prefs = TalkToEditor.findCodePreferences(file);
        return FmtOptions.codeStyleProducer.create(prefs);
    }


     * @since 0.39
     */
    public synchronized static CodeStyle getDefault(Document doc) {
        Preferences prefs = TalkToEditor.findCodePreferences(doc);
        return FmtOptions.codeStyleProducer.create(prefs);
    }
    





import org.netbeans.api.java.lexer.JavaTokenId;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.modules.java.preprocessorbridge.spi.TalkToEditor;
import org.netbeans.modules.java.source.builder.CommentHandlerService;
import org.netbeans.modules.java.source.builder.CommentSetImpl;
import org.netbeans.modules.java.source.parsing.FileObjects;

            if ((path == null || !utils.isSynthetic(path))
                    && (codeStyle.getClassMemberInsertionPoint() == CodeStyle.InsertionPoint.FIRST_IN_CATEGORY && comparator.compare(member, tree) <= 0
                    || comparator.compare(member, tree) < 0)) {
                if (doc == null) {
                    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 (TalkToEditor.checkGuarded(doc, pos, treePos))
                    break;
            }
            idx++;




import org.netbeans.api.annotations.common.NullUnknown;
import org.netbeans.api.java.source.ModificationResult.CreateChange;
import org.netbeans.api.queries.FileEncodingQuery;
import org.netbeans.editor.BaseDocument;
import org.netbeans.lib.editor.util.swing.DocumentUtilities;
import org.netbeans.modules.java.preprocessorbridge.spi.JavaFileFilterImplementation;
import org.netbeans.modules.java.source.JavaFileFilterQuery;

                    // The listener was added while trying to fix #63323
                    // IMPORTANT: it has to be removed immediatelly after the change to stop marking the events
                    // as ignoring caret changes
                    if (isBaseDocument()) {
                        l = new DocumentListener() {
                            @Override
                            public void insertUpdate(DocumentEvent e) {

                    }
                }
            }

            private boolean isBaseDocument() {
                if (doc == null) {
                    return false;
                }
                Class<?> c = doc.getClass();
                while (c != null) {
                    if ("org.netbeans.editor.BaseDocument".equals(c.getName())) { // NOI18N
                        return true;
                    }
                    c = c.getSuperclass();
                }
                return false;
            }
        };
        if (diff.isCommitToGuards()) {
            NbDocument.runAtomic(doc, task);

Lines 63-69 Link Here

(-)a/java.source/src/org/netbeans/api/java/source/UiUtils.java (-1 / +1 lines)
63	import javax.swing.text.StyledDocument;	63	import javax.swing.text.StyledDocument;
64	import org.netbeans.modules.java.source.pretty.VeryPretty;	64	import org.netbeans.modules.java.source.pretty.VeryPretty;
65	import org.netbeans.modules.java.source.save.DiffContext;	65	import org.netbeans.modules.java.source.save.DiffContext;
66	import org.netbeans.modules.java.ui.Icons;	66	import org.netbeans.modules.java.uisupport.Icons;
67	import org.openide.DialogDisplayer;	67	import org.openide.DialogDisplayer;
68	import org.openide.NotifyDescriptor;	68	import org.openide.NotifyDescriptor;
69	import org.openide.cookies.EditorCookie;	69	import org.openide.cookies.EditorCookie;




import javax.swing.event.ChangeListener;
import javax.swing.text.Document;
import javax.swing.text.JTextComponent;
import org.netbeans.api.editor.EditorRegistry;
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.modules.java.preprocessorbridge.spi.TalkToEditor;
import org.netbeans.modules.java.source.JavaSourceSupportAccessor;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;

    private static OpenedEditors DEFAULT;

    private OpenedEditors() {
        TalkToEditor.addEditorRegistryListener(new PropertyChangeListener() {
            public void propertyChange(PropertyChangeEvent evt) {
                stateChanged();
            }


        visibleEditors.clear();

        JTextComponent editor = TalkToEditor.findLastFocusedComponent();

        DataObject file = editor != null ? getDataObject(editor) : null;
        




import javax.swing.JComponent;
import javax.swing.text.Document;
import javax.swing.text.JTextComponent;
//import org.netbeans.editor.SideBarFactory;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileStateInvalidException;
import org.openide.loaders.DataObject;
import org.openide.util.Exceptions;

/** XXX: probably move to java.editor (?)
 *
 * @author lahvac
 */
public class SideBarFactoryImpl /* implements SideBarFactory*/ {

 //   @Override
    public JComponent createSideBar(JTextComponent target) {
        Document doc = target.getDocument();
        FileObject originFile;

Lines 100-106 Link Here

(-)a/java.source/src/org/netbeans/modules/java/source/parsing/JavacParser.java (-7 / +8 lines)
100	import javax.tools.JavaFileObject;	100	import javax.tools.JavaFileObject;
101	import org.netbeans.api.annotations.common.NonNull;	101	import org.netbeans.api.annotations.common.NonNull;
102	import org.netbeans.api.annotations.common.NullAllowed;	102	import org.netbeans.api.annotations.common.NullAllowed;
103	import org.netbeans.api.editor.EditorRegistry;
104	import org.netbeans.api.java.classpath.ClassPath;	103	import org.netbeans.api.java.classpath.ClassPath;
105	import org.netbeans.api.java.lexer.JavaTokenId;	104	import org.netbeans.api.java.lexer.JavaTokenId;
106	import org.netbeans.api.java.queries.SourceLevelQuery;	105	import org.netbeans.api.java.queries.SourceLevelQuery;
Lines 137-142 Link Here
137	import org.netbeans.lib.nbjavac.services.NBJavacTrees;	136	import org.netbeans.lib.nbjavac.services.NBJavacTrees;
138	import org.netbeans.lib.nbjavac.services.NBTreeMaker;	137	import org.netbeans.lib.nbjavac.services.NBTreeMaker;
139	import org.netbeans.lib.nbjavac.services.PartialReparser;	138	import org.netbeans.lib.nbjavac.services.PartialReparser;
		139	import org.netbeans.modules.java.preprocessorbridge.api.FmtConstants;
		140	import org.netbeans.modules.java.preprocessorbridge.spi.TalkToEditor;
140	import org.netbeans.modules.java.source.tasklist.CompilerSettings;	141	import org.netbeans.modules.java.source.tasklist.CompilerSettings;
141	import org.netbeans.modules.java.source.usages.ClassIndexImpl;	142	import org.netbeans.modules.java.source.usages.ClassIndexImpl;
142	import org.netbeans.modules.java.source.usages.ClasspathInfoAccessor;	143	import org.netbeans.modules.java.source.usages.ClasspathInfoAccessor;
Lines 171-177 Link Here
171	//Debug logger	172	//Debug logger
172	private static final Logger LOGGER = Logger.getLogger(JavacParser.class.getName());	173	private static final Logger LOGGER = Logger.getLogger(JavacParser.class.getName());
173	//Java Mime Type	174	//Java Mime Type
174	public static final String MIME_TYPE = "text/x-java";	175	public static final String MIME_TYPE = FmtConstants.JAVA_MIME_TYPE;
175	//JavaFileObjectProvider used by the JavacParser - may be overriden by unit test	176	//JavaFileObjectProvider used by the JavacParser - may be overriden by unit test
176	static JavaFileObjectProvider jfoProvider = new DefaultJavaFileObjectProvider ();	177	static JavaFileObjectProvider jfoProvider = new DefaultJavaFileObjectProvider ();
177	//No output writer like /dev/null	178	//No output writer like /dev/null
Lines 1116-1122 Link Here
1116	th.addTokenHierarchyListener(lexListener = WeakListeners.create(TokenHierarchyListener.class, this,th));	1117	th.addTokenHierarchyListener(lexListener = WeakListeners.create(TokenHierarchyListener.class, this,th));
1117	document = doc;	1118	document = doc;
1118	}	1119	}
1119	EditorRegistry.addPropertyChangeListener(new EditorRegistryWeakListener(this));	1120	TalkToEditor.addEditorRegistryListener(new EditorRegistryWeakListener(this));
1120	}	1121	}
1121		1122
1122	@Override	1123	@Override
Lines 1138-1146 Link Here
1138	//reset document	1139	//reset document
1139	this.document = doc;	1140	this.document = doc;
1140	}	1141	}
1141	} else if (EditorRegistry.FOCUS_GAINED_PROPERTY.equals(evt.getPropertyName())) {	1142	} else if ("focusGained".equals(evt.getPropertyName())) {
1142	final Document doc = document;	1143	final Document doc = document;
1143	final JTextComponent focused = EditorRegistry.focusedComponent();	1144	final JTextComponent focused = TalkToEditor.findFocusedComponent();
1144	final Document focusedDoc = focused == null ? null : focused.getDocument();	1145	final Document focusedDoc = focused == null ? null : focused.getDocument();
1145	if (doc != null && doc == focusedDoc) {	1146	if (doc != null && doc == focusedDoc) {
1146	positions.clear();	1147	positions.clear();
Lines 1216-1222 Link Here
1216	@Override	1217	@Override
1217	public void propertyChange(PropertyChangeEvent evt) {	1218	public void propertyChange(PropertyChangeEvent evt) {
1218	final PropertyChangeListener delegate = get();	1219	final PropertyChangeListener delegate = get();
1219	final JTextComponent lastCandidate = EditorRegistry.focusedComponent();	1220	final JTextComponent lastCandidate = TalkToEditor.findFocusedComponent();
1220	if (delegate != null && lastCandidate != null && lastCandidate != getLast()) {	1221	if (delegate != null && lastCandidate != null && lastCandidate != getLast()) {
1221	setLast(lastCandidate);	1222	setLast(lastCandidate);
1222	delegate.propertyChange(evt);	1223	delegate.propertyChange(evt);
Lines 1225-1231 Link Here
1225		1226
1226	@Override	1227	@Override
1227	public void run() {	1228	public void run() {
1228	EditorRegistry.removePropertyChangeListener(this);	1229	TalkToEditor.removeEditorRegistryListener(this);
1229	}	1230	}
1230		1231
1231	/**	1232	/**




import javax.swing.text.BadLocationException;
import static org.netbeans.modules.java.source.save.ListMatcher.*;
import static com.sun.tools.javac.code.Flags.*;
import javax.swing.text.Document;

import org.netbeans.modules.java.preprocessorbridge.spi.TalkToEditor;
import static org.netbeans.modules.java.source.save.PositionEstimator.*;

public class CasualDiff {

    }
    
    private static int getOldIndent(DiffContext diffContext, Tree t) {
        final Document doc = diffContext.doc;
        if (doc != null) {
            try {
                int offset = (int) diffContext.trees.getSourcePositions().getStartPosition(diffContext.origUnit, t);
                return TalkToEditor.findOffsetIndent(doc, offset);
                return IndentUtils.lineIndent(diffContext.doc, lineStartOffset);
            } catch (BadLocationException ex) {}
        }
        return -1;




import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenHierarchy;
import org.netbeans.api.lexer.TokenSequence;
/* XXX: Where to with reformatter?
import org.netbeans.editor.GuardedDocument;
import org.netbeans.modules.editor.indent.spi.Context;
import org.netbeans.modules.editor.indent.spi.ExtraLock;
import org.netbeans.modules.editor.indent.spi.ReformatTask;
*/
import org.netbeans.modules.java.source.JavaSourceAccessor;
import org.netbeans.modules.java.source.parsing.FileObjects;
import org.netbeans.modules.java.source.parsing.JavacParser;

 *
 * @author Dusan Balek
 */
public class Reformatter { /*implements ReformatTask {
    
    private static final Object CT_HANDLER_DOC_PROPERTY = "code-template-insert-handler"; // NOI18N


        for (Context.Region region : indentRegions)
            reformatImpl(region, cs);
    }
*/    
    public static String reformat(String text, CodeStyle style) {
        return reformat(text, style, style.getRightMargin());
    }

        }
        return sb.toString();
    }
  /*  
    private void reformatImpl(Context.Region region, CodeStyle cs) throws BadLocationException {
        boolean templateEdit = doc.getProperty(CT_HANDLER_DOC_PROPERTY) != null;
        int startOffset = region.getStartOffset();

            return source != null ? new Reformatter(source, context) : null;
        }        
    }
*/
    private static class Pretty extends TreePathScanner<Boolean, Void> {

        private static final String OPERATOR = "operator"; //NOI18N




package org.netbeans.modules.java.source.save;

import com.sun.source.tree.AnnotationTree;
import com.sun.source.tree.BinaryTree;
import com.sun.source.tree.BlockTree;
import com.sun.source.tree.CaseTree;
import com.sun.source.tree.ClassTree;

import org.netbeans.api.java.source.CodeStyle;
import org.netbeans.api.lexer.TokenHierarchy;
import org.netbeans.api.lexer.TokenSequence;
/* XXX: Where to put the Reindenter?
import org.netbeans.modules.editor.indent.spi.Context;
import org.netbeans.modules.editor.indent.spi.Context.Region;
import org.netbeans.modules.editor.indent.spi.ExtraLock;
import org.netbeans.modules.editor.indent.spi.IndentTask;
*/
import org.netbeans.modules.java.source.parsing.FileObjects;
import org.netbeans.modules.java.source.parsing.JavacParser;


 *
 * @author Dusan Balek
 */
public class Reindenter { /*implements IndentTask {

    private final Context context;
    private CodeStyle cs;

                    ? new Reindenter(context) : null;
        }
    }
*/
}

Lines 500-508 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/Bundle.properties (-5 lines)
500		500
501	AN_Preview=Preview	501	AN_Preview=Preview
502	AD_Preview=Preview	502	AD_Preview=Preview
503	FmtTabsIndents.absoluteLabelIndentCheckBox.AccessibleContext.accessibleDescription=Indent Labels absolutely
504	FmtTabsIndents.addLeadingStarInCommentCheckBox.AccessibleContext.accessibleDescription=Comment lines starting with leading star	503	FmtTabsIndents.addLeadingStarInCommentCheckBox.AccessibleContext.accessibleDescription=Comment lines starting with leading star
505	FmtTabsIndents.indentCasesFromSwitchCheckBox.AccessibleContext.accessibleDescription=Additional indent for case statements
506	FmtTabsIndents.indentTopLevelClassMembersCheckBox.AccessibleContext.accessibleDescription=Indent for top-level class members
507	FmtTabsIndents.continuationIndentSizeField.AccessibleContext.accessibleDescription=Indent size in spaces
508	FmtTabsIndents.labelIndentField.AccessibleContext.accessibleDescription=Label indentation size in spaces

Lines 28-34 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/ElementHeaderFormater.java (-1 / +1 lines)
28	*	28	*
29	* Portions Copyrighted 2007 Sun Microsystems, Inc.	29	* Portions Copyrighted 2007 Sun Microsystems, Inc.
30	*/	30	*/
31	package org.netbeans.modules.java.ui;	31	package org.netbeans.modules.java.uisupport;
32		32
33	import com.sun.source.tree.ClassTree;	33	import com.sun.source.tree.ClassTree;
34	import com.sun.source.tree.MethodTree;	34	import com.sun.source.tree.MethodTree;




 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 */
package org.netbeans.modules.java.uisupport;

import org.netbeans.modules.java.preprocessorbridge.api.FmtConstants;
import java.awt.Container;
import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.prefs.AbstractPreferences;
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
import javax.swing.ComboBoxModel;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JComboBox;
import javax.swing.JComponent;
import javax.swing.JEditorPane;
import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.JSpinner;
import javax.swing.JTable;
import javax.swing.JTextField;
import javax.swing.JToggleButton;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.event.ListDataEvent;
import javax.swing.event.ListDataListener;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
import org.netbeans.api.editor.settings.SimpleValueNames;
import org.netbeans.api.java.source.CodeStyle;
import org.netbeans.api.java.source.CodeStyle.BracePlacement;
import org.netbeans.api.java.source.CodeStyle.BracesGenerationStyle;
import org.netbeans.api.java.source.CodeStyle.InsertionPoint;
import org.netbeans.api.java.source.CodeStyle.WrapStyle;
import org.openide.util.lookup.ServiceProvider;
import org.openide.text.CloneableEditorSupport;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;

/**
 *
 * @author phrebejk
 */
@ServiceProvider(service=FmtConstants.class)
public class FmtOptions extends FmtConstants {
    public static final String expandTabToSpaces = SimpleValueNames.EXPAND_TABS;
    public static final String tabSize = SimpleValueNames.TAB_SIZE;
    public static final String spacesPerTab = SimpleValueNames.SPACES_PER_TAB;
    public static final String indentSize = SimpleValueNames.INDENT_SHIFT_WIDTH;
    public static final String continuationIndentSize = "continuationIndentSize"; //NOI18N
    public static final String labelIndent = "labelIndent"; //NOI18N
    public static final String absoluteLabelIndent = "absoluteLabelIndent"; //NOI18N
    public static final String indentTopLevelClassMembers = "indentTopLevelClassMembers"; //NOI18N
    public static final String indentCasesFromSwitch = "indentCasesFromSwitch"; //NOI18N
    public static final String rightMargin = SimpleValueNames.TEXT_LIMIT_WIDTH;
    
    public static final String addLeadingStarInComment = "addLeadingStarInComment"; //NOI18N

    public static final String preferLongerNames = "preferLongerNames"; //NOI18N
    public static final String fieldNamePrefix = "fieldNamePrefix"; //NOI18N
    public static final String fieldNameSuffix = "fieldNameSuffix"; //NOI18N
    public static final String staticFieldNamePrefix = "staticFieldNamePrefix"; //NOI18N
    public static final String staticFieldNameSuffix = "staticFieldNameSuffix"; //NOI18N
    public static final String parameterNamePrefix = "parameterNamePrefix"; //NOI18N
    public static final String parameterNameSuffix = "parameterNameSuffix"; //NOI18N
    public static final String localVarNamePrefix = "localVarNamePrefix"; //NOI18N
    public static final String localVarNameSuffix = "localVarNameSuffix"; //NOI18N
    public static final String qualifyFieldAccess = "qualifyFieldAccess"; //NOI18N
    public static final String useIsForBooleanGetters = "useIsForBooleanGetters"; //NOI18N
    public static final String addOverrideAnnotation = "addOverrideAnnotation"; //NOI18N
    public static final String makeLocalVarsFinal = "makeLocalVarsFinal"; //NOI18N
    public static final String makeParametersFinal = "makeParametersFinal"; //NOI18N
    public static final String classMembersOrder = "classMembersOrder"; //NOI18N
    public static final String sortMembersByVisibility = "sortMembersByVisibility"; //NOI18N
    public static final String visibilityOrder = "visibilityOrder"; //NOI18N
    public static final String classMemberInsertionPoint = "classMemberInsertionPoint"; //NOI18N
    
    public static final String classDeclBracePlacement = "classDeclBracePlacement"; //NOI18N
    public static final String methodDeclBracePlacement = "methodDeclBracePlacement"; //NOI18N
    public static final String otherBracePlacement = "otherBracePlacement"; //NOI18N
    public static final String specialElseIf = "specialElseIf"; //NOI18N
    public static final String redundantIfBraces = "redundantIfBraces"; //NOI18N
    public static final String redundantForBraces = "redundantForBraces"; //NOI18N
    public static final String redundantWhileBraces = "redundantWhileBraces"; //NOI18N
    public static final String redundantDoWhileBraces = "redundantDoWhileBraces"; //NOI18N
    public static final String alignMultilineMethodParams = "alignMultilineMethodParams"; //NOI18N
    public static final String alignMultilineCallArgs = "alignMultilineCallArgs"; //NOI18N
    public static final String alignMultilineAnnotationArgs = "alignMultilineAnnotationArgs"; //NOI18N
    public static final String alignMultilineImplements = "alignMultilineImplements"; //NOI18N
    public static final String alignMultilineThrows = "alignMultilineThrows"; //NOI18N
    public static final String alignMultilineParenthesized = "alignMultilineParenthesized"; //NOI18N
    public static final String alignMultilineBinaryOp = "alignMultilineBinaryOp"; //NOI18N
    public static final String alignMultilineTernaryOp = "alignMultilineTernaryOp"; //NOI18N
    public static final String alignMultilineAssignment = "alignMultilineAssignment"; //NOI18N
    public static final String alignMultilineTryResources = "alignMultilineTryResources"; //NOI18N
    public static final String alignMultilineDisjunctiveCatchTypes = "alignMultilineDisjunctiveCatchTypes"; //NOI18N
    public static final String alignMultilineFor = "alignMultilineFor"; //NOI18N
    public static final String alignMultilineArrayInit = "alignMultilineArrayInit"; //NOI18N
    public static final String placeElseOnNewLine = "placeElseOnNewLine"; //NOI18N
    public static final String placeWhileOnNewLine = "placeWhileOnNewLine"; //NOI18N
    public static final String placeCatchOnNewLine = "placeCatchOnNewLine"; //NOI18N
    public static final String placeFinallyOnNewLine = "placeFinallyOnNewLine"; //NOI18N
    public static final String placeNewLineAfterModifiers = "placeNewLineAfterModifiers"; //NOI18N
    
    public static final String wrapExtendsImplementsKeyword = "wrapExtendsImplementsKeyword"; //NOI18N
    public static final String wrapExtendsImplementsList = "wrapExtendsImplementsList"; //NOI18N
    public static final String wrapMethodParams = "wrapMethodParams"; //NOI18N
    public static final String wrapThrowsKeyword = "wrapThrowsKeyword"; //NOI18N
    public static final String wrapThrowsList = "wrapThrowsList"; //NOI18N
    public static final String wrapMethodCallArgs = "wrapMethodCallArgs"; //NOI18N
    public static final String wrapAnnotationArgs = "wrapAnnotationArgs"; //NOI18N
    public static final String wrapChainedMethodCalls = "wrapChainedMethodCalls"; //NOI18N
    public static final String wrapAfterDotInChainedMethodCalls = "wrapAfterDotInChainedMethodCalls"; //NOI18N
    public static final String wrapArrayInit = "wrapArrayInit"; //NOI18N
    public static final String wrapTryResources = "wrapTryResources"; //NOI18N
    public static final String wrapDisjunctiveCatchTypes = "wrapDisjunctiveCatchTypes"; //NOI18N
    public static final String wrapFor = "wrapFor"; //NOI18N
    public static final String wrapForStatement = "wrapForStatement"; //NOI18N
    public static final String wrapIfStatement = "wrapIfStatement"; //NOI18N
    public static final String wrapWhileStatement = "wrapWhileStatement"; //NOI18N
    public static final String wrapDoWhileStatement = "wrapDoWhileStatement"; //NOI18N
    public static final String wrapAssert = "wrapAssert"; //NOI18N
    public static final String wrapEnumConstants = "wrapEnumConstants"; //NOI18N
    public static final String wrapAnnotations = "wrapAnnotations"; //NOI18N
    public static final String wrapBinaryOps = "wrapBinaryOps"; //NOI18N
    public static final String wrapAfterBinaryOps = "wrapAfterBinaryOps"; //NOI18N
    public static final String wrapTernaryOps = "wrapTernaryOps"; //NOI18N
    public static final String wrapAfterTernaryOps = "wrapAfterTernaryOps"; //NOI18N
    public static final String wrapAssignOps = "wrapAssignOps"; //NOI18N
    
    public static final String blankLinesBeforePackage = "blankLinesBeforePackage"; //NOI18N
    public static final String blankLinesAfterPackage = "blankLinesAfterPackage"; //NOI18N
    public static final String blankLinesBeforeImports = "blankLinesBeforeImports"; //NOI18N
    public static final String blankLinesAfterImports = "blankLinesAfterImports"; //NOI18N
    public static final String blankLinesBeforeClass = "blankLinesBeforeClass"; //NOI18N
    public static final String blankLinesAfterClass = "blankLinesAfterClass"; //NOI18N
    public static final String blankLinesAfterClassHeader = "blankLinesAfterClassHeader"; //NOI18N
    public static final String blankLinesAfterAnonymousClassHeader = "blankLinesAfterAnonymousClassHeader"; //NOI18N
    public static final String blankLinesBeforeFields = "blankLinesBeforeFields"; //NOI18N
    public static final String blankLinesAfterFields = "blankLinesAfterFields"; //NOI18N
    public static final String blankLinesBeforeMethods = "blankLinesBeforeMethods"; //NOI18N
    public static final String blankLinesAfterMethods = "blankLinesAfterMethods"; //NOI18N
    
    public static final String spaceBeforeWhile = "spaceBeforeWhile"; //NOI18N
    public static final String spaceBeforeElse = "spaceBeforeElse"; //NOI18N
    public static final String spaceBeforeCatch = "spaceBeforeCatch"; //NOI18N
    public static final String spaceBeforeFinally = "spaceBeforeFinally"; //NOI18N
    public static final String spaceBeforeMethodDeclParen = "spaceBeforeMethodDeclParen"; //NOI18N
    public static final String spaceBeforeMethodCallParen = "spaceBeforeMethodCallParen"; //NOI18N
    public static final String spaceBeforeIfParen = "spaceBeforeIfParen"; //NOI18N
    public static final String spaceBeforeForParen = "spaceBeforeForParen"; //NOI18N
    public static final String spaceBeforeWhileParen = "spaceBeforeWhileParen"; //NOI18N
    public static final String spaceBeforeTryParen = "spaceBeforeTryParen"; //NOI18N
    public static final String spaceBeforeCatchParen = "spaceBeforeCatchParen"; //NOI18N
    public static final String spaceBeforeSwitchParen = "spaceBeforeSwitchParen"; //NOI18N
    public static final String spaceBeforeSynchronizedParen = "spaceBeforeSynchronizedParen"; //NOI18N
    public static final String spaceBeforeAnnotationParen = "spaceBeforeAnnotationParen"; //NOI18N    
    public static final String spaceAroundUnaryOps = "spaceAroundUnaryOps"; //NOI18N
    public static final String spaceAroundBinaryOps = "spaceAroundBinaryOps"; //NOI18N
    public static final String spaceAroundTernaryOps = "spaceAroundTernaryOps"; //NOI18N
    public static final String spaceAroundAssignOps = "spaceAroundAssignOps"; //NOI18N
    public static final String spaceAroundAnnotationValueAssignOps = "spaceAroundAnnotationValueAssignOps"; //NOI18N
    public static final String spaceBeforeClassDeclLeftBrace = "spaceBeforeClassDeclLeftBrace"; //NOI18N
    public static final String spaceBeforeMethodDeclLeftBrace = "spaceBeforeMethodDeclLeftBrace"; //NOI18N
    public static final String spaceBeforeIfLeftBrace = "spaceBeforeIfLeftBrace"; //NOI18N
    public static final String spaceBeforeElseLeftBrace = "spaceBeforeElseLeftBrace"; //NOI18N
    public static final String spaceBeforeWhileLeftBrace = "spaceBeforeWhileLeftBrace"; //NOI18N
    public static final String spaceBeforeForLeftBrace = "spaceBeforeForLeftBrace"; //NOI18N
    public static final String spaceBeforeDoLeftBrace = "spaceBeforeDoLeftBrace"; //NOI18N
    public static final String spaceBeforeSwitchLeftBrace = "spaceBeforeSwitchLeftBrace"; //NOI18N
    public static final String spaceBeforeTryLeftBrace = "spaceBeforeTryLeftBrace"; //NOI18N
    public static final String spaceBeforeCatchLeftBrace = "spaceBeforeCatchLeftBrace"; //NOI18N
    public static final String spaceBeforeFinallyLeftBrace = "spaceBeforeFinallyLeftBrace"; //NOI18N
    public static final String spaceBeforeSynchronizedLeftBrace = "spaceBeforeSynchronizedLeftBrace"; //NOI18N
    public static final String spaceBeforeStaticInitLeftBrace = "spaceBeforeStaticInitLeftBrace"; //NOI18N
    public static final String spaceBeforeArrayInitLeftBrace = "spaceBeforeArrayInitLeftBrace"; //NOI18N
    public static final String spaceWithinParens = "spaceWithinParens"; //NOI18N
    public static final String spaceWithinMethodDeclParens = "spaceWithinMethodDeclParens"; //NOI18N
    public static final String spaceWithinMethodCallParens = "spaceWithinMethodCallParens"; //NOI18N
    public static final String spaceWithinIfParens = "spaceWithinIfParens"; //NOI18N
    public static final String spaceWithinForParens = "spaceWithinForParens"; //NOI18N
    public static final String spaceWithinWhileParens = "spaceWithinWhileParens"; //NOI18N
    public static final String spaceWithinSwitchParens = "spaceWithinSwitchParens"; //NOI18N
    public static final String spaceWithinTryParens = "spaceWithinTryParens"; //NOI18N
    public static final String spaceWithinCatchParens = "spaceWithinCatchParens"; //NOI18N
    public static final String spaceWithinSynchronizedParens = "spaceWithinSynchronizedParens"; //NOI18N
    public static final String spaceWithinTypeCastParens = "spaceWithinTypeCastParens"; //NOI18N
    public static final String spaceWithinAnnotationParens = "spaceWithinAnnotationParens"; //NOI18N
    public static final String spaceWithinBraces = "spaceWithinBraces"; //NOI18N
    public static final String spaceWithinArrayInitBrackets = "spaceWithinArrayInitBrackets"; //NOI18N
    public static final String spaceBeforeComma = "spaceBeforeComma"; //NOI18N
    public static final String spaceAfterComma = "spaceAfterComma"; //NOI18N
    public static final String spaceBeforeSemi = "spaceBeforeSemi"; //NOI18N
    public static final String spaceAfterSemi = "spaceAfterSemi"; //NOI18N
    public static final String spaceBeforeColon = "spaceBeforeColon"; //NOI18N
    public static final String spaceAfterColon = "spaceAfterColon"; //NOI18N
    public static final String spaceAfterTypeCast = "spaceAfterTypeCast"; //NOI18N
    
    public static final String useSingleClassImport = "useSingleClassImport"; //NOI18N
    public static final String usePackageImport = "usePackageImport"; //NOI18N
    public static final String useFQNs = "useFQNs"; //NOI18N
    public static final String importInnerClasses = "importInnerClasses"; //NOI18N
    public static final String allowConvertToStarImport = "allowConvertToStarImport"; //NOI18N
    public static final String countForUsingStarImport = "countForUsingStarImport"; //NOI18N
    public static final String allowConvertToStaticStarImport = "allowConvertToStaticStarImport"; //NOI18N
    public static final String countForUsingStaticStarImport = "countForUsingStaticStarImport"; //NOI18N
    public static final String packagesForStarImport = "packagesForStarImport"; //NOI18N
    public static final String separateStaticImports = "separateStaticImports"; //NOI18N
    public static final String importGroupsOrder = "importGroupsOrder"; //NOI18N
    public static final String separateImportGroups = "separateImportGroups"; //NOI18N
    
    public static final String enableCommentFormatting = "enableCommentFormatting"; //NOI18N
    public static final String enableBlockCommentFormatting = "enableBlockCommentFormatting"; //NOI18N
    public static final String wrapCommentText = "wrapCommentText"; //NOI18N
    public static final String wrapOneLineComment = "wrapOneLineComment"; //NOI18N
    public static final String preserveNewLinesInComments = "preserveNewLinesInComments"; //NOI18N
    public static final String blankLineAfterJavadocDescription = "blankLineAfterJavadocDescription"; //NOI18N
    public static final String blankLineAfterJavadocParameterDescriptions = "blankLineAfterJavadocParameterDescriptions"; //NOI18N
    public static final String blankLineAfterJavadocReturnTag = "blankLineAfterJavadocReturnTag"; //NOI18N
    public static final String generateParagraphTagOnBlankLines = "generateParagraphTagOnBlankLines"; //NOI18N
    public static final String alignJavadocParameterDescriptions = "alignJavadocParameterDescriptions"; //NOI18N
    public static final String alignJavadocReturnDescription = "alignJavadocReturnDescription"; //NOI18N
    public static final String alignJavadocExceptionDescriptions = "alignJavadocExceptionDescriptions"; //NOI18N

    public static CodeStyleProducer codeStyleProducer;
    

    
    private static final String JAVA = "text/x-java"; //NOI18N
    
    public FmtOptions() {}


    @Override
    protected int defaultAsInt(String key) {
        return Integer.parseInt(defaults.get(key));
    }

    @Override
    protected boolean defaultAsBoolean(String key) {
        return Boolean.parseBoolean(defaults.get(key));
    }

    @Override
    protected String defaultAsString(String key) {
        return defaults.get(key);
    }
    

        }

    }
 
    
    // Support section ---------------------------------------------------------
      
    public static class CategorySupport implements ActionListener, ChangeListener, ListDataListener, TableModelListener, DocumentListener, PreviewProvider, PreferencesCustomizer {

        public static final String OPTION_ID = "org.netbeans.modules.java.ui.FormatingOptions.ID";

        private static final int LOAD = 0;
        private static final int STORE = 1;
        private static final int ADD_LISTENERS = 2;
        
        private static final ComboItem  bracePlacement[] = new ComboItem[] {
                new ComboItem( BracePlacement.SAME_LINE.name(), "LBL_bp_SAME_LINE" ), // NOI18N
                new ComboItem( BracePlacement.NEW_LINE.name(), "LBL_bp_NEW_LINE" ), // NOI18N
                new ComboItem( BracePlacement.NEW_LINE_HALF_INDENTED.name(), "LBL_bp_NEW_LINE_HALF_INDENTED" ), // NOI18N
                new ComboItem( BracePlacement.NEW_LINE_INDENTED.name(), "LBL_bp_NEW_LINE_INDENTED" ) // NOI18N
            };
        private static final ComboItem  bracesGeneration[] = new ComboItem[] {
                new ComboItem( BracesGenerationStyle.GENERATE.name(), "LBL_bg_GENERATE" ), // NOI18N
                new ComboItem( BracesGenerationStyle.LEAVE_ALONE.name(), "LBL_bg_LEAVE_ALONE" ), // NOI18N
                new ComboItem( BracesGenerationStyle.ELIMINATE.name(), "LBL_bg_ELIMINATE" ) // NOI18N       
            };
        
        private static final ComboItem  wrap[] = new ComboItem[] {
                new ComboItem( WrapStyle.WRAP_ALWAYS.name(), "LBL_wrp_WRAP_ALWAYS" ), // NOI18N
                new ComboItem( WrapStyle.WRAP_IF_LONG.name(), "LBL_wrp_WRAP_IF_LONG" ), // NOI18N
                new ComboItem( WrapStyle.WRAP_NEVER.name(), "LBL_wrp_WRAP_NEVER" ) // NOI18N
            };
        
        private static final ComboItem  insertionPoint[] = new ComboItem[] {
                new ComboItem( InsertionPoint.LAST_IN_CATEGORY.name(), "LBL_ip_LAST_IN_CATEGORY" ), // NOI18N
                new ComboItem( InsertionPoint.FIRST_IN_CATEGORY.name(), "LBL_ip_FIRST_IN_CATEGORY" ), // NOI18N
                new ComboItem( InsertionPoint.CARET_LOCATION.name(), "LBL_ip_CARET_LOCATION" ) // NOI18N
            };
        
        protected final String previewText;
//        private String forcedOptions[][];
        
//        private boolean changed = false;
//        private boolean loaded = false;
        private final String id;
        protected final JPanel panel;
        private final List<JComponent> components = new LinkedList<JComponent>();                
        private JEditorPane previewPane;
        
        protected final Preferences preferences;
        protected final Preferences previewPrefs;
    
        protected CategorySupport(Preferences preferences, String id, JPanel panel, String previewText, String[]... forcedOptions) {
            this.preferences = preferences;
            this.id = id;
            this.panel = panel;
            this.previewText = previewText != null ? previewText : NbBundle.getMessage(FmtOptions.class, "SAMPLE_Default"); //NOI18N

            // Scan the panel for its components
            scan(panel, components);

            // Initialize the preview preferences
            Preferences forcedPrefs = new PreviewPreferences();
            for (String[] option : forcedOptions) {
                forcedPrefs.put( option[0], option[1]);
            }
            this.previewPrefs = new ProxyPreferences(forcedPrefs, preferences);

            // Load and hook up all the components
            loadFrom(preferences);
            addListeners();
        }
        
        protected void addListeners() {
            scan(ADD_LISTENERS, null);
        }
        
        protected void loadFrom(Preferences preferences) {
//            loaded = true;
            scan(LOAD, preferences);
//            loaded = false;
        }
//
//        public void applyChanges() {
//            storeTo(preferences);
//        }
//
        protected void storeTo(Preferences p) {
            scan(STORE, p);
        }
        
        protected void notifyChanged() {
//            if (loaded)
//                return;
            storeTo(preferences);
            refreshPreview();
        }
        
        protected void loadListData(final JList list, final String optionID, final Preferences p) {
        }

        protected void storeListData(final JList list, final String optionID, final Preferences node) {            
        }

        protected void loadTableData(final JTable table, final String optionID, final Preferences p) {
        }

        protected void storeTableData(final JTable table, final String optionID, final Preferences node) {            
        }

        // ActionListener implementation ---------------------------------------
        
        public void actionPerformed(ActionEvent e) {
            notifyChanged();
        }
        
        // ChangeListener implementation ---------------------------------------
        
        @Override
        public void stateChanged(ChangeEvent e) {
            notifyChanged();
        }
        
        // ListDataListener implementation -----------------------------------

        @Override
        public void contentsChanged(ListDataEvent e) {
        }

        @Override
        public void intervalAdded(ListDataEvent e) {
            notifyChanged();
        }

        @Override
        public void intervalRemoved(ListDataEvent e) {
        }
        
        // TableModelListener implementation -----------------------------------
        
        @Override
        public void tableChanged(TableModelEvent e) {
            notifyChanged();
        }

        // DocumentListener implementation -------------------------------------
        
        public void insertUpdate(DocumentEvent e) {
            notifyChanged();
        }

        public void removeUpdate(DocumentEvent e) {
            notifyChanged();
        }

        public void changedUpdate(DocumentEvent e) {
            notifyChanged();
        }

        // PreviewProvider methods -----------------------------------------------------
        
        public JComponent getPreviewComponent() {
            if (previewPane == null) {
                previewPane = new JEditorPane();
                previewPane.getAccessibleContext().setAccessibleName(NbBundle.getMessage(FmtOptions.class, "AN_Preview")); //NOI18N
                previewPane.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(FmtOptions.class, "AD_Preview")); //NOI18N
                previewPane.putClientProperty("HighlightsLayerIncludes", "^org\\.netbeans\\.modules\\.editor\\.lib2\\.highlighting\\.SyntaxHighlighting$"); //NOI18N
                previewPane.setEditorKit(CloneableEditorSupport.getEditorKit("text/x-java"));
                previewPane.setEditable(false);
            }
            return previewPane;
        }

        public void refreshPreview() {
            JEditorPane jep = (JEditorPane) getPreviewComponent();
            try {
                int rm = previewPrefs.getInt(rightMargin, getDefaultAsInt(rightMargin));
                jep.putClientProperty("TextLimitLine", rm); //NOI18N
                jep.getDocument().putProperty(SimpleValueNames.TEXT_LINE_WRAP, ""); //NOI18N
                jep.getDocument().putProperty(SimpleValueNames.TAB_SIZE, ""); //NOI18N
                jep.getDocument().putProperty(SimpleValueNames.TEXT_LIMIT_WIDTH, ""); //NOI18N
            }
            catch( NumberFormatException e ) {
                // Ignore it
            }
            try {
                Class.forName(CodeStyle.class.getName(), true, CodeStyle.class.getClassLoader());
            } catch (ClassNotFoundException cnfe) {
                // ignore
            }

            CodeStyle codeStyle = codeStyleProducer.create(previewPrefs);
            jep.setIgnoreRepaint(true);
            jep.setText(Reformatter.reformat(previewText, codeStyle));
            jep.setIgnoreRepaint(false);
            jep.scrollRectToVisible(new Rectangle(0,0,10,10) );
            jep.repaint(100);
        }

        // PreferencesCustomizer implementation --------------------------------
        
        public JComponent getComponent() {
            return panel;
        }

        public String getDisplayName() {
            return panel.getName();
        }

        public String getId() {
            return id;
        }
        
        public HelpCtx getHelpCtx() {
            return null;
        }

        // PreferencesCustomizer.Factory implementation ------------------------

        public static final class Factory implements PreferencesCustomizer.Factory {

            private final String id;
            private final Class<? extends JPanel> panelClass;
            private final String previewText;
            private final String[][] forcedOptions;

            public Factory(String id, Class<? extends JPanel> panelClass, String previewText, String[]... forcedOptions) {
                this.id = id;
                this.panelClass = panelClass;
                this.previewText = previewText;
                this.forcedOptions = forcedOptions;
            }

            public PreferencesCustomizer create(Preferences preferences) {
                try {
                    CategorySupport categorySupport = new CategorySupport(preferences, id, panelClass.newInstance(), previewText, forcedOptions);
                    if (categorySupport.panel instanceof Runnable)
                        ((Runnable)categorySupport.panel).run();
                    return categorySupport;
                } catch (Exception e) {
                    return null;
                }
            }
        } // End of CategorySupport.Factory class
        
        // Private methods -----------------------------------------------------

        private void performOperation(int operation, JComponent jc, String optionID, Preferences p) {
            switch(operation) {
            case LOAD:
                loadData(jc, optionID, p);
                break;
            case STORE:
                storeData(jc, optionID, p);
                break;
            case ADD_LISTENERS:
                addListener(jc);
                break;
            }
        }

        private void scan(int what, Preferences p ) {
            for (JComponent jc : components) {
                Object o = jc.getClientProperty(OPTION_ID);
                if (o instanceof String) {
                    performOperation(what, jc, (String)o, p);
                } else if (o instanceof String[]) {
                    for(String oid : (String[])o) {
                        performOperation(what, jc, oid, p);
                    }
                }
            }
        }

        private void scan(Container container, List<JComponent> components) {
            for (Component c : container.getComponents()) {
                if (c instanceof JComponent) {
                    JComponent jc = (JComponent)c;
                    Object o = jc.getClientProperty(OPTION_ID);
                    if (o instanceof String || o instanceof String[])
                        components.add(jc);
                }                    
                if (c instanceof Container)
                    scan((Container)c, components);
            }
        }

        /** Very smart method which tries to set the values in the components correctly
         */ 
        private void loadData( JComponent jc, String optionID, Preferences node ) {
            
            if ( jc instanceof JTextField ) {
                JTextField field = (JTextField)jc;                
                field.setText( node.get(optionID, getDefaultAsString(optionID)) );
            }
            else if ( jc instanceof JSpinner ) {
                JSpinner js = (JSpinner)jc;
                js.setValue(node.getInt(optionID, getDefaultAsInt(optionID)));
            }
            else if ( jc instanceof JToggleButton ) {
                JToggleButton toggle = (JToggleButton)jc;
                boolean df = getDefaultAsBoolean(optionID);
                toggle.setSelected( node.getBoolean(optionID, df));                
            } 
            else if ( jc instanceof JComboBox ) {
                JComboBox cb  = (JComboBox)jc;
                String value = node.get(optionID, getDefaultAsString(optionID) );
                ComboBoxModel model = createModel(value);
                cb.setModel(model);
                ComboItem item = whichItem(value, model);
                cb.setSelectedItem(item);
            }
            else if ( jc instanceof JList ) {
                loadListData((JList)jc, optionID, node);
            }
            else if ( jc instanceof JTable ) {
                loadTableData((JTable)jc, optionID, node);
            }
        }

        private void storeData( JComponent jc, String optionID, Preferences node ) {
            
            if ( jc instanceof JTextField ) {
                JTextField field = (JTextField)jc;
                
                String text = field.getText();
                
                // XXX test for numbers
                if ( isInteger(optionID) ) {
                    try {
                        int i = Integer.parseInt(text);                        
                    } catch (NumberFormatException e) {
                        return;
                    }
                }

                // XXX: watch out, tabSize, spacesPerTab, indentSize and expandTabToSpaces
                // fall back on getGlopalXXX() values and not getDefaultAsXXX value,
                // which is why we must not remove them. Proper solution would be to
                // store formatting preferences to MimeLookup and not use NbPreferences.
                // The problem currently is that MimeLookup based Preferences do not support subnodes.
                if (!optionID.equals(tabSize) &&
                    !optionID.equals(spacesPerTab) && !optionID.equals(indentSize) &&
                    getDefaultAsString(optionID).equals(text)
                ) {
                    node.remove(optionID);
                } else {
                    node.put(optionID, text);
                }
            }
            else if ( jc instanceof JSpinner ) {
                JSpinner js = (JSpinner)jc;
                Object value = js.getValue();
                if (getDefaultAsInt(optionID) == ((Integer)value).intValue())
                    node.remove(optionID);
                else
                    node.putInt(optionID, ((Integer)value).intValue());
            }
            else if ( jc instanceof JToggleButton ) {
                JToggleButton toggle = (JToggleButton)jc;
                if (!optionID.equals(expandTabToSpaces) && getDefaultAsBoolean(optionID) == toggle.isSelected())
                    node.remove(optionID);
                else
                    node.putBoolean(optionID, toggle.isSelected());
            }
            else if ( jc instanceof JComboBox ) {
                JComboBox cb  = (JComboBox)jc;
                // Logger.global.info( cb.getSelectedItem() + " " + optionID);
                String value = ((ComboItem) cb.getSelectedItem()).value;
                if (getDefaultAsString(optionID).equals(value))
                    node.remove(optionID);
                else
                    node.put(optionID,value);
            }
            else if ( jc instanceof JList ) {
                storeListData((JList)jc, optionID, node);
            }
            else if ( jc instanceof JTable ) {
                storeTableData((JTable)jc, optionID, node);
            }
        }
        
        private void addListener( JComponent jc ) {
            if ( jc instanceof JTextField ) {
                JTextField field = (JTextField)jc;
                field.addActionListener(this);
                field.getDocument().addDocumentListener(this);
            }
            else if ( jc instanceof JSpinner ) {
                JSpinner spinner = (JSpinner)jc;
                spinner.addChangeListener(this);
            }
            else if ( jc instanceof JToggleButton ) {
                JToggleButton toggle = (JToggleButton)jc;
                toggle.addActionListener(this);
            }
            else if ( jc instanceof JComboBox) {
                JComboBox cb  = (JComboBox)jc;
                cb.addActionListener(this);
            }
            else if ( jc instanceof JList) {
                JList jl = (JList)jc;
                jl.getModel().addListDataListener(this);
            }
            else if ( jc instanceof JTable) {
                JTable jt = (JTable)jc;
                jt.getModel().addTableModelListener(this);
            }
        }
        
            
        private ComboBoxModel createModel( String value ) {
            
            // is it braces placement?            
            for (ComboItem comboItem : bracePlacement) {
                if ( value.equals( comboItem.value) ) {
                    return new DefaultComboBoxModel( bracePlacement );
                }
            }
            
            // is it braces generation?
            for (ComboItem comboItem : bracesGeneration) {
                if ( value.equals( comboItem.value) ) {
                    return new DefaultComboBoxModel( bracesGeneration );
                }
            }
            
            // is it wrap?
            for (ComboItem comboItem : wrap) {
                if ( value.equals( comboItem.value) ) {
                    return new DefaultComboBoxModel( wrap );
                }
            }
            
            // is it insertion point?
            for (ComboItem comboItem : insertionPoint) {
                if ( value.equals( comboItem.value) ) {
                    return new DefaultComboBoxModel( insertionPoint );
                }
            }
            
            return null;
        }
        
        private static ComboItem whichItem(String value, ComboBoxModel model) {
            
            for (int i = 0; i < model.getSize(); i++) {
                ComboItem item = (ComboItem)model.getElementAt(i);
                if ( value.equals(item.value)) {
                    return item;
                }
            }    
            return null;
        }
        
        private static class ComboItem {
            
            String value;
            String displayName;

            public ComboItem(String value, String key) {
                this.value = value;
                this.displayName = NbBundle.getMessage(FmtOptions.class, key);
            }

            @Override
            public String toString() {
                return displayName;
            }
            
        }
    }
   
    public static class PreviewPreferences extends AbstractPreferences {
        
        private Map<String,Object> map = new HashMap<String, Object>();

        public PreviewPreferences() {
            super(null, ""); // NOI18N
        }
        
        protected void putSpi(String key, String value) {
            map.put(key, value);            
        }

        protected String getSpi(String key) {
            return (String)map.get(key);                    
        }

        protected void removeSpi(String key) {
            map.remove(key);
        }

        protected void removeNodeSpi() throws BackingStoreException {
            throw new UnsupportedOperationException("Not supported yet.");
        }

        protected String[] keysSpi() throws BackingStoreException {
            String array[] = new String[map.keySet().size()];
            return map.keySet().toArray( array );
        }

        protected String[] childrenNamesSpi() throws BackingStoreException {
            throw new UnsupportedOperationException("Not supported yet.");
        }

        protected AbstractPreferences childSpi(String name) {
            throw new UnsupportedOperationException("Not supported yet.");
        }

        protected void syncSpi() throws BackingStoreException {
            throw new UnsupportedOperationException("Not supported yet.");
        }

        protected void flushSpi() throws BackingStoreException {
            throw new UnsupportedOperationException("Not supported yet.");
        }
    }

    // read-only, no subnodes
    public static final class ProxyPreferences extends AbstractPreferences {
        
        private final Preferences[] delegates;

        public ProxyPreferences(Preferences... delegates) {
            super(null, ""); // NOI18N
            this.delegates = delegates;
        }
        
        protected void putSpi(String key, String value) {
            throw new UnsupportedOperationException("Not supported yet.");
        }

        protected String getSpi(String key) {
            for(Preferences p : delegates) {
                String value = p.get(key, null);
                if (value != null) {
                    return value;
                }
            }
            return null;
        }

        protected void removeSpi(String key) {
            throw new UnsupportedOperationException("Not supported yet.");
        }

        protected void removeNodeSpi() throws BackingStoreException {
            throw new UnsupportedOperationException("Not supported yet.");
        }

        protected String[] keysSpi() throws BackingStoreException {
            Set<String> keys = new HashSet<String>();
            for(Preferences p : delegates) {
                keys.addAll(Arrays.asList(p.keys()));
            }
            return keys.toArray(new String[ keys.size() ]);
        }

        protected String[] childrenNamesSpi() throws BackingStoreException {
            throw new UnsupportedOperationException("Not supported yet.");
        }

        protected AbstractPreferences childSpi(String name) {
            throw new UnsupportedOperationException("Not supported yet.");
        }

        protected void syncSpi() throws BackingStoreException {
            throw new UnsupportedOperationException("Not supported yet.");
        }

        protected void flushSpi() throws BackingStoreException {
            throw new UnsupportedOperationException("Not supported yet.");
        }
    } // End of ProxyPreferences class
    
    public static interface CodeStyleProducer {
        

Lines 42-48 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/Icons.java (-1 / +1 lines)
42	* made subject to such option by the copyright holder.	42	* made subject to such option by the copyright holder.
43	*/	43	*/
44		44
45	package org.netbeans.modules.java.ui;	45	package org.netbeans.modules.java.uisupport;
46		46
47	import java.awt.Image;	47	import java.awt.Image;
48	import java.util.Collection;	48	import java.util.Collection;

Lines 42-48 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/LazyListModel.java (-1 / +1 lines)
42	* made subject to such option by the copyright holder.	42	* made subject to such option by the copyright holder.
43	*/	43	*/
44		44
45	package org.netbeans.modules.java.ui;	45	package org.netbeans.modules.java.uisupport;
46		46
47	import java.util.BitSet;	47	import java.util.BitSet;
48	import javax.swing.*;	48	import javax.swing.*;

Lines 42-48 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/Renderers.java (-1 / +1 lines)
42	* made subject to such option by the copyright holder.	42	* made subject to such option by the copyright holder.
43	*/	43	*/
44		44
45	package org.netbeans.modules.java.ui;	45	package org.netbeans.modules.java.uisupport;
46		46
47	import java.awt.Component;	47	import java.awt.Component;
48	import javax.lang.model.element.TypeElement;	48	import javax.lang.model.element.TypeElement;

Lines 71-77 Link Here

(-)a/java.source/test/unit/src/org/netbeans/api/java/source/gen/AnnotationTest.java (-1 / +1 lines)
71	import org.netbeans.api.java.source.WorkingCopy;	71	import org.netbeans.api.java.source.WorkingCopy;
72	import org.netbeans.junit.NbTestSuite;	72	import org.netbeans.junit.NbTestSuite;
73	import org.netbeans.modules.java.source.save.Reformatter;	73	import org.netbeans.modules.java.source.save.Reformatter;
74	import org.netbeans.modules.java.ui.FmtOptions;	74	import org.netbeans.modules.java.uisupport.FmtOptions;
75	import org.openide.filesystems.FileUtil;	75	import org.openide.filesystems.FileUtil;
76	import org.openide.util.Exceptions;	76	import org.openide.util.Exceptions;
77		77

Lines 70-76 Link Here

(-)a/java.source/test/unit/src/org/netbeans/api/java/source/gen/MoveTreeTest.java (-1 / +1 lines)
70	import org.netbeans.api.java.source.TreeMaker;	70	import org.netbeans.api.java.source.TreeMaker;
71	import org.netbeans.api.java.source.WorkingCopy;	71	import org.netbeans.api.java.source.WorkingCopy;
72	import org.netbeans.junit.NbTestSuite;	72	import org.netbeans.junit.NbTestSuite;
73	import org.netbeans.modules.java.ui.FmtOptions;	73	import org.netbeans.modules.java.uisupport.FmtOptions;
74		74
75	/**	75	/**
76	* Tests method type parameters changes.	76	* Tests method type parameters changes.

Lines 54-60 Link Here

(-)a/java.source/test/unit/src/org/netbeans/api/java/source/gen/OperatorsTest.java (-1 / +1 lines)
54	import org.netbeans.junit.NbTestSuite;	54	import org.netbeans.junit.NbTestSuite;
55	import org.netbeans.modules.editor.indent.spi.CodeStylePreferences;	55	import org.netbeans.modules.editor.indent.spi.CodeStylePreferences;
56	import org.netbeans.modules.java.source.parsing.JavacParser;	56	import org.netbeans.modules.java.source.parsing.JavacParser;
57	import org.netbeans.modules.java.ui.FmtOptions;	57	import org.netbeans.modules.java.uisupport.FmtOptions;
58	import org.openide.filesystems.FileObject;	58	import org.openide.filesystems.FileObject;
59	import org.openide.filesystems.FileUtil;	59	import org.openide.filesystems.FileUtil;
60		60

Lines 59-65 Link Here

(-)a/java.source/test/unit/src/org/netbeans/api/java/source/gen/RefactoringRegressionsTest.java (-1 / +1 lines)
59	import javax.lang.model.type.TypeKind;	59	import javax.lang.model.type.TypeKind;
60	import org.netbeans.api.java.source.*;	60	import org.netbeans.api.java.source.*;
61	import org.netbeans.junit.NbTestSuite;	61	import org.netbeans.junit.NbTestSuite;
62	import org.netbeans.modules.java.ui.FmtOptions;	62	import org.netbeans.modules.java.uisupport.FmtOptions;
63	import static org.netbeans.api.java.source.JavaSource.*;	63	import static org.netbeans.api.java.source.JavaSource.*;
64		64
65	/**	65	/**

Lines 65-71 Link Here

(-)a/java.source/test/unit/src/org/netbeans/api/java/source/gen/TryTest.java (-1 / +1 lines)
65	import org.netbeans.api.java.source.TreeMaker;	65	import org.netbeans.api.java.source.TreeMaker;
66	import org.netbeans.api.java.source.WorkingCopy;	66	import org.netbeans.api.java.source.WorkingCopy;
67	import org.netbeans.junit.NbTestSuite;	67	import org.netbeans.junit.NbTestSuite;
68	import org.netbeans.modules.java.ui.FmtOptions;	68	import org.netbeans.modules.java.uisupport.FmtOptions;
69	import org.openide.filesystems.FileUtil;	69	import org.openide.filesystems.FileUtil;
70		70
71	/**	71	/**




            }
            arr.add(clusterRegExp);
            arr.add(moduleRegExp);
            arr.add("enabled"); // NOI18N
            return new Configuration(
                this.clusterRegExp, arr, startupArgs, parentClassLoader,
                tests, latestTestCaseClass, reuseUserDir, gui,
                enableClasspathModules, honorAutoEager, failOnMessage, 
                failOnException, hideExtraModules);
        }

        public Configuration autoloadModules(String clusterRegExp, String moduleRegExp) {
            List<String> arr = new ArrayList<String>();
            if (this.moduleRegExp != null) {
                arr.addAll(this.moduleRegExp);
            }
            arr.add(clusterRegExp);
            arr.add(moduleRegExp);
            arr.add("autoload"); // NOI18N
            return new Configuration(
                this.clusterRegExp, arr, startupArgs, parentClassLoader,
                tests, latestTestCaseClass, reuseUserDir, gui,

                }
                String clusterReg = it.next();
                String moduleReg = it.next();
                String state = it.next();
                Pattern modPattern = Pattern.compile(moduleReg);
                for (File c : clusterDirs) {
                    if (!c.getName().matches(clusterReg)) {

                        if (!contains) {
                            continue;
                        }
                        if (state.equals("enabled")) {
                            enableModule(xml, autoloads, contains, new File(config, m.getName()));
                        } else {
                            assert state.equals("autoload");
                            autoloadModule(xml, autoloads, contains, new File(config, m.getName()));
                        }
                    }
                }
            }

                }
            }
        }
        
        private static void autoloadModule(String xml, boolean autoloads, boolean enable, File target) throws IOException {
            boolean toEnable = false;
            Matcher matcherAuto = AUTO.matcher(xml);
            if (matcherAuto.find()) {
                if ("true".equals(matcherAuto.group(1))) {
                    return;
                }
            }
            int begin = xml.indexOf("<param name=\"autoload");
            int end = xml.indexOf("<param name=\"jar");
            String middle = "<param name=\"autoload\">true</param>\n" + "    <param name=\"eager\">false</param>\n" + "    ";
            String out = xml.substring(0, begin) + middle + xml.substring(end);
            try {
                writeModule(target, out);
            } catch (IllegalStateException ex) {
                throw new IOException("Unparsable:\n" + xml, ex);
            }
        }

        private static void writeModule(File file, String xml) throws IOException {
            String previous;

Return to bug 217633

Lines 63-71 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/FmtSpaces.java (-9 / +9 lines)
63	import javax.swing.tree.DefaultTreeModel;	63	import javax.swing.tree.DefaultTreeModel;
64	import javax.swing.tree.TreeCellRenderer;	64	import javax.swing.tree.TreeCellRenderer;
65	import javax.swing.tree.TreePath;	65	import javax.swing.tree.TreePath;
		66	import static org.netbeans.modules.java.preprocessorbridge.api.FmtConstants.*;
66	import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;	67	import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
67	import org.openide.util.NbBundle;	68	import org.openide.util.NbBundle;
68	import static org.netbeans.modules.java.ui.FmtOptions.*;
69		69
70	/**	70	/**
71	*	71	*
Lines 357-372 Link Here
357		357
358	}	358	}
359		359
360	private static final class SpacesCategorySupport extends FmtOptions.CategorySupport {	360	private static final class SpacesCategorySupport extends CategorySupport {
361		361
362	public SpacesCategorySupport(Preferences preferences, FmtSpaces panel) {	362	public SpacesCategorySupport(Preferences preferences, FmtSpaces panel) {
363	super(preferences, "spaces", panel, //NOI18N	363	super(preferences, "spaces", panel, //NOI18N
364	NbBundle.getMessage( FmtSpaces.class ,"SAMPLE_Spaces"), // NOI18N	364	NbBundle.getMessage( FmtSpaces.class ,"SAMPLE_Spaces"), // NOI18N
365	new String[] {FmtOptions.placeCatchOnNewLine, Boolean.FALSE.toString()},	365	new String[] {placeCatchOnNewLine, Boolean.FALSE.toString()},
366	new String[] {FmtOptions.placeElseOnNewLine, Boolean.FALSE.toString()},	366	new String[] {placeElseOnNewLine, Boolean.FALSE.toString()},
367	new String[] {FmtOptions.placeWhileOnNewLine, Boolean.FALSE.toString()},	367	new String[] {placeWhileOnNewLine, Boolean.FALSE.toString()},
368	new String[] {FmtOptions.placeFinallyOnNewLine, Boolean.FALSE.toString()},	368	new String[] {placeFinallyOnNewLine, Boolean.FALSE.toString()},
369	new String[] { FmtOptions.blankLinesBeforeClass, "0" });	369	new String[] {blankLinesBeforeClass, "0" });
370	panel.scs = this;	370	panel.scs = this;
371	}	371	}
372		372
Lines 378-384 Link Here
378	@Override	378	@Override
379	protected void loadFrom(Preferences preferences) {	379	protected void loadFrom(Preferences preferences) {
380	for (Item item : getAllItems()) {	380	for (Item item : getAllItems()) {
381	boolean df = FmtOptions.getDefaultAsBoolean(item.id);	381	boolean df = getDefaultAsBoolean(item.id);
382	item.value = preferences.getBoolean(item.id, df);	382	item.value = preferences.getBoolean(item.id, df);
383	}	383	}
384	}	384	}
Lines 397-403 Link Here
397	@Override	397	@Override
398	protected void storeTo(Preferences preferences) {	398	protected void storeTo(Preferences preferences) {
399	for (Item item : getAllItems()) {	399	for (Item item : getAllItems()) {
400	boolean df = FmtOptions.getDefaultAsBoolean(item.id);	400	boolean df = getDefaultAsBoolean(item.id);
401	if (df == item.value)	401	if (df == item.value)
402	preferences.remove(item.id);	402	preferences.remove(item.id);
403	else	403	else

Lines 237-242 Link Here

(-)a/nbjunit/src/org/netbeans/junit/NbModuleSuite.java (-1 / +42 lines)
237	}	237	}
238	arr.add(clusterRegExp);	238	arr.add(clusterRegExp);
239	arr.add(moduleRegExp);	239	arr.add(moduleRegExp);
		240	arr.add("enabled"); // NOI18N
		241	return new Configuration(
		242	this.clusterRegExp, arr, startupArgs, parentClassLoader,
		243	tests, latestTestCaseClass, reuseUserDir, gui,
		244	enableClasspathModules, honorAutoEager, failOnMessage,
		245	failOnException, hideExtraModules);
		246	}
		247
		248	public Configuration autoloadModules(String clusterRegExp, String moduleRegExp) {
		249	List<String> arr = new ArrayList<String>();
		250	if (this.moduleRegExp != null) {
		251	arr.addAll(this.moduleRegExp);
		252	}
		253	arr.add(clusterRegExp);
		254	arr.add(moduleRegExp);
		255	arr.add("autoload"); // NOI18N
240	return new Configuration(	256	return new Configuration(
241	this.clusterRegExp, arr, startupArgs, parentClassLoader,	257	this.clusterRegExp, arr, startupArgs, parentClassLoader,
242	tests, latestTestCaseClass, reuseUserDir, gui,	258	tests, latestTestCaseClass, reuseUserDir, gui,
Lines 1344-1349 Link Here
1344	}	1360	}
1345	String clusterReg = it.next();	1361	String clusterReg = it.next();
1346	String moduleReg = it.next();	1362	String moduleReg = it.next();
		1363	String state = it.next();
1347	Pattern modPattern = Pattern.compile(moduleReg);	1364	Pattern modPattern = Pattern.compile(moduleReg);
1348	for (File c : clusterDirs) {	1365	for (File c : clusterDirs) {
1349	if (!c.getName().matches(clusterReg)) {	1366	if (!c.getName().matches(clusterReg)) {
Lines 1371-1377 Link Here
1371	if (!contains) {	1388	if (!contains) {
1372	continue;	1389	continue;
1373	}	1390	}
1374	enableModule(xml, autoloads, contains, new File(config, m.getName()));	1391	if (state.equals("enabled")) {
		1392	enableModule(xml, autoloads, contains, new File(config, m.getName()));
		1393	} else {
		1394	assert state.equals("autoload");
		1395	autoloadModule(xml, autoloads, contains, new File(config, m.getName()));
		1396	}
1375	}	1397	}
1376	}	1398	}
1377	}	1399	}
Lines 1423-1428 Link Here
1423	}	1445	}
1424	}	1446	}
1425	}	1447	}
		1448
		1449	private static void autoloadModule(String xml, boolean autoloads, boolean enable, File target) throws IOException {
		1450	boolean toEnable = false;
		1451	Matcher matcherAuto = AUTO.matcher(xml);
		1452	if (matcherAuto.find()) {
		1453	if ("true".equals(matcherAuto.group(1))) {
		1454	return;
		1455	}
		1456	}
		1457	int begin = xml.indexOf("<param name=\"autoload");
		1458	int end = xml.indexOf("<param name=\"jar");
		1459	String middle = "<param name=\"autoload\">true</param>\n" + " <param name=\"eager\">false</param>\n" + " ";
		1460	String out = xml.substring(0, begin) + middle + xml.substring(end);
		1461	try {
		1462	writeModule(target, out);
		1463	} catch (IllegalStateException ex) {
		1464	throw new IOException("Unparsable:\n" + xml, ex);
		1465	}
		1466	}
1426		1467
1427	private static void writeModule(File file, String xml) throws IOException {	1468	private static void writeModule(File file, String xml) throws IOException {
1428	String previous;	1469	String previous;

Line 0 Link Here

(-)a/java.editor/src/org/netbeans/modules/java/editor/TalkToEditorImpl.java (+110 lines)
		1	/*
		2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		3	*
		4	* Copyright 2012 Oracle and/or its affiliates. All rights reserved.
		5	*
		6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
		7	* Other names may be trademarks of their respective owners.
		8	*
		9	* The contents of this file are subject to the terms of either the GNU
		10	* General Public License Version 2 only ("GPL") or the Common
		11	* Development and Distribution License("CDDL") (collectively, the
		12	* "License"). You may not use this file except in compliance with the
		13	* License. You can obtain a copy of the License at
		14	* http://www.netbeans.org/cddl-gplv2.html
		15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		16	* specific language governing permissions and limitations under the
		17	* License. When distributing the software, include this License Header
		18	* Notice in each file and include the License file at
		19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
		20	* particular file as subject to the "Classpath" exception as provided
		21	* by Oracle in the GPL Version 2 section of the License file that
		22	* accompanied this code. If applicable, add the following below the
		23	* License Header, with the fields enclosed by brackets [] replaced by
		24	* your own identifying information:
		25	* "Portions Copyrighted [year] [name of copyright owner]"
		26	*
		27	* If you wish your version of this file to be governed by only the CDDL
		28	* or only the GPL Version 2, indicate your decision by adding
		29	* "[Contributor] elects to include this software in this distribution
		30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
		31	* single choice of license, a recipient has the option to distribute
		32	* your version of this file under either the CDDL, the GPL Version 2 or
		33	* to extend the choice of license to its licensees as provided above.
		34	* However, if you add GPL Version 2 code and therefore, elected the GPL
		35	* Version 2 license, then the option applies only if the new code is
		36	* made subject to such option by the copyright holder.
		37	*
		38	* Contributor(s):
		39	*
		40	* Portions Copyrighted 2012 Sun Microsystems, Inc.
		41	*/
		42	package org.netbeans.modules.java.editor;
		43
		44	import java.beans.PropertyChangeListener;
		45	import java.util.prefs.Preferences;
		46	import javax.swing.text.BadLocationException;
		47	import javax.swing.text.Document;
		48	import javax.swing.text.JTextComponent;
		49	import org.netbeans.api.editor.EditorRegistry;
		50	import org.netbeans.editor.GuardedDocument;
		51	import org.netbeans.modules.editor.indent.api.IndentUtils;
		52	import org.netbeans.modules.editor.indent.spi.CodeStylePreferences;
		53	import org.netbeans.modules.java.preprocessorbridge.api.FmtConstants;
		54	import org.netbeans.modules.java.preprocessorbridge.spi.TalkToEditor;
		55	import org.openide.filesystems.FileObject;
		56	import org.openide.util.lookup.ServiceProvider;
		57
		58	/**
		59	*
		60	* @author Jaroslav Tulach <jtulach@netbeans.org>
		61	*/
		62	@ServiceProvider(service=TalkToEditor.class)
		63	public final class TalkToEditorImpl extends TalkToEditor {
		64	@Override
65	protected Preferences implCodePreferences(FileObject file) {
66	return CodeStylePreferences.get(file, FmtConstants.JAVA_MIME_TYPE).getPreferences();
67	}
68
69	@Override
70	protected Preferences implCodePreferences(Document doc) {
71	return CodeStylePreferences.get(doc, FmtConstants.JAVA_MIME_TYPE).getPreferences();
72	}
73
74	@Override
75	protected JTextComponent implLastFocusedComponent() {
76	return EditorRegistry.lastFocusedComponent();
77	}
78
79	@Override
80	protected JTextComponent implFocusedComponent() {
81	return EditorRegistry.focusedComponent();
82	}
83
84	@Override
85	protected void implAddRemoveListener(PropertyChangeListener pcl, boolean toAdd) {
86	if (toAdd) {
87	EditorRegistry.addPropertyChangeListener(pcl);
88	} else {
89	EditorRegistry.removePropertyChangeListener(pcl);
90	}
91	}
92
93	@Override
94	protected int implOffsetIndent(Document doc, int offset) throws BadLocationException {
95	int lineStartOffset = IndentUtils.lineStartOffset(doc, offset);
96	return IndentUtils.lineIndent(doc, lineStartOffset);
97	}
98
99	@Override
100	protected boolean implCheckGuarded(Document doc, int pos, long treePos) {
101	if (!(doc instanceof GuardedDocument)) {
102	return true;
103	}
104	pos = ((GuardedDocument) doc).getGuardedBlockChain().adjustToBlockEnd(pos);
105	if (treePos < 0 \|\| pos <= treePos) {
106	return true;
107	}
108	return false;
109	}
110	}

Lines 1-6 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/Bundle.properties (-470 / +7 lines)
1	# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.	1	# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2	#	2	#
3	# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.	3	# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
4	#	4	#
5	# Oracle and Java are registered trademarks of Oracle and/or its affiliates.	5	# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
6	# Other names may be trademarks of their respective owners.	6	# Other names may be trademarks of their respective owners.
Lines 23-34 Link Here
23	# your own identifying information:	23	# your own identifying information:
24	# "Portions Copyrighted [year] [name of copyright owner]"	24	# "Portions Copyrighted [year] [name of copyright owner]"
25	#	25	#
26	# Contributor(s):
27	#
28	# The Original Software is NetBeans. The Initial Developer of the Original
29	# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
30	# Microsystems, Inc. All Rights Reserved.
31	#
32	# If you wish your version of this file to be governed by only the CDDL	26	# If you wish your version of this file to be governed by only the CDDL
33	# or only the GPL Version 2, indicate your decision by adding	27	# or only the GPL Version 2, indicate your decision by adding
34	# "[Contributor] elects to include this software in this distribution	28	# "[Contributor] elects to include this software in this distribution
Lines 39-508 Link Here
39	# However, if you add GPL Version 2 code and therefore, elected the GPL	33	# However, if you add GPL Version 2 code and therefore, elected the GPL
40	# Version 2 license, then the option applies only if the new code is	34	# Version 2 license, then the option applies only if the new code is
41	# made subject to such option by the copyright holder.	35	# made subject to such option by the copyright holder.
		36	#
		37	# Contributor(s):
		38	#
		39	# Portions Copyrighted 2012 Sun Microsystems, Inc.
42		40
43	# Formating options	41	FmtTabsIndents.continuationIndentSizeField.AccessibleContext.accessibleDescription=Indent size in spaces
44
45	LBL_TabsAndIndents=Tabs and Indents
46	LBL_CodeGeneration=Code Generation
47	LBL_Alignment=Alignment
48	LBL_Braces=Braces
49	LBL_Wrapping=Wrapping
50	LBL_BlankLines=Blank Lines
51	LBL_Spaces=Spaces
52	LBL_Imports=Imports
53
54	LBL_bp_SAME_LINE=Same Line
55	LBL_bp_NEW_LINE=New Line
56	LBL_bp_NEW_LINE_HALF_INDENTED=New Line Half Indented
57	LBL_bp_NEW_LINE_INDENTED= New Line Indented
58
59	LBL_bg_GENERATE=Generate
60	LBL_bg_LEAVE_ALONE=Leave Alone
61	LBL_bg_ELIMINATE=Eliminate
62
63	LBL_wrp_WRAP_ALWAYS=Always
64	LBL_wrp_WRAP_IF_LONG=If Long
65	LBL_wrp_WRAP_NEVER=Never
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
71	LBL_ExpandTabToSpaces=&Expand Tab to Spaces
72	LBL_TabSize=&Tab Size:
73	LBL_IndentSize=&Indentation Size:
74	LBL_ContinuationIndentSize=&Continuation Indentation Size:
75	LBL_LabelIndent=&Label Indentation\:
76	LBL_AbsoluteLabelIndent=&Absolute Label Indentation
77	LBL_IndentTopLevelClassMemberts=&Indent Top Level Class Members
78	LBL_AddLeadingStarInComment=A&dd Leading Star In Comment
79	LBL_RightMargin=&Right Margin:
80
81	LBL_gen_Naming=Naming Conventions\:
82	LBL_gen_PreferLongerNames=Prefer Longer Names
83	LBL_gen_UseIsForBooleanGetters=Use Is For Boolean Getters
84	LBL_gen_Prefix=Prefix
85	LBL_gen_Suffix=Suffix
86	LBL_gen_Field=Field\:
87	LBL_gen_StaticField=Static Field\:
88	LBL_gen_Parameter=Parameter\:
89	LBL_gen_LocalVariable=Local Variable\:
90	LBL_gen_Other=Other\:
91	LBL_gen_QualifyFieldAccess=Qualify Field Access
92	LBL_gen_AddOverrideAnnotation=Add Override Annotation
93	LBL_gen_ParametersFinal=Make Generated Parameters Final
94	LBL_gen_LocalVariablesFinal=Make Generated Local variables Final
95	LBL_gen_MembersOreder=Members Sort Order\:
96	LBL_gen_MembersOrederUp=Move Up
97	LBL_gen_MembersOrederDown=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
114	LBL_blBeforePackage=Before &Package\:
115	LBL_blAfterPackage=After Packa&ge\:
116	LBL_blBeforeImports=Before &Imports\:
117	LBL_blAfterImports=After Imports\:
118	LBL_blBeforeClass=Before &Class\:
119	LBL_blAfterClass=After C&lass\:
120	LBL_blAfterClassHeader=After Class &Header\:
121	LBL_blAfterAnonymousClassHeader=After &Anonymous Class Header:
122	LBL_blBeforeFields=Before &Field\:
123	LBL_blAfterFields=After Fi&eld\:
124	LBL_blBeforeMethods=Before &Method\:
125	LBL_blAfterMethods=After Me&thod\:
126
127	LBL_BeforeKeywords=Before Keywords
128	LBL_spaceBeforeWhile="while"
129	LBL_spaceBeforeElse="else"
130	LBL_spaceBeforeCatch="catch"
131	LBL_spaceBeforeFinally="finally"
132
133	LBL_BeforeParentheses=Before Parentheses
134	LBL_spaceBeforeMethodDeclParen=Method Declaration
135	LBL_spaceBeforeMethodCallParen=Method Call
136	LBL_spaceBeforeIfParen="if"
137	LBL_spaceBeforeForParen="for"
138	LBL_spaceBeforeWhileParen="while"
139	LBL_spaceBeforeTryParen="try"
140	LBL_spaceBeforeCatchParen="catch"
141	LBL_spaceBeforeSwitchParen="switch"
142	LBL_spaceBeforeSynchronizedParen="synchronized"
143	LBL_spaceBeforeAnnotationParen=Annotation Parameters
144
145	LBL_AroundOperators=Around Operators
146	LBL_spaceAroundUnaryOps=Unary Operators
147	LBL_spaceAroundBinaryOps=Binary Operators
148	LBL_spaceAroundTernaryOps=Ternary Operators
149	LBL_spaceAroundAssignOps=Assignment Operators
150	LBL_spaceAroundAnnotationValueAssignOps=Annotation Value Assignment Operator
151
152	LBL_BeforeLeftBraces=Before Left Braces
153	LBL_spaceBeforeClassDeclLeftBrace=Class Declaration
154	LBL_spaceBeforeMethodDeclLeftBrace=Method Declaration
155	LBL_spaceBeforeIfLeftBrace="if"
156	LBL_spaceBeforeElseLeftBrace="else"
157	LBL_spaceBeforeWhileLeftBrace="while"
158	LBL_spaceBeforeForLeftBrace="for"
159	LBL_spaceBeforeDoLeftBrace="do"
160	LBL_spaceBeforeSwitchLeftBrace="switch"
161	LBL_spaceBeforeTryLeftBrace="try"
162	LBL_spaceBeforeCatchLeftBrace="catch"
163	LBL_spaceBeforeFinallyLeftBrace="finally"
164	LBL_spaceBeforeSynchronizedLeftBrace="synchronized"
165	LBL_spaceBeforeStaticInitLeftBrace=Static Initializer
166	LBL_spaceBeforeArrayInitLeftBrace=Array Initializer
167
168	LBL_WithinParentheses=Within Parentheses
169	LBL_spaceWithinParens=Parentheses
170	LBL_spaceWithinMethodDeclParens=Method Declaration
171	LBL_spaceWithinMethodCallParens=Method Call
172	LBL_spaceWithinIfParens="if"
173	LBL_spaceWithinForParens="for"
174	LBL_spaceWithinWhileParens="while"
175	LBL_spaceWithinSwitchParens="switch"
176	LBL_spaceWithinTryParens="try"
177	LBL_spaceWithinCatchParens="catch"
178	LBL_spaceWithinSynchronizedParens="synchronized"
179	LBL_spaceWithinTypeCastParens=Type Cast
180	LBL_spaceWithinAnnotationParens=Annotation
181	LBL_spaceWithinBraces=Braces
182	LBL_spaceWithinArrayInitBrackets=Array Initializer Brackets
183
184	LBL_Other=Other
185	LBL_spaceBeforeComma=Before Comma
186	LBL_spaceAfterComma=After Comma
187	LBL_spaceBeforeSemi=Before Semicolon
188	LBL_spaceAfterSemi=After Semicolon
189	LBL_spaceBeforeColon=Before Colon
190	LBL_spaceAfterColon=After Colon
191	LBL_spaceAfterTypeCast=After Type Cast
192
193	LBL_wrp_extendsImplementsKeyword=&Extends/Implements Keyword\:
194	LBL_wrp_extendsImplementsList=E&xtends/Implements List\:
195	LBL_wrp_methodParameters=Method &Parameters\:
196	LBL_wrp_throwsKeyword=&Throws Keyword\:
197	LBL_wrp_throwsList=Th&rows List\:
198	LBL_wrp_methodCallArgs=Method Call Arguments\:
199	LBL_wrp_annotationArgs=Annotation Arg&uments\:
200	LBL_wrp_chainedMethodCalls=C&hained Method Calls\:
201	LBL_wrp_afeterDot=Wrap After Dot In Chained Method Call
202	LBL_wrp_arrayInit=Array Initiali&zer\:
203	LBL_wrp_tryResources=Try Re&sources\:
204	LBL_wrp_multiCatches=Dis&junctive Catch Types\:
205	LBL_wrp_for=&For\:
206	LBL_wrp_forStatement=F&or Statement\:
207	LBL_wrp_ifStatement=&If Statement\:
208	LBL_wrp_whileStatement=&While Statement\:
209	LBL_wrp_doWhileStatement=&Do ... While Statement
210	LBL_wrp_assert=&Assert\:
211	LBL_wrp_enumConstants=Enum &Constants\:
212	LBL_wrp_annotations=A&nnotations\:
213	LBL_wrp_binaryOps=&Binary Operators\:
214	LBL_wrp_afeterBinaryOps=Wrap After Binary Operators
215	LBL_wrp_ternaryOps=Ternar&y Operators\:
216	LBL_wrp_afterTernaryOps=Wrap After Ternary Operators
217	LBL_wrp_assignOps=Assi&gnment Operators\:
218
219	LBL_br_bracesPlacement=Braces Placement
220	LBL_br_bracesGeneration=Braces Generation
221	LBL_al_newLines=New Lines
222	LBL_al_multilineAlignment=Multiline Alignment
223	LBL_bp_ClassDecl=&Class Declaration\:
224	LBL_bp_MethodDecl=&Method Declaration\:
225	LBL_bp_Other=&Other\:
226	LBL_bp_SpecialElseIf=&Special "else if" Treatment
227	LBL_bg_If="&if"\:
228	LBL_bg_For="&for"\:
229	LBL_bg_While="&while"\:
230	LBL_bg_DoWhile="&do ... while"\:
231	LBL_nl_Else="&else"
232	LBL_nl_While="w&hile"
233	LBL_nl_Catch="c&atch"
234	LBL_nl_Finally="finall&y"
235	LBL_nl_Modifiers=After modifie&rs
236	LBL_am_MethodParams=Method &Parameters
237	LBL_am_CallArgs=Method Call Arg&uments
238	LBL_am_AnnotationArgs=&Annotation Arguments
239	LBL_an_Implements=I&mplements List
240	LBL_am_Throws=&Throws List
241	LBL_am_Paren=Parenthesize&d
242	LBL_am_BinaryOp=&Binary Operators
243	LBL_am_TernaryOp=Ter&nary Operators
244	LBL_am_Assign=Assi&gnment
245	LBL_am_For=&For
246	LBL_am_ArrayInit=Array Initiali&zer
247	LBL_am_TryResources=Try Re&sources
248	LBL_am_MultiCatch=Dis&junctive Catch Types
249
250	LBL_IndentCasesFromSwitch=Indent Case Statements In &Switch
251
252	LBL_Comments=Comments
253	LBL_doc_enableCommentFormat=Enable Comments Formatting
254	LBL_doc_enableBlockCommentFormat=Format Block Comments
255	LBL_doc_generalLabel=General
256	LBL_doc_addLeadingStar=Add Leading Star
257	LBL_doc_wrapCommentText=Wrap Text At Right Margin
258	LBL_doc_wrapOneLineCheckBox=Wrap One Line Comments
259	LBL_doc_preserveNewLinesCheckBox=Preserve New Lines
260	LBL_doc_javadocLabel=Javadoc
261	LBL_doc_blankLineAfterDescCheckBox=Add Blank Line After Description
262	LBL_doc_blankLineAfterParamsCheckBox=Add Blank Line After Parameter Descriptions
263	LBL_doc_blankLineAfterReturnCheckBox=Add Blank Line After Return Tag
264	LBL_doc_generatePCheckBox=Generate "<p/>" On Blank Lines
265	LBL_doc_alignParamsCheckBox=Align Parameter Descriptions
266	LBL_doc_alignReturnCheckBox=Align Return Value Descriptions
267	LBL_doc_alignExceptionsCheckBox=Align Exception Descriptions
268
269	LBL_imp_useSingleClass=Use Single Class Imports
270	LBL_imp_usePackage=Use Package Imports
271	LBL_imp_useFQN=Use Fully Qualified Names
272	LBL_imp_importTreshold=Class Count To Use Star Import
273	LBL_imp_staticImportTreshold=Members Count To Use Static Star Import
274	LBL_imp_importInnerClasses=Import Inner Classes
275	LBL_imp_starImportPackages=Packages To Use Star Import:
276	LBL_imp_importLayout=Import Layout:
277	LBL_imp_separateStaticImports=Separate Static Imports
278	LBL_imp_add=Add
279	LBL_imp_remove=Remove
280	LBL_imp_moveUp=Move Up
281	LBL_imp_moveDown=Move Down
282	LBL_imp_separateGroups=Separate Groups
283	LBL_imp_allOtherImports=<all other imports>
284	LBL_imp_Package=Package
285	LBL_imp_WithSub=*
286	LBL_imp_Static=Static
287
288	# Following entries (marked) as samples are used as examples in the formating
289	# options. It is highly discourage to localize them unless absolutely necessary.
290
291	SAMPLE_Default=public class ClassA {\
292	public int number = 1;\
293	private String text ="A";\
294	public ClassA() {\
295	}\
296	public void meth(String text, int number) {\
297	}\
298	}
299
300	SAMPLE_TabsIndents=public class ClassA {\
301	public int number = 1;\
302	private String letters[] = new String[]{ "A", "B" };\
303	public int meth(String text, int number) {\
304	if ( text == null ) {\
305	text = "a";\
306	}\
307	else if (text.length() == 0) {\
308	text = "empty";\
309	}\
310	else {\
311	number++;\
312	}\
313	label:\
314	switch(number) {\
315	case 1\:\
316	return meth("text", 22);\
317	case 2\:\
318	return 20;\
319	default\:\
320	return -1;\
321	}\
322	} }
323
324	SAMPLE_Align=@Anno(paramA="aValue", paramB="bValue")\
325	public class ClassA implements InterfaceA, InterfaceB {\
326	private String letters[] = new String[]{"A", "B"};\
327	public int meth(String text, int number) throws ExceptionA, ExceptionB {\
328	if ( text != null ) {\
329	try {\
330	meth( "Some text", text.length());\
331	} catch ( Throwable t ) {\
332	} finally {\
333	}\
334	} else {\
335	text = number == 0 ? "empty" : "nonempty";\
336	}\
337	do {\
338	number =\nnumber + 1;\
339	} while (number < 2);\
340	for( int i = 1; i < 100; i++ ) {\
341	number = (number +\ni) * 2;\
342	}\
343	}\
344	}
345
346	SAMPLE_Braces=public class ClassA {\
347	private String letters[] = new String[]{"A", "B"};\
348	public int meth(String text, int number) {\
349	if ( text != null ) {\
350	try {\
351	meth( "Some text", text.length());\
352	} catch ( Throwable t ) {\
353	} finally {\
354	}\
355	} else {\
356	text = number == 0 ? "empty" : "nonempty";\
357	}\
358	do {\
359	number = number + 1;\
360	} while (number < 2);\
361	for( int i = 1; i < 100; i++ ) {\
362	number = number + i;\
363	}\
364	while(number > 0) {\
365	number--;\
366	}\
367	}\
368	}
369
370	SAMPLE_Wrapping=@Anno(paramA="a Value", paramB="bValue")\
371	@Deprecated \
372	public class ClassA extends Object implements InterfaceA, InterfaceB, InterfaceC {\
373	private static final String letters[] = new String[]{ "A", "B", "C", "D" };\
374	public int number = 1;\
375	public ClassA() {\
376	}\
377	public int method(String text, int number, Object object) throws ExceptionA, ExceptionB {\
378	assert nuber + text.length() < 20 : "message";\
379	if (number==13 && object instanceof Runnable )\
380	method( "Some text", 12, new Object());\
381	for( int i = 1; i < 100; i++ )\
382	System.out.print(i);\
383	while ( this.number < 2 && number != 3 )\
384	this.number++;\
385	do \
386	method1().method2().method3();\
387	while ( this.number < 2 && number != 3 );\
388	return number > 100 ? -1 : -2;\
389	}\
390	public enum Where {\
391	NORTH, EAST, SOUTH, WEST;\
392	}\
393	}
394
395
396	SAMPLE_BlankLines=package org.netbeans.samples;\
397	import java.util.List;\
398	import java.util.Map;\
399	\
400	public class ClassA {\
401	public int i;\
402	public int j;\
403	\
404	public ClassA() {\
405	}\
406	public void methodA() {\
407	new Runnable() {\
408	public void run() {\
409	}\
410	};\
411	}\
412	public void methodB() {\
413	}\
414	public class innerClass {\
415	}\
416	public static interface innerInterface {\
417	}\
418	}
419
420	SAMPLE_Spaces=@Anno(paramA="aValue", paramB="bValue")\
421	public class ClassA {\
422	public int number = 1;\
423	private String text ="A";\
424	static float[] floats = new float[3];\
425	protected double[] doubles = new double[]{3.67,40,2e-30};\
426	\
427	static {\
428	floats[0]=12.6f;\
429	}\
430	\
431	public ClassA() {\
432	}\
433	public int meth(String text, int number) {\
434	if (number==13) {\
435	return (int)System.currentTimeMillis();\
436	}else {\
437	}\
438	\
439	for( int i = 20; i < 100; i++) {\
440	synchronized(this) {\
441	while(i%13>5)\
442	meth( text + " ", number++);\
443	}\
444	}\
445	\
446	for(float f : floats)\
447	System.out.println(f);\
448	\
449	switch(number) {\
450	case 1\:\
451	do { out( (2+3)*this.number--); } while(this.number > 6);\
452	return 10;\
453	case 2\:\
454	try {\
455	toString();\
456	}\
457	catch ( IllegalStateException illegalStateException ) {\
458	illegalStateException.printStackTrace();\
459	}\
460	finally {\
461	return 20;\
462	}\
463	default\:\
464	return number > 100 ? -1 : -2;\
465	}\
466	} }
467
468	SAMPLE_Comments=public class ClassA {\n\
469	/**\n\
470	This is the first part of a sample method description.\n\
471	The second part is placed after a manual newline.\n\
472	\n\
473	The last part is placed after an empty line.\n\
474	@param text the first parameter description\n\
475	@param number the second parameter description\n\
476	@return this is the return value description\n\
477	@throws ExcepA the first exception description\n\
478	@throws ExcB the second exception description\n\
479	*/\n\
480	public String meth(String text, int number) throws ExceptionA, ExcB {\n\
481	/This is one line comment/\n\
482	return number > 0 ? text : null;\n\
483	}\n\
484	}
485
486	SAMPLE_Imports=package org.netbeans.samples;\
487	\
488	public class ClassA {\
489	\
490	public void method() {\
491	}\
492	}
493
494	SAMPLE_CodeGen=public class ClassA {\
495	\
496	private String name;\
497	}
498
499	nlFinallyCheckBox1.text="finall&y"
500
501	AN_Preview=Preview
502	AD_Preview=Preview
503	FmtTabsIndents.absoluteLabelIndentCheckBox.AccessibleContext.accessibleDescription=Indent Labels absolutely	42	FmtTabsIndents.absoluteLabelIndentCheckBox.AccessibleContext.accessibleDescription=Indent Labels absolutely
504	FmtTabsIndents.addLeadingStarInCommentCheckBox.AccessibleContext.accessibleDescription=Comment lines starting with leading star	43	FmtTabsIndents.labelIndentField.AccessibleContext.accessibleDescription=Label indentation size in spaces
505	FmtTabsIndents.indentCasesFromSwitchCheckBox.AccessibleContext.accessibleDescription=Additional indent for case statements	44	FmtTabsIndents.indentCasesFromSwitchCheckBox.AccessibleContext.accessibleDescription=Additional indent for case statements
506	FmtTabsIndents.indentTopLevelClassMembersCheckBox.AccessibleContext.accessibleDescription=Indent for top-level class members	45	FmtTabsIndents.indentTopLevelClassMembersCheckBox.AccessibleContext.accessibleDescription=Indent for top-level class members
507	FmtTabsIndents.continuationIndentSizeField.AccessibleContext.accessibleDescription=Indent size in spaces
508	FmtTabsIndents.labelIndentField.AccessibleContext.accessibleDescription=Label indentation size in spaces

Lines 10-15 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/FmtBraces.form (-36 / +24 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 24-39 Link Here
24	<Group type="102" attributes="0">	25	<Group type="102" attributes="0">
25	<Group type="103" groupAlignment="0" attributes="0">	26	<Group type="103" groupAlignment="0" attributes="0">
26	<Group type="102" alignment="0" attributes="0">	27	<Group type="102" alignment="0" attributes="0">
		28	<Component id="bracesPlacementLabel" min="-2" max="-2" attributes="0"/>
		29	<EmptySpace max="-2" attributes="0"/>
		30	<Component id="jSeparator1" pref="103" max="32767" attributes="0"/>
		31	</Group>
		32	<Group type="102" alignment="0" attributes="0">
		33	<Component id="bracesGenerationLabel" min="-2" max="-2" attributes="0"/>
		34	<EmptySpace max="-2" attributes="0"/>
		35	<Component id="jSeparator2" pref="98" max="32767" attributes="0"/>
		36	</Group>
		37	<Group type="102" attributes="0">
27	<EmptySpace max="-2" attributes="0"/>	38	<EmptySpace max="-2" attributes="0"/>
28	<Group type="103" groupAlignment="0" attributes="0">	39	<Group type="103" groupAlignment="0" attributes="0">
29	<Component id="doWhileBracesLabel" alignment="0" min="-2" max="-2" attributes="0"/>	40	<Group type="102" alignment="0" attributes="0">
30	<Component id="otherLabel" alignment="0" min="-2" max="-2" attributes="0"/>	41	<Group type="103" groupAlignment="0" attributes="0">
31	<Component id="methodDeclLabel" alignment="0" min="-2" max="-2" attributes="0"/>	42	<Component id="doWhileBracesLabel" alignment="0" min="-2" max="-2" attributes="0"/>
32	<Component id="whileBracesLabel" alignment="0" min="-2" max="-2" attributes="0"/>	43	<Component id="otherLabel" alignment="0" min="-2" max="-2" attributes="0"/>
33	</Group>	44	<Component id="methodDeclLabel" alignment="0" min="-2" max="-2" attributes="0"/>
34	<EmptySpace min="-2" pref="12" max="-2" attributes="0"/>	45	<Component id="whileBracesLabel" alignment="0" min="-2" max="-2" attributes="0"/>
35	<Group type="103" groupAlignment="1" attributes="0">	46	</Group>
36	<Group type="102" attributes="0">	47	<EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
37	<Group type="103" groupAlignment="1" attributes="0">	48	<Group type="103" groupAlignment="1" attributes="0">
38	<Group type="103" groupAlignment="0" attributes="0">	49	<Group type="103" groupAlignment="0" attributes="0">
39	<Component id="otherCombo" linkSize="1" alignment="0" min="-2" max="-2" attributes="1"/>	50	<Component id="otherCombo" linkSize="1" alignment="0" min="-2" max="-2" attributes="1"/>
Lines 43-80 Link Here
43	<Component id="whileBracesCombo" linkSize="1" alignment="1" min="-2" max="-2" attributes="0"/>	54	<Component id="whileBracesCombo" linkSize="1" alignment="1" min="-2" max="-2" attributes="0"/>
44	</Group>	55	</Group>
45	<Component id="doWhileBracesCombo" linkSize="1" min="-2" max="-2" attributes="0"/>	56	<Component id="doWhileBracesCombo" linkSize="1" min="-2" max="-2" attributes="0"/>
		57	<Component id="methodDeclCombo" linkSize="1" alignment="1" min="-2" max="-2" attributes="1"/>
46	</Group>	58	</Group>
47	<EmptySpace max="-2" attributes="0"/>
48	</Group>	59	</Group>
49	<Component id="methodDeclCombo" linkSize="1" alignment="1" min="-2" max="-2" attributes="1"/>	60	<Component id="classDeclLabel" alignment="0" min="-2" max="-2" attributes="0"/>
		61	<Component id="specialElseIfCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
		62	<Component id="ifBracesLabel" alignment="0" min="-2" max="-2" attributes="0"/>
		63	<Component id="forBracesLabel" alignment="0" min="-2" max="-2" attributes="0"/>
50	</Group>	64	</Group>
51	</Group>	65	</Group>
52	<Group type="102" alignment="0" attributes="0">
53	<Component id="bracesPlacementLabel" min="-2" max="-2" attributes="0"/>
54	<EmptySpace max="-2" attributes="0"/>
55	<Component id="jSeparator1" pref="103" max="32767" attributes="0"/>
56	</Group>
57	<Group type="102" alignment="0" attributes="0">
58	<EmptySpace max="-2" attributes="0"/>
59	<Component id="classDeclLabel" min="-2" max="-2" attributes="0"/>
60	</Group>
61	<Group type="102" alignment="0" attributes="0">
62	<EmptySpace max="-2" attributes="0"/>
63	<Component id="specialElseIfCheckBox" min="-2" max="-2" attributes="0"/>
64	</Group>
65	<Group type="102" alignment="0" attributes="0">
66	<EmptySpace max="-2" attributes="0"/>
67	<Component id="ifBracesLabel" min="-2" max="-2" attributes="0"/>
68	</Group>
69	<Group type="102" alignment="0" attributes="0">
70	<EmptySpace max="-2" attributes="0"/>
71	<Component id="forBracesLabel" min="-2" max="-2" attributes="0"/>
72	</Group>
73	<Group type="102" alignment="0" attributes="0">
74	<Component id="bracesGenerationLabel" min="-2" max="-2" attributes="0"/>
75	<EmptySpace max="-2" attributes="0"/>
76	<Component id="jSeparator2" pref="98" max="32767" attributes="0"/>
77	</Group>
78	</Group>	66	</Group>
79	<EmptySpace max="-2" attributes="0"/>	67	<EmptySpace max="-2" attributes="0"/>
80	</Group>	68	</Group>

Lines 73-80 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/FmtCodeGeneration.java (-6 / +7 lines)
73	import com.sun.source.tree.Tree;	73	import com.sun.source.tree.Tree;
74	import com.sun.source.tree.TypeParameterTree;	74	import com.sun.source.tree.TypeParameterTree;
75	import com.sun.source.tree.VariableTree;	75	import com.sun.source.tree.VariableTree;
		76	import org.netbeans.api.java.source.CodeStyle;
76		77
77	import org.netbeans.api.java.source.CodeStyle;
78	import org.netbeans.api.java.source.GeneratorUtilities;	78	import org.netbeans.api.java.source.GeneratorUtilities;
79	import org.netbeans.api.java.source.JavaSource.Phase;	79	import org.netbeans.api.java.source.JavaSource.Phase;
80	import org.netbeans.api.java.source.ModificationResult;	80	import org.netbeans.api.java.source.ModificationResult;
Lines 82-90 Link Here
82	import org.netbeans.api.java.source.WorkingCopy;	82	import org.netbeans.api.java.source.WorkingCopy;
83	import org.netbeans.editor.BaseDocument;	83	import org.netbeans.editor.BaseDocument;
84	import org.netbeans.modules.editor.indent.api.Reformat;	84	import org.netbeans.modules.editor.indent.api.Reformat;
85	import static org.netbeans.modules.java.ui.FmtOptions.*;	85	import static org.netbeans.modules.java.ui.CategorySupport.OPTION_ID;
86	import org.netbeans.modules.java.ui.FmtOptions.CategorySupport;	86	import static org.netbeans.modules.java.preprocessorbridge.api.FmtConstants.*;
87	import static org.netbeans.modules.java.ui.FmtOptions.CategorySupport.OPTION_ID;
88	import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;	87	import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
89	import org.netbeans.modules.parsing.api.ResultIterator;	88	import org.netbeans.modules.parsing.api.ResultIterator;
90	import org.netbeans.modules.parsing.api.Source;	89	import org.netbeans.modules.parsing.api.Source;
Lines 649-655 Link Here
649		648
650	private CodeGenCategorySupport(Preferences preferences, JPanel panel) {	649	private CodeGenCategorySupport(Preferences preferences, JPanel panel) {
651	super(preferences, "code-generation", panel, NbBundle.getMessage(FmtCodeGeneration.class, "SAMPLE_CodeGen"), //NOI18N	650	super(preferences, "code-generation", panel, NbBundle.getMessage(FmtCodeGeneration.class, "SAMPLE_CodeGen"), //NOI18N
652	new String[] { FmtOptions.blankLinesBeforeFields, "1" }); //NOI18N	651	new String[] { blankLinesBeforeFields, "1" }); //NOI18N
653	}	652	}
654		653
655	@Override	654	@Override
Lines 709-715 Link Here
709	// ignore	708	// ignore
710	}	709	}
711		710
712	final CodeStyle codeStyle = codeStyleProducer.create(previewPrefs);	711	// XXX: CodeStyleProducer is not visible
		712	Object codeStyle = null;
		713	//final CodeStyle codeStyle = codeStyleProducer.create(previewPrefs);
713	jep.setIgnoreRepaint(true);	714	jep.setIgnoreRepaint(true);
714	try {	715	try {
715	if (source == null) {	716	if (source == null) {

Lines 47-55 Link Here

(-)a/java.source/src/org/netbeans/modules/java/ui/FmtWrapping.java (-10 / +10 lines)
47	import java.awt.event.FocusEvent;	47	import java.awt.event.FocusEvent;
48	import java.awt.event.FocusListener;	48	import java.awt.event.FocusListener;
49	import org.netbeans.api.java.source.CodeStyle;	49	import org.netbeans.api.java.source.CodeStyle;
50	import static org.netbeans.modules.java.ui.FmtOptions.*;	50	import static org.netbeans.modules.java.ui.CategorySupport.OPTION_ID;
51	import static org.netbeans.modules.java.ui.FmtOptions.CategorySupport.OPTION_ID;	51	import org.netbeans.modules.java.preprocessorbridge.api.FmtConstants;
52	import org.netbeans.modules.java.ui.FmtOptions.CategorySupport;	52	import static org.netbeans.modules.java.preprocessorbridge.api.FmtConstants.*;
53	import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;	53	import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
54		54
55		55
Lines 120-132 Link Here
120	public static PreferencesCustomizer.Factory getController() {	120	public static PreferencesCustomizer.Factory getController() {
121	return new CategorySupport.Factory("wrapping", FmtWrapping.class, //NOI18N	121	return new CategorySupport.Factory("wrapping", FmtWrapping.class, //NOI18N
122	org.openide.util.NbBundle.getMessage(FmtWrapping.class, "SAMPLE_Wrapping"), //NOI18N	122	org.openide.util.NbBundle.getMessage(FmtWrapping.class, "SAMPLE_Wrapping"), //NOI18N
123	new String[] { FmtOptions.rightMargin, "35" }, //NOI18N	123	new String[] { FmtConstants.rightMargin, "35" }, //NOI18N
124	new String[] { FmtOptions.redundantDoWhileBraces, CodeStyle.BracesGenerationStyle.LEAVE_ALONE.name() },	124	new String[] { FmtConstants.redundantDoWhileBraces, CodeStyle.BracesGenerationStyle.LEAVE_ALONE.name() },
125	new String[] { FmtOptions.redundantForBraces, CodeStyle.BracesGenerationStyle.LEAVE_ALONE.name() },	125	new String[] { FmtConstants.redundantForBraces, CodeStyle.BracesGenerationStyle.LEAVE_ALONE.name() },
126	new String[] { FmtOptions.redundantIfBraces, CodeStyle.BracesGenerationStyle.LEAVE_ALONE.name() },	126	new String[] { FmtConstants.redundantIfBraces, CodeStyle.BracesGenerationStyle.LEAVE_ALONE.name() },
127	new String[] { FmtOptions.redundantWhileBraces, CodeStyle.BracesGenerationStyle.LEAVE_ALONE.name() },	127	new String[] { FmtConstants.redundantWhileBraces, CodeStyle.BracesGenerationStyle.LEAVE_ALONE.name() },
128	new String[] { FmtOptions.blankLinesBeforeClass, "0" },	128	new String[] { FmtConstants.blankLinesBeforeClass, "0" },
129	new String[] { FmtOptions.blankLinesAfterMethods, "1" }	129	new String[] { FmtConstants.blankLinesAfterMethods, "1" }
130	); // NOI18N	130	); // NOI18N
131	}	131	}
132		132

Line 0 Link Here

(-)a/java.kit/test/qa-functional/src/org/netbeans/test/ide/VerifyJavaSourceDependenciesTest.java (+101 lines)
		1	/*
		2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		3	*
		4	* Copyright 2012 Oracle and/or its affiliates. All rights reserved.
		5	*
		6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
		7	* Other names may be trademarks of their respective owners.
		8	*
		9	* The contents of this file are subject to the terms of either the GNU
		10	* General Public License Version 2 only ("GPL") or the Common
		11	* Development and Distribution License("CDDL") (collectively, the
		12	* "License"). You may not use this file except in compliance with the
		13	* License. You can obtain a copy of the License at
		14	* http://www.netbeans.org/cddl-gplv2.html
		15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		16	* specific language governing permissions and limitations under the
		17	* License. When distributing the software, include this License Header
		18	* Notice in each file and include the License file at
		19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
		20	* particular file as subject to the "Classpath" exception as provided
		21	* by Oracle in the GPL Version 2 section of the License file that
		22	* accompanied this code. If applicable, add the following below the
		23	* License Header, with the fields enclosed by brackets [] replaced by
		24	* your own identifying information:
		25	* "Portions Copyrighted [year] [name of copyright owner]"
		26	*
		27	* If you wish your version of this file to be governed by only the CDDL
		28	* or only the GPL Version 2, indicate your decision by adding
		29	* "[Contributor] elects to include this software in this distribution
		30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
		31	* single choice of license, a recipient has the option to distribute
		32	* your version of this file under either the CDDL, the GPL Version 2 or
		33	* to extend the choice of license to its licensees as provided above.
		34	* However, if you add GPL Version 2 code and therefore, elected the GPL
		35	* Version 2 license, then the option applies only if the new code is
		36	* made subject to such option by the copyright holder.
		37	*
		38	* Contributor(s):
		39	*
		40	* Portions Copyrighted 2012 Sun Microsystems, Inc.
		41	*/
		42	package org.netbeans.test.ide;
		43
		44	import junit.framework.Test;
		45	import org.netbeans.api.java.source.JavaSource;
		46	import org.netbeans.junit.NbModuleSuite;
		47	import org.netbeans.junit.NbTestCase;
		48	import org.openide.modules.ModuleInfo;
		49	import org.openide.modules.Modules;
		50	import org.openide.util.Lookup;
		51
		52	/**
		53	*
		54	* @author Jaroslav Tulach <jtulach@netbeans.org>
		55	*/
		56	public class VerifyJavaSourceDependenciesTest extends NbTestCase {
		57	public VerifyJavaSourceDependenciesTest(String n) {
		58	super(n);
		59	}
		60
		61	public static Test suite() {
		62	return NbModuleSuite.emptyConfiguration().
		63	honorAutoloadEager(true).
		64	enableClasspathModules(false).gui(false).
65	addTest(VerifyJavaSourceDependenciesTest.class).
66	clusters("ide\|java").
67	autoloadModules("ide", ".*").
68	autoloadModules("java", ".*").
69	enableModules("java", "org.netbeans.modules.java.source").suite();
70	}
71
72	public void testJavaSourceEnabled() {
73	ModuleInfo mi = Modules.getDefault().ownerOf(JavaSource.class);
74	assertTrue("Module is enabled", mi.isEnabled());
75	}
76
77	public void testEditorDisabled() {
78	StringBuilder sb = new StringBuilder();
79	for (ModuleInfo mi : Lookup.getDefault().lookupAll(ModuleInfo.class)) {
80	if (mi.getCodeNameBase().contains("mimelookup")) {
81	continue;
82	}
83	if (mi.getCodeNameBase().equals("org.netbeans.modules.editor.util")) {
84	// this one is lightweight
85	continue;
86	}
87	if (mi.getCodeNameBase().equals("org.netbeans.modules.editor.guards")) {
88	// this one is lightweight and already in JDev anyway
89	continue;
90	}
91	if (mi.getCodeNameBase().contains("editor")) {
92	if (mi.isEnabled()) {
93	sb.append(mi.getCodeNameBase()).append('\n');
94	}
95	}
96	}
97	if (sb.length() > 0) {
98	fail("Enabled editor module:\n" + sb);
99	}
100	}
101	}

Line 0 Link Here

(-)a/java.preprocessorbridge/src/org/netbeans/modules/java/preprocessorbridge/api/FmtConstants.java (+248 lines)
		1	/*
		2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		3	*
		4	* Copyright 2012 Oracle and/or its affiliates. All rights reserved.
		5	*
		6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
		7	* Other names may be trademarks of their respective owners.
		8	*
		9	* The contents of this file are subject to the terms of either the GNU
		10	* General Public License Version 2 only ("GPL") or the Common
		11	* Development and Distribution License("CDDL") (collectively, the
		12	* "License"). You may not use this file except in compliance with the
		13	* License. You can obtain a copy of the License at
		14	* http://www.netbeans.org/cddl-gplv2.html
		15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		16	* specific language governing permissions and limitations under the
		17	* License. When distributing the software, include this License Header
		18	* Notice in each file and include the License file at
		19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
		20	* particular file as subject to the "Classpath" exception as provided
		21	* by Oracle in the GPL Version 2 section of the License file that
		22	* accompanied this code. If applicable, add the following below the
		23	* License Header, with the fields enclosed by brackets [] replaced by
		24	* your own identifying information:
		25	* "Portions Copyrighted [year] [name of copyright owner]"
		26	*
		27	* If you wish your version of this file to be governed by only the CDDL
		28	* or only the GPL Version 2, indicate your decision by adding
		29	* "[Contributor] elects to include this software in this distribution
		30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
		31	* single choice of license, a recipient has the option to distribute
		32	* your version of this file under either the CDDL, the GPL Version 2 or
		33	* to extend the choice of license to its licensees as provided above.
		34	* However, if you add GPL Version 2 code and therefore, elected the GPL
		35	* Version 2 license, then the option applies only if the new code is
		36	* made subject to such option by the copyright holder.
		37	*
		38	* Contributor(s):
		39	*
		40	* Portions Copyrighted 2012 Sun Microsystems, Inc.
		41	*/
		42	package org.netbeans.modules.java.preprocessorbridge.api;
		43
		44	import org.netbeans.api.editor.settings.SimpleValueNames;
		45	import org.openide.util.Lookup;
		46
		47	/**
		48	*
		49	* @author Jaroslav Tulach <jtulach@netbeans.org>
		50	*/
		51	public abstract class FmtConstants {
		52	public static final String expandTabToSpaces = SimpleValueNames.EXPAND_TABS;
		53	public static final String tabSize = SimpleValueNames.TAB_SIZE;
		54	public static final String spacesPerTab = SimpleValueNames.SPACES_PER_TAB;
		55	public static final String indentSize = SimpleValueNames.INDENT_SHIFT_WIDTH;
		56	public static final String continuationIndentSize = "continuationIndentSize"; //NOI18N
		57	public static final String labelIndent = "labelIndent"; //NOI18N
		58	public static final String absoluteLabelIndent = "absoluteLabelIndent"; //NOI18N
		59	public static final String indentTopLevelClassMembers = "indentTopLevelClassMembers"; //NOI18N
		60	public static final String indentCasesFromSwitch = "indentCasesFromSwitch"; //NOI18N
		61	public static final String rightMargin = SimpleValueNames.TEXT_LIMIT_WIDTH;
		62
		63	public static final String addLeadingStarInComment = "addLeadingStarInComment"; //NOI18N
		64
65	public static final String preferLongerNames = "preferLongerNames"; //NOI18N
66	public static final String fieldNamePrefix = "fieldNamePrefix"; //NOI18N
67	public static final String fieldNameSuffix = "fieldNameSuffix"; //NOI18N
68	public static final String staticFieldNamePrefix = "staticFieldNamePrefix"; //NOI18N
69	public static final String staticFieldNameSuffix = "staticFieldNameSuffix"; //NOI18N
70	public static final String parameterNamePrefix = "parameterNamePrefix"; //NOI18N
71	public static final String parameterNameSuffix = "parameterNameSuffix"; //NOI18N
72	public static final String localVarNamePrefix = "localVarNamePrefix"; //NOI18N
73	public static final String localVarNameSuffix = "localVarNameSuffix"; //NOI18N
74	public static final String qualifyFieldAccess = "qualifyFieldAccess"; //NOI18N
75	public static final String useIsForBooleanGetters = "useIsForBooleanGetters"; //NOI18N
76	public static final String addOverrideAnnotation = "addOverrideAnnotation"; //NOI18N
77	public static final String makeLocalVarsFinal = "makeLocalVarsFinal"; //NOI18N
78	public static final String makeParametersFinal = "makeParametersFinal"; //NOI18N
79	public static final String classMembersOrder = "classMembersOrder"; //NOI18N
80	public static final String sortMembersByVisibility = "sortMembersByVisibility"; //NOI18N
81	public static final String visibilityOrder = "visibilityOrder"; //NOI18N
82	public static final String classMemberInsertionPoint = "classMemberInsertionPoint"; //NOI18N
83
84	public static final String classDeclBracePlacement = "classDeclBracePlacement"; //NOI18N
85	public static final String methodDeclBracePlacement = "methodDeclBracePlacement"; //NOI18N
86	public static final String otherBracePlacement = "otherBracePlacement"; //NOI18N
87	public static final String specialElseIf = "specialElseIf"; //NOI18N
88	public static final String redundantIfBraces = "redundantIfBraces"; //NOI18N
89	public static final String redundantForBraces = "redundantForBraces"; //NOI18N
90	public static final String redundantWhileBraces = "redundantWhileBraces"; //NOI18N
91	public static final String redundantDoWhileBraces = "redundantDoWhileBraces"; //NOI18N
92	public static final String alignMultilineMethodParams = "alignMultilineMethodParams"; //NOI18N
93	public static final String alignMultilineCallArgs = "alignMultilineCallArgs"; //NOI18N
94	public static final String alignMultilineAnnotationArgs = "alignMultilineAnnotationArgs"; //NOI18N
95	public static final String alignMultilineImplements = "alignMultilineImplements"; //NOI18N
96	public static final String alignMultilineThrows = "alignMultilineThrows"; //NOI18N
97	public static final String alignMultilineParenthesized = "alignMultilineParenthesized"; //NOI18N
98	public static final String alignMultilineBinaryOp = "alignMultilineBinaryOp"; //NOI18N
99	public static final String alignMultilineTernaryOp = "alignMultilineTernaryOp"; //NOI18N
100	public static final String alignMultilineAssignment = "alignMultilineAssignment"; //NOI18N
101	public static final String alignMultilineTryResources = "alignMultilineTryResources"; //NOI18N
102	public static final String alignMultilineDisjunctiveCatchTypes = "alignMultilineDisjunctiveCatchTypes"; //NOI18N
103	public static final String alignMultilineFor = "alignMultilineFor"; //NOI18N
104	public static final String alignMultilineArrayInit = "alignMultilineArrayInit"; //NOI18N
105	public static final String placeElseOnNewLine = "placeElseOnNewLine"; //NOI18N
106	public static final String placeWhileOnNewLine = "placeWhileOnNewLine"; //NOI18N
107	public static final String placeCatchOnNewLine = "placeCatchOnNewLine"; //NOI18N
108	public static final String placeFinallyOnNewLine = "placeFinallyOnNewLine"; //NOI18N
109	public static final String placeNewLineAfterModifiers = "placeNewLineAfterModifiers"; //NOI18N
110
111	public static final String wrapExtendsImplementsKeyword = "wrapExtendsImplementsKeyword"; //NOI18N
112	public static final String wrapExtendsImplementsList = "wrapExtendsImplementsList"; //NOI18N
113	public static final String wrapMethodParams = "wrapMethodParams"; //NOI18N
114	public static final String wrapThrowsKeyword = "wrapThrowsKeyword"; //NOI18N
115	public static final String wrapThrowsList = "wrapThrowsList"; //NOI18N
116	public static final String wrapMethodCallArgs = "wrapMethodCallArgs"; //NOI18N
117	public static final String wrapAnnotationArgs = "wrapAnnotationArgs"; //NOI18N
118	public static final String wrapChainedMethodCalls = "wrapChainedMethodCalls"; //NOI18N
119	public static final String wrapAfterDotInChainedMethodCalls = "wrapAfterDotInChainedMethodCalls"; //NOI18N
120	public static final String wrapArrayInit = "wrapArrayInit"; //NOI18N
121	public static final String wrapTryResources = "wrapTryResources"; //NOI18N
122	public static final String wrapDisjunctiveCatchTypes = "wrapDisjunctiveCatchTypes"; //NOI18N
123	public static final String wrapFor = "wrapFor"; //NOI18N
124	public static final String wrapForStatement = "wrapForStatement"; //NOI18N
125	public static final String wrapIfStatement = "wrapIfStatement"; //NOI18N
126	public static final String wrapWhileStatement = "wrapWhileStatement"; //NOI18N
127	public static final String wrapDoWhileStatement = "wrapDoWhileStatement"; //NOI18N
128	public static final String wrapAssert = "wrapAssert"; //NOI18N
129	public static final String wrapEnumConstants = "wrapEnumConstants"; //NOI18N
130	public static final String wrapAnnotations = "wrapAnnotations"; //NOI18N
131	public static final String wrapBinaryOps = "wrapBinaryOps"; //NOI18N
132	public static final String wrapAfterBinaryOps = "wrapAfterBinaryOps"; //NOI18N
133	public static final String wrapTernaryOps = "wrapTernaryOps"; //NOI18N
134	public static final String wrapAfterTernaryOps = "wrapAfterTernaryOps"; //NOI18N
135	public static final String wrapAssignOps = "wrapAssignOps"; //NOI18N
136
137	public static final String blankLinesBeforePackage = "blankLinesBeforePackage"; //NOI18N
138	public static final String blankLinesAfterPackage = "blankLinesAfterPackage"; //NOI18N
139	public static final String blankLinesBeforeImports = "blankLinesBeforeImports"; //NOI18N
140	public static final String blankLinesAfterImports = "blankLinesAfterImports"; //NOI18N
141	public static final String blankLinesBeforeClass = "blankLinesBeforeClass"; //NOI18N
142	public static final String blankLinesAfterClass = "blankLinesAfterClass"; //NOI18N
143	public static final String blankLinesAfterClassHeader = "blankLinesAfterClassHeader"; //NOI18N
144	public static final String blankLinesAfterAnonymousClassHeader = "blankLinesAfterAnonymousClassHeader"; //NOI18N
145	public static final String blankLinesBeforeFields = "blankLinesBeforeFields"; //NOI18N
146	public static final String blankLinesAfterFields = "blankLinesAfterFields"; //NOI18N
147	public static final String blankLinesBeforeMethods = "blankLinesBeforeMethods"; //NOI18N
148	public static final String blankLinesAfterMethods = "blankLinesAfterMethods"; //NOI18N
149
150	public static final String spaceBeforeWhile = "spaceBeforeWhile"; //NOI18N
151	public static final String spaceBeforeElse = "spaceBeforeElse"; //NOI18N
152	public static final String spaceBeforeCatch = "spaceBeforeCatch"; //NOI18N
153	public static final String spaceBeforeFinally = "spaceBeforeFinally"; //NOI18N
154	public static final String spaceBeforeMethodDeclParen = "spaceBeforeMethodDeclParen"; //NOI18N
155	public static final String spaceBeforeMethodCallParen = "spaceBeforeMethodCallParen"; //NOI18N
156	public static final String spaceBeforeIfParen = "spaceBeforeIfParen"; //NOI18N
157	public static final String spaceBeforeForParen = "spaceBeforeForParen"; //NOI18N
158	public static final String spaceBeforeWhileParen = "spaceBeforeWhileParen"; //NOI18N
159	public static final String spaceBeforeTryParen = "spaceBeforeTryParen"; //NOI18N
160	public static final String spaceBeforeCatchParen = "spaceBeforeCatchParen"; //NOI18N
161	public static final String spaceBeforeSwitchParen = "spaceBeforeSwitchParen"; //NOI18N
162	public static final String spaceBeforeSynchronizedParen = "spaceBeforeSynchronizedParen"; //NOI18N
163	public static final String spaceBeforeAnnotationParen = "spaceBeforeAnnotationParen"; //NOI18N
164	public static final String spaceAroundUnaryOps = "spaceAroundUnaryOps"; //NOI18N
165	public static final String spaceAroundBinaryOps = "spaceAroundBinaryOps"; //NOI18N
166	public static final String spaceAroundTernaryOps = "spaceAroundTernaryOps"; //NOI18N
167	public static final String spaceAroundAssignOps = "spaceAroundAssignOps"; //NOI18N
168	public static final String spaceAroundAnnotationValueAssignOps = "spaceAroundAnnotationValueAssignOps"; //NOI18N
169	public static final String spaceBeforeClassDeclLeftBrace = "spaceBeforeClassDeclLeftBrace"; //NOI18N
170	public static final String spaceBeforeMethodDeclLeftBrace = "spaceBeforeMethodDeclLeftBrace"; //NOI18N
171	public static final String spaceBeforeIfLeftBrace = "spaceBeforeIfLeftBrace"; //NOI18N
172	public static final String spaceBeforeElseLeftBrace = "spaceBeforeElseLeftBrace"; //NOI18N
173	public static final String spaceBeforeWhileLeftBrace = "spaceBeforeWhileLeftBrace"; //NOI18N
174	public static final String spaceBeforeForLeftBrace = "spaceBeforeForLeftBrace"; //NOI18N
175	public static final String spaceBeforeDoLeftBrace = "spaceBeforeDoLeftBrace"; //NOI18N
176	public static final String spaceBeforeSwitchLeftBrace = "spaceBeforeSwitchLeftBrace"; //NOI18N
177	public static final String spaceBeforeTryLeftBrace = "spaceBeforeTryLeftBrace"; //NOI18N
178	public static final String spaceBeforeCatchLeftBrace = "spaceBeforeCatchLeftBrace"; //NOI18N
179	public static final String spaceBeforeFinallyLeftBrace = "spaceBeforeFinallyLeftBrace"; //NOI18N
180	public static final String spaceBeforeSynchronizedLeftBrace = "spaceBeforeSynchronizedLeftBrace"; //NOI18N
181	public static final String spaceBeforeStaticInitLeftBrace = "spaceBeforeStaticInitLeftBrace"; //NOI18N
182	public static final String spaceBeforeArrayInitLeftBrace = "spaceBeforeArrayInitLeftBrace"; //NOI18N
183	public static final String spaceWithinParens = "spaceWithinParens"; //NOI18N
184	public static final String spaceWithinMethodDeclParens = "spaceWithinMethodDeclParens"; //NOI18N
185	public static final String spaceWithinMethodCallParens = "spaceWithinMethodCallParens"; //NOI18N
186	public static final String spaceWithinIfParens = "spaceWithinIfParens"; //NOI18N
187	public static final String spaceWithinForParens = "spaceWithinForParens"; //NOI18N
188	public static final String spaceWithinWhileParens = "spaceWithinWhileParens"; //NOI18N
189	public static final String spaceWithinSwitchParens = "spaceWithinSwitchParens"; //NOI18N
190	public static final String spaceWithinTryParens = "spaceWithinTryParens"; //NOI18N
191	public static final String spaceWithinCatchParens = "spaceWithinCatchParens"; //NOI18N
192	public static final String spaceWithinSynchronizedParens = "spaceWithinSynchronizedParens"; //NOI18N
193	public static final String spaceWithinTypeCastParens = "spaceWithinTypeCastParens"; //NOI18N
194	public static final String spaceWithinAnnotationParens = "spaceWithinAnnotationParens"; //NOI18N
195	public static final String spaceWithinBraces = "spaceWithinBraces"; //NOI18N
196	public static final String spaceWithinArrayInitBrackets = "spaceWithinArrayInitBrackets"; //NOI18N
197	public static final String spaceBeforeComma = "spaceBeforeComma"; //NOI18N
198	public static final String spaceAfterComma = "spaceAfterComma"; //NOI18N
199	public static final String spaceBeforeSemi = "spaceBeforeSemi"; //NOI18N
200	public static final String spaceAfterSemi = "spaceAfterSemi"; //NOI18N
201	public static final String spaceBeforeColon = "spaceBeforeColon"; //NOI18N
202	public static final String spaceAfterColon = "spaceAfterColon"; //NOI18N
203	public static final String spaceAfterTypeCast = "spaceAfterTypeCast"; //NOI18N
204
205	public static final String useSingleClassImport = "useSingleClassImport"; //NOI18N
206	public static final String usePackageImport = "usePackageImport"; //NOI18N
207	public static final String useFQNs = "useFQNs"; //NOI18N
208	public static final String importInnerClasses = "importInnerClasses"; //NOI18N
209	public static final String allowConvertToStarImport = "allowConvertToStarImport"; //NOI18N
210	public static final String countForUsingStarImport = "countForUsingStarImport"; //NOI18N
211	public static final String allowConvertToStaticStarImport = "allowConvertToStaticStarImport"; //NOI18N
212	public static final String countForUsingStaticStarImport = "countForUsingStaticStarImport"; //NOI18N
213	public static final String packagesForStarImport = "packagesForStarImport"; //NOI18N
214	public static final String separateStaticImports = "separateStaticImports"; //NOI18N
215	public static final String importGroupsOrder = "importGroupsOrder"; //NOI18N
216	public static final String separateImportGroups = "separateImportGroups"; //NOI18N
217
218	public static final String enableCommentFormatting = "enableCommentFormatting"; //NOI18N
219	public static final String enableBlockCommentFormatting = "enableBlockCommentFormatting"; //NOI18N
220	public static final String wrapCommentText = "wrapCommentText"; //NOI18N
221	public static final String wrapOneLineComment = "wrapOneLineComment"; //NOI18N
222	public static final String preserveNewLinesInComments = "preserveNewLinesInComments"; //NOI18N
223	public static final String blankLineAfterJavadocDescription = "blankLineAfterJavadocDescription"; //NOI18N
224	public static final String blankLineAfterJavadocParameterDescriptions = "blankLineAfterJavadocParameterDescriptions"; //NOI18N
225	public static final String blankLineAfterJavadocReturnTag = "blankLineAfterJavadocReturnTag"; //NOI18N
226	public static final String generateParagraphTagOnBlankLines = "generateParagraphTagOnBlankLines"; //NOI18N
227	public static final String alignJavadocParameterDescriptions = "alignJavadocParameterDescriptions"; //NOI18N
228	public static final String alignJavadocReturnDescription = "alignJavadocReturnDescription"; //NOI18N
229	public static final String alignJavadocExceptionDescriptions = "alignJavadocExceptionDescriptions"; //NOI18N
230	public static String JAVA_MIME_TYPE = "text/x-java"; // NOI18N
231
232	public static int getDefaultAsInt(String key) {
233	return Lookup.getDefault().lookup(FmtConstants.class).defaultAsInt(key);
234	}
235
236	public static boolean getDefaultAsBoolean(String key) {
237	return Lookup.getDefault().lookup(FmtConstants.class).defaultAsBoolean(key);
238	}
239
240	public static String getDefaultAsString(String key) {
241	return Lookup.getDefault().lookup(FmtConstants.class).defaultAsString(key);
242	}
243
244	protected abstract int defaultAsInt(String key);
245	protected abstract boolean defaultAsBoolean(String key);
246	protected abstract String defaultAsString(String key);
247
248	}

Lines 141-183 Link Here

(-)a/java.source/nbproject/project.xml (-56 / +11 lines)
141	<compile-dependency/>	141	<compile-dependency/>
142	<run-dependency>	142	<run-dependency>
143	<release-version>1</release-version>	143	<release-version>1</release-version>
144	<specification-version>1.0</specification-version>	144	<specification-version>1.17</specification-version>
145	</run-dependency>
146	</dependency>
147	<dependency>
148	<code-name-base>org.netbeans.modules.editor.indent</code-name-base>
149	<build-prerequisite/>
150	<compile-dependency/>
151	<run-dependency>
152	<release-version>2</release-version>
153	<specification-version>1.11</specification-version>
154	</run-dependency>
155	</dependency>
156	<dependency>
157	<code-name-base>org.netbeans.modules.editor.indent.project</code-name-base>
158	<build-prerequisite/>
159	<compile-dependency/>
160	<run-dependency>
161	<release-version>0-1</release-version>
162	<specification-version>1.0</specification-version>
163	</run-dependency>
164	</dependency>
165	<dependency>
166	<code-name-base>org.netbeans.modules.editor.lib</code-name-base>
167	<build-prerequisite/>
168	<compile-dependency/>
169	<run-dependency>
170	<release-version>3</release-version>
171	<specification-version>3.1</specification-version>
172	</run-dependency>
173	</dependency>
174	<dependency>
175	<code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
176	<build-prerequisite/>
177	<compile-dependency/>
178	<run-dependency>
179	<release-version>1</release-version>
180	<specification-version>1.11</specification-version>
181	</run-dependency>	145	</run-dependency>
182	</dependency>	146	</dependency>
183	<dependency>	147	<dependency>
Lines 190-210 Link Here
190	</run-dependency>	154	</run-dependency>
191	</dependency>	155	</dependency>
192	<dependency>	156	<dependency>
193	<code-name-base>org.netbeans.modules.editor.settings</code-name-base>
194	<build-prerequisite/>
195	<compile-dependency/>
196	<run-dependency>
197	<release-version>1</release-version>
198	<specification-version>1.18</specification-version>
199	</run-dependency>
200	</dependency>
201	<dependency>
202	<code-name-base>org.netbeans.modules.editor.util</code-name-base>	157	<code-name-base>org.netbeans.modules.editor.util</code-name-base>
203	<build-prerequisite/>	158	<build-prerequisite/>
204	<compile-dependency/>	159	<compile-dependency/>
205	<run-dependency>	160	<run-dependency>
206	<release-version>1</release-version>	161	<release-version>1</release-version>
207	<specification-version>1.22</specification-version>	162	<specification-version>1.49</specification-version>
208	</run-dependency>	163	</run-dependency>
209	</dependency>	164	</dependency>
210	<dependency>	165	<dependency>
Lines 252-266 Link Here
252	</run-dependency>	207	</run-dependency>
253	</dependency>	208	</dependency>
254	<dependency>	209	<dependency>
255	<code-name-base>org.netbeans.modules.options.editor</code-name-base>
256	<build-prerequisite/>
257	<compile-dependency/>
258	<run-dependency>
259	<release-version>1</release-version>
260	<specification-version>1.20</specification-version>
261	</run-dependency>
262	</dependency>
263	<dependency>
264	<code-name-base>org.netbeans.modules.parsing.api</code-name-base>	210	<code-name-base>org.netbeans.modules.parsing.api</code-name-base>
265	<build-prerequisite/>	211	<build-prerequisite/>
266	<compile-dependency/>	212	<compile-dependency/>
Lines 402-407 Link Here
402	<specification-version>6.2</specification-version>	348	<specification-version>6.2</specification-version>
403	</run-dependency>	349	</run-dependency>
404	</dependency>	350	</dependency>
		351	<dependency>
		352	<code-name-base>org.netbeans.modules.editor.settings</code-name-base>
		353	<build-prerequisite/>
		354	<compile-dependency/>
		355	<run-dependency>
		356	<release-version>1</release-version>
		357	<specification-version>1.43</specification-version>
		358	</run-dependency>
		359	</dependency>
405	</module-dependencies>	360	</module-dependencies>
406	<test-dependencies>	361	<test-dependencies>
407	<test-type>	362	<test-type>

Lines 62-69 Link Here

(-)a/java.source/src/org/netbeans/api/java/source/support/OpenedEditors.java (-3 / +3 lines)
62	import javax.swing.event.ChangeListener;	62	import javax.swing.event.ChangeListener;
63	import javax.swing.text.Document;	63	import javax.swing.text.Document;
64	import javax.swing.text.JTextComponent;	64	import javax.swing.text.JTextComponent;
65	import org.netbeans.api.editor.EditorRegistry;
66	import org.netbeans.api.java.source.JavaSource;	65	import org.netbeans.api.java.source.JavaSource;
		66	import org.netbeans.modules.java.preprocessorbridge.spi.TalkToEditor;
67	import org.netbeans.modules.java.source.JavaSourceSupportAccessor;	67	import org.netbeans.modules.java.source.JavaSourceSupportAccessor;
68	import org.openide.filesystems.FileObject;	68	import org.openide.filesystems.FileObject;
69	import org.openide.filesystems.FileUtil;	69	import org.openide.filesystems.FileUtil;
Lines 84-90 Link Here
84	private static OpenedEditors DEFAULT;	84	private static OpenedEditors DEFAULT;
85		85
86	private OpenedEditors() {	86	private OpenedEditors() {
87	EditorRegistry.addPropertyChangeListener(new PropertyChangeListener() {	87	TalkToEditor.addEditorRegistryListener(new PropertyChangeListener() {
88	public void propertyChange(PropertyChangeEvent evt) {	88	public void propertyChange(PropertyChangeEvent evt) {
89	stateChanged();	89	stateChanged();
90	}	90	}
Lines 157-163 Link Here
157		157
158	visibleEditors.clear();	158	visibleEditors.clear();
159		159
160	JTextComponent editor = EditorRegistry.lastFocusedComponent();	160	JTextComponent editor = TalkToEditor.findLastFocusedComponent();
161		161
162	DataObject file = editor != null ? getDataObject(editor) : null;	162	DataObject file = editor != null ? getDataObject(editor) : null;
163		163

Lines 41-59 Link Here

(-)a/java.source/src/org/netbeans/modules/java/classfile/SideBarFactoryImpl.java (-4 / +4 lines)
41	import javax.swing.JComponent;	41	import javax.swing.JComponent;
42	import javax.swing.text.Document;	42	import javax.swing.text.Document;
43	import javax.swing.text.JTextComponent;	43	import javax.swing.text.JTextComponent;
44	import org.netbeans.editor.SideBarFactory;	44	//import org.netbeans.editor.SideBarFactory;
45	import org.openide.filesystems.FileObject;	45	import org.openide.filesystems.FileObject;
46	import org.openide.filesystems.FileStateInvalidException;	46	import org.openide.filesystems.FileStateInvalidException;
47	import org.openide.loaders.DataObject;	47	import org.openide.loaders.DataObject;
48	import org.openide.util.Exceptions;	48	import org.openide.util.Exceptions;
49		49
50	/**	50	/** XXX: probably move to java.editor (?)
51	*	51	*
52	* @author lahvac	52	* @author lahvac
53	*/	53	*/
54	public class SideBarFactoryImpl implements SideBarFactory {	54	public class SideBarFactoryImpl /* implements SideBarFactory*/ {
55		55
56	@Override	56	// @Override
57	public JComponent createSideBar(JTextComponent target) {	57	public JComponent createSideBar(JTextComponent target) {
58	Document doc = target.getDocument();	58	Document doc = target.getDocument();
59	FileObject originFile;	59	FileObject originFile;

Lines 58-67 Link Here

(-)a/java.source/src/org/netbeans/modules/java/source/save/Reformatter.java (-4 / +6 lines)
58	import org.netbeans.api.lexer.Token;	58	import org.netbeans.api.lexer.Token;
59	import org.netbeans.api.lexer.TokenHierarchy;	59	import org.netbeans.api.lexer.TokenHierarchy;
60	import org.netbeans.api.lexer.TokenSequence;	60	import org.netbeans.api.lexer.TokenSequence;
		61	/* XXX: Where to with reformatter?
61	import org.netbeans.editor.GuardedDocument;	62	import org.netbeans.editor.GuardedDocument;
62	import org.netbeans.modules.editor.indent.spi.Context;	63	import org.netbeans.modules.editor.indent.spi.Context;
63	import org.netbeans.modules.editor.indent.spi.ExtraLock;	64	import org.netbeans.modules.editor.indent.spi.ExtraLock;
64	import org.netbeans.modules.editor.indent.spi.ReformatTask;	65	import org.netbeans.modules.editor.indent.spi.ReformatTask;
		66	*/
65	import org.netbeans.modules.java.source.JavaSourceAccessor;	67	import org.netbeans.modules.java.source.JavaSourceAccessor;
66	import org.netbeans.modules.java.source.parsing.FileObjects;	68	import org.netbeans.modules.java.source.parsing.FileObjects;
67	import org.netbeans.modules.java.source.parsing.JavacParser;	69	import org.netbeans.modules.java.source.parsing.JavacParser;
Lines 80-86 Link Here
80	*	82	*
81	* @author Dusan Balek	83	* @author Dusan Balek
82	*/	84	*/
83	public class Reformatter implements ReformatTask {	85	public class Reformatter { /*implements ReformatTask {
84		86
85	private static final Object CT_HANDLER_DOC_PROPERTY = "code-template-insert-handler"; // NOI18N	87	private static final Object CT_HANDLER_DOC_PROPERTY = "code-template-insert-handler"; // NOI18N
86		88
Lines 145-151 Link Here
145	for (Context.Region region : indentRegions)	147	for (Context.Region region : indentRegions)
146	reformatImpl(region, cs);	148	reformatImpl(region, cs);
147	}	149	}
148		150	*/
149	public static String reformat(String text, CodeStyle style) {	151	public static String reformat(String text, CodeStyle style) {
150	return reformat(text, style, style.getRightMargin());	152	return reformat(text, style, style.getRightMargin());
151	}	153	}
Lines 175-181 Link Here
175	}	177	}
176	return sb.toString();	178	return sb.toString();
177	}	179	}
178		180	/*
179	private void reformatImpl(Context.Region region, CodeStyle cs) throws BadLocationException {	181	private void reformatImpl(Context.Region region, CodeStyle cs) throws BadLocationException {
180	boolean templateEdit = doc.getProperty(CT_HANDLER_DOC_PROPERTY) != null;	182	boolean templateEdit = doc.getProperty(CT_HANDLER_DOC_PROPERTY) != null;
181	int startOffset = region.getStartOffset();	183	int startOffset = region.getStartOffset();
Lines 367-373 Link Here
367	return source != null ? new Reformatter(source, context) : null;	369	return source != null ? new Reformatter(source, context) : null;
368	}	370	}
369	}	371	}
370		372	*/
371	private static class Pretty extends TreePathScanner<Boolean, Void> {	373	private static class Pretty extends TreePathScanner<Boolean, Void> {
372		374
373	private static final String OPERATOR = "operator"; //NOI18N	375	private static final String OPERATOR = "operator"; //NOI18N

Lines 39-45 Link Here

(-)a/java.source/src/org/netbeans/modules/java/source/save/Reindenter.java (-2 / +4 lines)
39	package org.netbeans.modules.java.source.save;	39	package org.netbeans.modules.java.source.save;
40		40
41	import com.sun.source.tree.AnnotationTree;	41	import com.sun.source.tree.AnnotationTree;
42	import com.sun.source.tree.BinaryTree;
43	import com.sun.source.tree.BlockTree;	42	import com.sun.source.tree.BlockTree;
44	import com.sun.source.tree.CaseTree;	43	import com.sun.source.tree.CaseTree;
45	import com.sun.source.tree.ClassTree;	44	import com.sun.source.tree.ClassTree;
Lines 89-98 Link Here
89	import org.netbeans.api.java.source.CodeStyle;	88	import org.netbeans.api.java.source.CodeStyle;
90	import org.netbeans.api.lexer.TokenHierarchy;	89	import org.netbeans.api.lexer.TokenHierarchy;
91	import org.netbeans.api.lexer.TokenSequence;	90	import org.netbeans.api.lexer.TokenSequence;
		91	/* XXX: Where to put the Reindenter?
92	import org.netbeans.modules.editor.indent.spi.Context;	92	import org.netbeans.modules.editor.indent.spi.Context;
93	import org.netbeans.modules.editor.indent.spi.Context.Region;	93	import org.netbeans.modules.editor.indent.spi.Context.Region;
94	import org.netbeans.modules.editor.indent.spi.ExtraLock;	94	import org.netbeans.modules.editor.indent.spi.ExtraLock;
95	import org.netbeans.modules.editor.indent.spi.IndentTask;	95	import org.netbeans.modules.editor.indent.spi.IndentTask;
		96	*/
96	import org.netbeans.modules.java.source.parsing.FileObjects;	97	import org.netbeans.modules.java.source.parsing.FileObjects;
97	import org.netbeans.modules.java.source.parsing.JavacParser;	98	import org.netbeans.modules.java.source.parsing.JavacParser;
98		99
Lines 100-106 Link Here
100	*	101	*
101	* @author Dusan Balek	102	* @author Dusan Balek
102	*/	103	*/
103	public class Reindenter implements IndentTask {	104	public class Reindenter { /*implements IndentTask {
104		105
105	private final Context context;	106	private final Context context;
106	private CodeStyle cs;	107	private CodeStyle cs;
Lines 920-923 Link Here
920	? new Reindenter(context) : null;	921	? new Reindenter(context) : null;
921	}	922	}
922	}	923	}
		924	*/
923	}	925	}