MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Per-language code style settings: Wrapping and braces panel, other important fixes

Browse Source
This commit is contained in:
Rustam.Vishnyakov
2010-09-02 13:21:49 +04:00
parent ecb5797e93
commit b169e398b0
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesPanel.java
+1 -1
View File
@@ -288,8 +288,8 @@ public class CodeStyleBlankLinesPanel extends MultilanguageCodeStyleAbstractPane
public void setValue(int fieldValue) {
if (fieldValue != myCurrValue) {
myTextField.setText(String.valueOf(fieldValue));
myCurrValue = fieldValue;
myTextField.setText(String.valueOf(fieldValue));
}
}
}
platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java
+11 -4
View File
@@ -21,6 +21,7 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.Comparing;
import com.intellij.psi.PsiFile;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
import com.intellij.psi.codeStyle.CustomCodeStyleSettings;
import com.intellij.ui.ScrollPaneFactory;
import com.intellij.ui.treeStructure.treetable.ListTreeTableModel;
@@ -167,6 +168,10 @@ public abstract class OptionTableWithPreviewPanel extends MultilanguageCodeStyle
@Override
protected void onLanguageChange(Language language) {
if (myTreeTable.isEditing()) {
myTreeTable.getCellEditor().stopCellEditing();
}
resetImpl(getSettings());
myTreeTable.repaint();
}
@@ -458,16 +463,17 @@ public abstract class OptionTableWithPreviewPanel extends MultilanguageCodeStyle
}
private Object getSettingsValue(Object key, final CodeStyleSettings settings) {
CommonCodeStyleSettings commonSettings = settings.getCommonSettings(getSelectedLanguage());
try {
if (key instanceof BooleanOptionKey) {
Field field = (Field)myKeyToFieldMap.get(key);
return field.getBoolean(settings) ? Boolean.TRUE : Boolean.FALSE;
return field.getBoolean(commonSettings) ? Boolean.TRUE : Boolean.FALSE;
}
else if (key instanceof SelectionOptionKey) {
Field field = (Field)myKeyToFieldMap.get(key);
SelectionOptionKey intKey = (SelectionOptionKey)key;
int[] values = intKey.values;
int value = field.getInt(settings);
int value = field.getInt(commonSettings);
for (int i = 0; i < values.length; i++) {
if (values[i] == value) return intKey.options[i];
}
@@ -480,10 +486,11 @@ public abstract class OptionTableWithPreviewPanel extends MultilanguageCodeStyle
}
public void setSettingsValue(Object key, Object value, final CodeStyleSettings settings) {
CommonCodeStyleSettings commonSettings = settings.getCommonSettings(getSelectedLanguage());
try {
if (key instanceof BooleanOptionKey) {
Field field = (Field)myKeyToFieldMap.get(key);
field.setBoolean(settings, ((Boolean)value).booleanValue());
field.setBoolean(commonSettings, ((Boolean)value).booleanValue());
}
else if (key instanceof SelectionOptionKey) {
Field field = (Field)myKeyToFieldMap.get(key);
@@ -491,7 +498,7 @@ public abstract class OptionTableWithPreviewPanel extends MultilanguageCodeStyle
int[] values = intKey.values;
for (int i = 0; i < values.length; i++) {
if (intKey.options[i].equals(value)) {
field.setInt(settings, values[i]);
field.setInt(commonSettings, values[i]);
return;
}
}