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

IDEA-153908 The setting "reformat according to style" is not saved.

Browse Source
This commit is contained in:
Dmitry Avdeev
2016-05-19 15:50:39 +03:00
parent bef71d3770
commit ab3a2b25bd
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplatesScheme.java
+11
View File
@@ -17,6 +17,8 @@ package com.intellij.ide.fileTemplates;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.options.Scheme;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectManager;
import org.jetbrains.annotations.NotNull;
import java.io.File;
@@ -32,6 +34,12 @@ public abstract class FileTemplatesScheme implements Scheme {
public String getTemplatesDir() {
return new File(PathManager.getConfigPath(), TEMPLATES_DIR).getPath();
}
@NotNull
@Override
public Project getProject() {
return ProjectManager.getInstance().getDefaultProject();
}
};
public static final String TEMPLATES_DIR = "fileTemplates";
@@ -49,4 +57,7 @@ public abstract class FileTemplatesScheme implements Scheme {
@NotNull
public abstract String getTemplatesDir();
@NotNull
public abstract Project getProject();
}
platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java
-1
View File
@@ -39,7 +39,6 @@ import com.intellij.ui.IdeBorderFactory;
import com.intellij.ui.ScrollPaneFactory;
import com.intellij.ui.TabbedPaneWrapper;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Function;
import com.intellij.util.PlatformIcons;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.ui.JBUI;
platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java
+7 -1
View File
@@ -114,6 +114,12 @@ public class FileTemplateManagerImpl extends FileTemplateManager implements Pers
public String getTemplatesDir() {
return new File(project.getBasePath(), Project.DIRECTORY_STORE_FOLDER + "/" + TEMPLATES_DIR).getPath();
}
@NotNull
@Override
public Project getProject() {
return project;
}
};
}
@@ -451,9 +457,9 @@ public class FileTemplateManagerImpl extends FileTemplateManager implements Pers
@Override
public void loadState(State state) {
ExportableFileTemplateSettings.getInstance(myProject);
XmlSerializerUtil.copyBean(state, myState);
FileTemplatesScheme scheme = myProjectScheme != null && myProjectScheme.getName().equals(state.SCHEME) ? myProjectScheme : FileTemplatesScheme.DEFAULT;
ExportableFileTemplateSettings.getInstance(scheme.getProject());
setScheme(scheme);
}