From ecd22c558cd2ec5c9a8d1877b9ffc68284b47a1e Mon Sep 17 00:00:00 2001 From: irengrig Date: Fri, 7 Oct 2011 16:08:30 +0400 Subject: [PATCH] store local git log preferences in workspace file --- .../git4idea/history/wholeTree/GitLogSettings.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/GitLogSettings.java b/plugins/git4idea/src/git4idea/history/wholeTree/GitLogSettings.java index baf03baa2d8d..34e9580e1769 100644 --- a/plugins/git4idea/src/git4idea/history/wholeTree/GitLogSettings.java +++ b/plugins/git4idea/src/git4idea/history/wholeTree/GitLogSettings.java @@ -15,7 +15,10 @@ */ package git4idea.history.wholeTree; -import com.intellij.openapi.components.*; +import com.intellij.openapi.components.PersistentStateComponent; +import com.intellij.openapi.components.ServiceManager; +import com.intellij.openapi.components.State; +import com.intellij.openapi.components.Storage; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.vfs.VirtualFile; @@ -33,10 +36,8 @@ import java.util.*; name = "GitLogSettings", storages = { @Storage( - file = "$PROJECT_FILE$" - ) - ,@Storage( file = "$PROJECT_CONFIG_DIR$/vcs.xml", scheme = StorageScheme.DIRECTORY_BASED) - } + file = "$WORKSPACE_FILE$" + )} ) public class GitLogSettings implements PersistentStateComponent { private MyState myState = new MyState();