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

rollback USER_HOME, sorry

Browse Source
This commit is contained in:
peter
2010-07-16 14:15:55 +01:00
parent c3d1289b9c
commit 9f252d91ce
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/application/options/PathMacrosCollector.java
+3 -1
View File
@@ -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:";
platform/platform-impl/src/com/intellij/application/options/PathMacrosImpl.java
+2 -4
View File
@@ -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() {