From bb4f2a6f45d570327db4055c336da0184ae911f8 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Wed, 2 Mar 2016 17:19:47 +0100
Subject: [PATCH] correct wrong static auto-import

---
 .../src/com/intellij/psi/impl/SyntheticFileSystemItem.java     | 2 +-
 plugins/git4idea/src/git4idea/repo/GitRepositoryFiles.java     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/core-impl/src/com/intellij/psi/impl/SyntheticFileSystemItem.java b/platform/core-impl/src/com/intellij/psi/impl/SyntheticFileSystemItem.java
index 782643410849..ef0d1e89e0c9 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/SyntheticFileSystemItem.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/SyntheticFileSystemItem.java
@@ -19,7 +19,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public abstract class SyntheticFileSystemItem extends PsiElementBase implements PsiFileSystemItem {
-  public static final Logger LOG = Logger.getInstance("#" + SyntheticFileSystemItem.class.getPackage().getName());
+  private static final Logger LOG = Logger.getInstance("#" + SyntheticFileSystemItem.class.getPackage().getName());
 
   protected final Project myProject;
   protected final PsiManager myManager;
diff --git a/plugins/git4idea/src/git4idea/repo/GitRepositoryFiles.java b/plugins/git4idea/src/git4idea/repo/GitRepositoryFiles.java
index 0f8c026513f7..017d47c2889c 100644
--- a/plugins/git4idea/src/git4idea/repo/GitRepositoryFiles.java
+++ b/plugins/git4idea/src/git4idea/repo/GitRepositoryFiles.java
@@ -15,6 +15,7 @@
  */
 package git4idea.repo;
 
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VfsUtil;
@@ -29,13 +30,13 @@ import java.util.Arrays;
 import java.util.Collection;
 
 import static com.intellij.openapi.vfs.VfsUtilCore.virtualToIoFile;
-import static com.intellij.psi.impl.SyntheticFileSystemItem.LOG;
 
 /**
  * Stores paths to Git service files (from .git/ directory) that are used by IDEA, and provides test-methods to check if a file
  * matches once of them.
  */
 public class GitRepositoryFiles {
+  private static final Logger LOG = Logger.getInstance("#git4idea.repo.GitRepositoryFiles");
 
   private static final String CHERRY_PICK_HEAD = "CHERRY_PICK_HEAD";
   private static final String COMMIT_EDITMSG = "COMMIT_EDITMSG";