Attachment #143727 for bug #182513

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




    
    // from org.netbeans.api.java.source.CodeStyle
    private int getIndentSize() {
        int indentLevel;
        Integer indentLevelInteger = (Integer) docView.getDocument().getProperty(SimpleValueNames.INDENT_SHIFT_WIDTH);
        if (indentLevelInteger != null && indentLevelInteger > 0) {
            return indentLevelInteger;
        }
        int indentLevel = prefs.getInt(SimpleValueNames.INDENT_SHIFT_WIDTH, 0);
        if (indentLevel > 0) {
            return indentLevel;
        }
        Boolean expandTabsBoolean = (Boolean) docView.getDocument().getProperty(SimpleValueNames.EXPAND_TABS);
        if (expandTabsBoolean != null) {
            if (Boolean.TRUE.equals(expandTabsBoolean)) {
                indentLevelInteger = (Integer) docView.getDocument().getProperty(SimpleValueNames.SPACES_PER_TAB);
                if (indentLevelInteger == null) {
                    return prefs.getInt(SimpleValueNames.SPACES_PER_TAB, EditorPreferencesDefaults.defaultSpacesPerTab);
                }
            } else {
                indentLevelInteger = (Integer) docView.getDocument().getProperty(SimpleValueNames.TAB_SIZE);
                if (indentLevelInteger == null) {
                    return prefs.getInt(SimpleValueNames.TAB_SIZE, EditorPreferencesDefaults.defaultTabSize);
        if (indentLevelInteger != null) {
           indentLevel = indentLevelInteger;
        } else {
            indentLevel = prefs.getInt(SimpleValueNames.INDENT_SHIFT_WIDTH, 0);
            if (indentLevel <= 0) {
                boolean expandTabs = prefs.getBoolean(SimpleValueNames.EXPAND_TABS, EditorPreferencesDefaults.defaultExpandTabs);
                if (expandTabs) {
                    indentLevel = prefs.getInt(SimpleValueNames.SPACES_PER_TAB, EditorPreferencesDefaults.defaultSpacesPerTab);
                } else {
                    indentLevel = prefs.getInt(SimpleValueNames.TAB_SIZE, EditorPreferencesDefaults.defaultTabSize);
                }
            }
            return indentLevelInteger;
        }
        boolean expandTabs = prefs.getBoolean(SimpleValueNames.EXPAND_TABS, EditorPreferencesDefaults.defaultExpandTabs);
        if (expandTabs) {
            indentLevel = prefs.getInt(SimpleValueNames.SPACES_PER_TAB, EditorPreferencesDefaults.defaultSpacesPerTab);
        } else {
            indentLevel = prefs.getInt(SimpleValueNames.TAB_SIZE, EditorPreferencesDefaults.defaultTabSize);
        }
        return indentLevel;
    }
    

Return to bug 182513

Lines 1120-1149 Link Here

(-)a/editor.lib2/src/org/netbeans/modules/editor/lib2/view/DocumentViewOp.java (-17 / +22 lines)
1120		1120
1121	// from org.netbeans.api.java.source.CodeStyle	1121	// from org.netbeans.api.java.source.CodeStyle
1122	private int getIndentSize() {	1122	private int getIndentSize() {
1123	int indentLevel;
1124	Integer indentLevelInteger = (Integer) docView.getDocument().getProperty(SimpleValueNames.INDENT_SHIFT_WIDTH);	1123	Integer indentLevelInteger = (Integer) docView.getDocument().getProperty(SimpleValueNames.INDENT_SHIFT_WIDTH);
1125	if (indentLevelInteger == null \|\| indentLevelInteger <= 0) {	1124	if (indentLevelInteger != null && indentLevelInteger > 0) {
1126	Boolean expandTabs = (Boolean) docView.getDocument().getProperty(SimpleValueNames.EXPAND_TABS);	1125	return indentLevelInteger;
1127	if (Boolean.TRUE.equals(expandTabs)) {	1126	}
		1127	int indentLevel = prefs.getInt(SimpleValueNames.INDENT_SHIFT_WIDTH, 0);
		1128	if (indentLevel > 0) {
		1129	return indentLevel;
		1130	}
		1131	Boolean expandTabsBoolean = (Boolean) docView.getDocument().getProperty(SimpleValueNames.EXPAND_TABS);
		1132	if (expandTabsBoolean != null) {
		1133	if (Boolean.TRUE.equals(expandTabsBoolean)) {
1128	indentLevelInteger = (Integer) docView.getDocument().getProperty(SimpleValueNames.SPACES_PER_TAB);	1134	indentLevelInteger = (Integer) docView.getDocument().getProperty(SimpleValueNames.SPACES_PER_TAB);
		1135	if (indentLevelInteger == null) {
		1136	return prefs.getInt(SimpleValueNames.SPACES_PER_TAB, EditorPreferencesDefaults.defaultSpacesPerTab);
		1137	}
1129	} else {	1138	} else {
1130	indentLevelInteger = (Integer) docView.getDocument().getProperty(SimpleValueNames.TAB_SIZE);	1139	indentLevelInteger = (Integer) docView.getDocument().getProperty(SimpleValueNames.TAB_SIZE);
1131	}	1140	if (indentLevelInteger == null) {
1132	}	1141	return prefs.getInt(SimpleValueNames.TAB_SIZE, EditorPreferencesDefaults.defaultTabSize);
1133	if (indentLevelInteger != null) {
1134	indentLevel = indentLevelInteger;
1135	} else {
1136	indentLevel = prefs.getInt(SimpleValueNames.INDENT_SHIFT_WIDTH, 0);
1137	if (indentLevel <= 0) {
1138	boolean expandTabs = prefs.getBoolean(SimpleValueNames.EXPAND_TABS, EditorPreferencesDefaults.defaultExpandTabs);
1139	if (expandTabs) {
1140	indentLevel = prefs.getInt(SimpleValueNames.SPACES_PER_TAB, EditorPreferencesDefaults.defaultSpacesPerTab);
1141	} else {
1142	indentLevel = prefs.getInt(SimpleValueNames.TAB_SIZE, EditorPreferencesDefaults.defaultTabSize);
1143	}	1142	}
1144	}	1143	}
		1144	return indentLevelInteger;
1145	}	1145	}
1146		1146	boolean expandTabs = prefs.getBoolean(SimpleValueNames.EXPAND_TABS, EditorPreferencesDefaults.defaultExpandTabs);
		1147	if (expandTabs) {
		1148	indentLevel = prefs.getInt(SimpleValueNames.SPACES_PER_TAB, EditorPreferencesDefaults.defaultSpacesPerTab);
		1149	} else {
		1150	indentLevel = prefs.getInt(SimpleValueNames.TAB_SIZE, EditorPreferencesDefaults.defaultTabSize);
		1151	}
1147	return indentLevel;	1152	return indentLevel;
1148	}	1153	}
1149		1154