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

Color & Fonts panel: generate new name when copy

Browse Source
This commit is contained in:
Sergey Ignatov
2014-06-04 16:12:23 +04:00
parent 6cc553fe50
commit 83d5484aa0
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/application/options/codeStyle/ManageCodeStyleSchemesDialog.java
+1 -1
View File
@@ -479,7 +479,7 @@ public class ManageCodeStyleSchemesDialog extends DialogWrapper {
for (CodeStyleScheme scheme : schemes) {
names.add(scheme.getName());
}
SaveSchemeDialog saveDialog = new SaveSchemeDialog(myParent, ApplicationBundle.message("title.save.code.style.scheme.as"), names);
SaveSchemeDialog saveDialog = new SaveSchemeDialog(myParent, ApplicationBundle.message("title.save.code.style.scheme.as"), names, "");
saveDialog.show();
if (saveDialog.isOK()) {
int row = mySchemesTableModel.createNewScheme(getSelectedScheme(), saveDialog.getSchemeName());
platform/lang-impl/src/com/intellij/application/options/colors/SchemesPanel.java
+11 -5
View File
@@ -29,6 +29,8 @@ import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.options.SchemesManager;
import com.intellij.util.Consumer;
import com.intellij.util.EventDispatcher;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.text.UniqueNameGenerator;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
@@ -204,14 +206,18 @@ public class SchemesPanel extends JPanel implements SkipSelfSearchComponent {
}
private void showSaveAsDialog() {
ArrayList<String> names = new ArrayList<String>();
EditorColorsScheme[] allSchemes = EditorColorsManager.getInstance().getAllSchemes();
ComboBoxModel model = mySchemeComboBox.getModel();
for (EditorColorsScheme scheme : allSchemes) {
names.add(scheme.getName());
int size = model.getSize();
ArrayList<String> names = ContainerUtil.newArrayListWithCapacity(size);
for (int i = 0; i < size; i++) {
Object at = model.getElementAt(i);
if (at instanceof String) names.add((String)at);
}
SaveSchemeDialog dialog = new SaveSchemeDialog(this, ApplicationBundle.message("title.save.color.scheme.as"), names);
String selectedName = myOptions.getSelectedScheme().getName();
String defaultName = UniqueNameGenerator.generateUniqueName(selectedName + " copy", names);
SaveSchemeDialog dialog = new SaveSchemeDialog(this, ApplicationBundle.message("title.save.color.scheme.as"), names, defaultName);
dialog.show();
if (dialog.isOK()) {
myOptions.saveSchemeAs(dialog.getSchemeName());
platform/platform-impl/src/com/intellij/application/options/SaveSchemeDialog.java
+2 -1
View File
@@ -32,10 +32,11 @@ public class SaveSchemeDialog extends DialogWrapper {
private final JTextField mySchemeName = new JTextField();
private final ArrayList myInvalidNames;
public SaveSchemeDialog(Component parent, String title, ArrayList invalidNames){
public SaveSchemeDialog(Component parent, String title, ArrayList invalidNames, String selectedName){
super(parent, false);
myInvalidNames = invalidNames;
setTitle(title);
mySchemeName.setText(selectedName);
init();
}