/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 *  contributor license agreements.  See the NOTICE file distributed with
 *  this work for additional information regarding copyright ownership.
 *  The ASF licenses this file to You under the Apache License, Version 2.0
 *  (the "License"); you may not use this file except in compliance with
 *  the License.  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 *  Unless required by applicable law or agreed to in writing, software
 *  distributed under the License is distributed on an "AS IS" BASIS,
 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *  See the License for the specific language governing permissions and
 *  limitations under the License.
 *
 */

package org.apache.commons.exec.util;

import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;

/**
 * Helper classes to manipulate maps to pass substition map to the
 * CommandLine. This class is not part of the public API and
 * could change without warning.
 *
 * @version $Id$
 */
public class MapUtils
{
    /**
     * Clones a map.
     *
     * @param source the source map
     * @return the clone of the source map
     */
    public static <K, V> Map<K, V> copy(final Map<K, V> source) {

        if (source == null) {
            return null;
        }

        final Map<K, V> result = new HashMap<K, V>();
        result.putAll(source);
        return result;
    }

    /**
     * Clones a map and prefixes the keys in the clone, e.g.
     * for mapping "JAVA_HOME" to "env.JAVA_HOME" to simulate
     * the behaviour of ANT.
     *
     * @param source the source map
     * @param prefix the prefix used for all names
     * @return the clone of the source map
     */
    public static <K, V> Map<String, V> prefix(final Map<K, V> source, final String prefix) {

        if (source == null) {
            return null;
        }

        final Map<String, V> result = new HashMap<String, V>();

        final Iterator<Map.Entry<K, V>> iter = source.entrySet().iterator();

        while (iter.hasNext()) {
            final Map.Entry<K, V> entry = iter.next();
            final K key = entry.getKey();
            final V value = entry.getValue();
            result.put(prefix + '.' + key.toString(), value);
        }

        return result;
    }

    /**
     * Clones the lhs map and add all things from the
     * rhs map.
     *
     * @param lhs the first map
     * @param rhs the second map
     * @return the merged map
     */
    public static <K, V> Map<K, V> merge(final Map<K, V> lhs, final Map<K, V> rhs) {

        Map result = null;

        if (lhs == null || lhs.size() == 0) {
            result = copy(rhs);
        }
        else if (rhs == null || rhs.size() == 0) {
            result = copy(lhs);
        }
        else {
            result = copy(lhs);
            result.putAll(rhs);
        }
        
        return result;
    }
}

@@ -2053,22 +2053,12 @@
    f
-inal Iterator%3C
+or (
 Map.
@@ -2072,16 +2072,16 @@
 , V%3E
-%3E iter =
+ entry :
  sou
@@ -2098,109 +2098,11 @@
 et()
-.iterator();%0A%0A        while (iter.hasNext()) %7B%0A            final Map.Entry%3CK, V%3E entry = iter.next();
+) %7B
 %0A   

Use enhanced for loop over entry set