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

IDEA-145406 Resource Bundle editor: Undo operations for property add works incorrectly. Partially fixed

Browse Source
This commit is contained in:
Dmitry Batkovich
2015-09-30 14:15:09 +03:00
parent 16f28ab22e
commit ea24b548d6
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleEditor.java
+5 -3
View File
@@ -534,6 +534,7 @@ public class ResourceBundleEditor extends UserDataHolderBase implements FileEdit
((CardLayout)myValuesPanel.getLayout()).show(myValuesPanel, propertyName == null ? NO_PROPERTY_SELECTED : VALUES);
if (propertyName == null) return;
final UndoManagerImpl undoManager = (UndoManagerImpl)UndoManager.getInstance(myProject);
for (final PropertiesFile propertiesFile : myResourceBundle.getPropertiesFiles()) {
final EditorEx editor = (EditorEx)myEditors.get(propertiesFile);
if (editor == null) continue;
@@ -545,19 +546,20 @@ public class ResourceBundleEditor extends UserDataHolderBase implements FileEdit
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
public void run() {
final UndoManagerImpl undoManager = (UndoManagerImpl)UndoManager.getInstance(myProject);
if (!checkIsUnderUndoRedoAction || !undoManager.isActive() || !(undoManager.isRedoInProgress() || undoManager.isUndoInProgress())) {
if (!checkIsUnderUndoRedoAction ||
!undoManager.isActive() ||
!(undoManager.isRedoInProgress() || undoManager.isUndoInProgress())) {
updateDocumentFromPropertyValue(getPropertyEditorValue(property), document, propertiesFile);
}
}
});
}
}, "", this);
JPanel titledPanel = myTitledPanels.get(propertiesFile);
((TitledBorder)titledPanel.getBorder()).setTitleColor(property == null ? JBColor.RED : UIUtil.getLabelTextForeground());
titledPanel.repaint();
}
undoManager.flushCurrentCommandMerger();
}
private void installPropertiesChangeListeners() {