commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tryg...@apache.org
Subject svn commit: r291044 - /jakarta/commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/environment/Environment.java
Date Fri, 23 Sep 2005 00:02:13 GMT
Author: trygvis
Date: Thu Sep 22 17:02:09 2005
New Revision: 291044

URL: http://svn.apache.org/viewcvs?rev=291044&view=rev
Log:
Fixing 36708: "support getting Environment variables using type checked
               methods"
Patch by Jerome Lacoste.

Modified:
    jakarta/commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/environment/Environment.java

Modified: jakarta/commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/environment/Environment.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/environment/Environment.java?rev=291044&r1=291043&r2=291044&view=diff
==============================================================================
--- jakarta/commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/environment/Environment.java
(original)
+++ jakarta/commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/environment/Environment.java
Thu Sep 22 17:02:09 2005
@@ -85,10 +85,10 @@
     /**
      * Creates an environment from a @link Map of @link String
      * keys and values.
-     * 
+     *
      * @param env A map containg the environment variable name
-     * as @link String key and the variable value as @link String 
-     * value 
+     * as @link String key and the variable value as @link String
+     * value
      */
     protected Environment(Map env) {
         this();
@@ -104,7 +104,7 @@
     /**
      * add a variable. Validity checking is <i>not</i> performed at this point.
      * Duplicates are not caught either.
-     * 
+     *
      * @param var
      *            new variable.
      */
@@ -112,13 +112,43 @@
         put(var.getKey(), var);
     }
 
+    /**
+     * add a variable. Validity checking is <i>not</i> performed at this point.
+     * Duplicates are not caught either.
+     *
+     * @param key
+     *            new key.
+     * @param value
+     *            new value.
+     * @throws NullPointerException if </CODE>key</CODE> or <CODE>value</CODE>
is <CODE>null</CODE>.
+     */
     public void addVariable(final String key, final String value) {
         put(key, EnvironmentVariable.createEnvironmentVariable(key, value));
     }
 
     /**
+     * Retrieve a variable using its key.
+     *
+     * @param key
+     *            the key.
+     */
+    public EnvironmentVariable getVariable(final String key) {
+        return (EnvironmentVariable) get(key);
+    }
+
+    /**
+     * Retrieve a variable's value using its key.
+     *
+     * @param key
+     *            the key.
+     */
+    public String getVariableValue(final String key) {
+        return ((EnvironmentVariable) get(key)).getValue();
+    }
+
+    /**
      * get the variable list as an array
-     * 
+     *
      * @return array of key=value assignment strings
      */
     public String[] getVariables() {
@@ -130,7 +160,7 @@
         for (Iterator iter = entrySet().iterator(); iter.hasNext();) {
             Map.Entry entry = (Map.Entry) iter.next();
 
-            result[i] = ((EnvironmentVariable) entry.getValue()).toString();
+            result[i] = entry.getValue().toString();
             i++;
         }
         return result;
@@ -138,7 +168,7 @@
 
     /**
      * Find the list of environment variables for this process.
-     * 
+     *
      * @return a vector containing the environment variables the vector elements
      *         are strings formatted like variable = value
      * @throws IOException
@@ -205,8 +235,7 @@
         if (retval != 0) {
             // Just try to use what we got
         }
-        BufferedReader in = new BufferedReader(new StringReader(toString(out)));
-        return in;
+        return new BufferedReader(new StringReader(toString(out)));
     }
 
     protected static CommandLine getProcEnvCommand() {



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message