From 9f252d91cecd0b10e99f7134cfe189ef7138e003 Mon Sep 17 00:00:00 2001
From: peter <peter.gromov@jetbrains.com>
Date: Fri, 16 Jul 2010 14:15:21 +0100
Subject: [PATCH] rollback USER_HOME, sorry

---
 .../intellij/application/options/PathMacrosCollector.java   | 4 +++-
 .../com/intellij/application/options/PathMacrosImpl.java    | 6 ++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/application/options/PathMacrosCollector.java b/platform/platform-impl/src/com/intellij/application/options/PathMacrosCollector.java
index f7445cbb5e4e..496980b815e1 100644
--- a/platform/platform-impl/src/com/intellij/application/options/PathMacrosCollector.java
+++ b/platform/platform-impl/src/com/intellij/application/options/PathMacrosCollector.java
@@ -38,7 +38,9 @@ public class PathMacrosCollector extends PathMacroMap {
   private final Matcher myMatcher;
 
   private static final Set<String> ourSystemMacroNames = new HashSet<String>(
-    Arrays.asList(PathMacrosImpl.APPLICATION_HOME_MACRO_NAME, PathMacrosImpl.MODULE_DIR_MACRO_NAME, PathMacrosImpl.PROJECT_DIR_MACRO_NAME, PathMacrosImpl.USER_HOME_MACRO_NAME));
+    Arrays.asList(PathMacrosImpl.APPLICATION_HOME_MACRO_NAME, PathMacrosImpl.MODULE_DIR_MACRO_NAME, PathMacrosImpl.PROJECT_DIR_MACRO_NAME
+      //, PathMacrosImpl.USER_HOME_MACRO_NAME
+    ));
   private static final String FILE_PROTOCOL = "file:";
   private static final String JAR_PROTOCOL = "jar:";
 
diff --git a/platform/platform-impl/src/com/intellij/application/options/PathMacrosImpl.java b/platform/platform-impl/src/com/intellij/application/options/PathMacrosImpl.java
index 5ee5ba774134..e89ca57e6464 100644
--- a/platform/platform-impl/src/com/intellij/application/options/PathMacrosImpl.java
+++ b/platform/platform-impl/src/com/intellij/application/options/PathMacrosImpl.java
@@ -24,8 +24,6 @@ import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.NamedJDOMExternalizable;
 import com.intellij.openapi.util.RoamingTypeDisabled;
 import com.intellij.openapi.util.WriteExternalException;
-import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.util.SystemProperties;
 import com.intellij.util.concurrency.JBReentrantReadWriteLock;
 import com.intellij.util.concurrency.LockFactory;
 import com.intellij.util.containers.HashMap;
@@ -72,7 +70,7 @@ public class PathMacrosImpl extends PathMacros implements ApplicationComponent,
     ourSystemMacroNames.add(APPLICATION_HOME_MACRO_NAME);
     ourSystemMacroNames.add(PROJECT_DIR_MACRO_NAME);
     ourSystemMacroNames.add(MODULE_DIR_MACRO_NAME);
-    ourSystemMacroNames.add(USER_HOME_MACRO_NAME);
+    //ourSystemMacroNames.add(USER_HOME_MACRO_NAME);
   }
 
   private static final Set<String> ourToolsMacros = new HashSet<String>();
@@ -118,7 +116,7 @@ public class PathMacrosImpl extends PathMacros implements ApplicationComponent,
   }
 
   public PathMacrosImpl() {
-    setMacro(USER_HOME_MACRO_NAME, FileUtil.toSystemIndependentName(SystemProperties.getUserHome()));
+    //setMacro(USER_HOME_MACRO_NAME, FileUtil.toSystemIndependentName(SystemProperties.getUserHome()));
   }
 
   public static PathMacrosImpl getInstanceEx() {