From d6fa9c3b615bddc2ccf57aca25408c5da3d3ac68 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 19 Sep 2012 19:35:44 +0400 Subject: [PATCH] fixing typo --- .../images/actions/EditExternallyAction.java | 2 +- .../configurations/ParametersList.java | 2 +- .../com/intellij/util/EnvironmentUtil.java | 26 +++++++++++-------- .../intellij/util/EnvironmentUtilTest.java | 3 +-- .../connections/ConnectionOnProcess.java | 2 +- .../cvsoperations/common/CvsOperation.java | 2 +- 6 files changed, 20 insertions(+), 17 deletions(-) diff --git a/images/src/org/intellij/images/actions/EditExternallyAction.java b/images/src/org/intellij/images/actions/EditExternallyAction.java index e9d627737cba..945edb5c2e85 100644 --- a/images/src/org/intellij/images/actions/EditExternallyAction.java +++ b/images/src/org/intellij/images/actions/EditExternallyAction.java @@ -60,7 +60,7 @@ public final class EditExternallyAction extends AnAction { } else { if (files != null) { - Map env = EnvironmentUtil.getEnviromentProperties(); + Map env = EnvironmentUtil.getEnvironmentProperties(); Set varNames = env.keySet(); for (String varName : varNames) { if (SystemInfo.isWindows) { diff --git a/platform/platform-api/src/com/intellij/execution/configurations/ParametersList.java b/platform/platform-api/src/com/intellij/execution/configurations/ParametersList.java index 9e86dc523e0f..ea58d2795e91 100644 --- a/platform/platform-api/src/com/intellij/execution/configurations/ParametersList.java +++ b/platform/platform-api/src/com/intellij/execution/configurations/ParametersList.java @@ -339,7 +339,7 @@ public class ParametersList implements Cloneable { myMacroMap.put("${" + name + "}", value); } } - final Map env = EnvironmentUtil.getEnviromentProperties(); + final Map env = EnvironmentUtil.getEnvironmentProperties(); for (String name : env.keySet()) { final String key = "${" + name + "}"; if (!myMacroMap.containsKey(key)) { diff --git a/platform/util/src/com/intellij/util/EnvironmentUtil.java b/platform/util/src/com/intellij/util/EnvironmentUtil.java index acbc58b580d4..6159f5f84507 100644 --- a/platform/util/src/com/intellij/util/EnvironmentUtil.java +++ b/platform/util/src/com/intellij/util/EnvironmentUtil.java @@ -21,29 +21,33 @@ import java.util.Collections; import java.util.Map; public class EnvironmentUtil { - private static final Map ourEnviromentProperties = Collections.unmodifiableMap(new ProcessBuilder().environment()); + private static final Map ourEnvironmentProperties = Collections.unmodifiableMap(new ProcessBuilder().environment()); private EnvironmentUtil() { } + @SuppressWarnings("UnusedDeclaration") + @Deprecated @NonNls public static Map getEnviromentProperties() { - return ourEnviromentProperties; + return getEnvironmentProperties(); } - public static String[] getFlattenEnvironmentProperties() { - return getEnvironment(); + @NonNls + public static Map getEnvironmentProperties() { + return ourEnvironmentProperties; } public static String[] getEnvironment() { - Map enviroment = getEnviromentProperties(); - String[] envp = new String[enviroment.size()]; + return flattenEnvironment(getEnvironmentProperties()); + } + + public static String[] flattenEnvironment(Map environment) { + String[] array = new String[environment.size()]; int i = 0; - for (Object o : enviroment.keySet()) { - String name = (String)o; - String value = (String)enviroment.get(name); - envp[i++] = name + "=" + value; + for (String name : environment.keySet()) { + array[i++] = name + "=" + environment.get(name); } - return envp; + return array; } } diff --git a/platform/util/testSrc/com/intellij/util/EnvironmentUtilTest.java b/platform/util/testSrc/com/intellij/util/EnvironmentUtilTest.java index df8ee4893aab..8c6f4c45da0f 100644 --- a/platform/util/testSrc/com/intellij/util/EnvironmentUtilTest.java +++ b/platform/util/testSrc/com/intellij/util/EnvironmentUtilTest.java @@ -8,7 +8,6 @@ */ package com.intellij.util; -import com.intellij.util.EnvironmentUtil; import com.intellij.openapi.util.SystemInfo; import junit.framework.TestCase; @@ -16,7 +15,7 @@ import java.util.Map; public class EnvironmentUtilTest extends TestCase { public void test1() { - Map enviromentProperties = EnvironmentUtil.getEnviromentProperties(); + Map enviromentProperties = EnvironmentUtil.getEnvironmentProperties(); assertNotNull(enviromentProperties); if(SystemInfo.isWindows) assertNotNull(enviromentProperties.get("Path")); diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ConnectionOnProcess.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ConnectionOnProcess.java index eadfb4d0ccd8..8401df2f4c6b 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ConnectionOnProcess.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ConnectionOnProcess.java @@ -142,7 +142,7 @@ public abstract class ConnectionOnProcess implements IConnection { protected synchronized void execute(GeneralCommandLine commandLine) throws AuthenticationException { try { - commandLine.setEnvParams(EnvironmentUtil.getEnviromentProperties()); + commandLine.setEnvParams(EnvironmentUtil.getEnvironmentProperties()); myProcess = commandLine.createProcess(); myErrThread = new ReadProcessThread( diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsOperation.java index 7ac06e35b483..7c779f40f915 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsOperation.java @@ -72,7 +72,7 @@ public abstract class CvsOperation { }; private final static Map ourEnvironmentVariablesMap = new HashMap(); static { - final Map environmentProperties = EnvironmentUtil.getEnviromentProperties(); + final Map environmentProperties = EnvironmentUtil.getEnvironmentProperties(); for (String name : ourKnownToCvs) { final String value = environmentProperties.get(name); if (value != null) {