Description: Renames the HashTree.replace(Object, Object) method to replaceKey().
 This avoids a conflict with the new Map.replace(Object, Object) method
 introduced in Java 8.
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: https://issues.apache.org/bugzilla/show_bug.cgi?id=56360
--- a/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
+++ b/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
@@ -116,7 +116,7 @@
 
     /** {@inheritDoc} */
     @Override
-    public void replace(Object currentKey, Object newKey) {
+    public void replaceKey(Object currentKey, Object newKey) {
         HashTree tree = getTree(currentKey);
         data.remove(currentKey);
         data.put(newKey, tree);
--- a/src/jorphan/org/apache/jorphan/collections/HashTree.java
+++ b/src/jorphan/org/apache/jorphan/collections/HashTree.java
@@ -763,7 +763,7 @@
      * Finds the given current key, and replaces it with the given new key. Any
      * tree structure found under the original key is moved to the new key.
      */
-    public void replace(Object currentKey, Object newKey) {
+    public void replaceKey(Object currentKey, Object newKey) {
         HashTree tree = getTree(currentKey);
         data.remove(currentKey);
         data.put(newKey, tree);
--- a/src/core/org/apache/jmeter/JMeter.java
+++ b/src/core/org/apache/jmeter/JMeter.java
@@ -861,7 +861,7 @@
                             HashTree replacementTree = rc.getReplacementSubTree();
                             if (replacementTree != null) {
                                 convertSubTree(replacementTree);
-                                tree.replace(item, rc);
+                                tree.replaceKey(item, rc);
                                 tree.set(rc, replacementTree);
                             }
                         } 
@@ -886,14 +886,14 @@
                             HashTree replacementTree = rc.getReplacementSubTree();
                             if (replacementTree != null) {
                                 convertSubTree(replacementTree);
-                                tree.replace(item, rc);
+                                tree.replaceKey(item, rc);
                                 tree.set(rc, replacementTree);
                             }
                         }
                     } else { // Not a ReplaceableController
                         convertSubTree(tree.getTree(item));
                         TestElement testElement = item.getTestElement();
-                        tree.replace(item, testElement);
+                        tree.replaceKey(item, testElement);
                     }
                  } else { // Not enabled
                     tree.remove(item);
--- a/src/core/org/apache/jmeter/engine/ConvertListeners.java
+++ b/src/core/org/apache/jmeter/engine/ConvertListeners.java
@@ -62,7 +62,7 @@
                     // Used for remote notification of threads start/stop,see BUG 54152
                     try {
                         RemoteThreadsListenerWrapper wrapper = new RemoteThreadsListenerWrapper(new RemoteThreadsListenerImpl());
-                        subTree.replace(item, wrapper);
+                        subTree.replaceKey(item, wrapper);
                     } catch (RemoteException e) {
                         log.error("Error replacing "+RemoteThreadsListenerTestElement.class.getName() 
                                 +" by wrapper:"+RemoteThreadsListenerWrapper.class.getName(), e); 
@@ -78,13 +78,13 @@
                     RemoteSampleListener rtl = new RemoteSampleListenerImpl(item);
                     if (item instanceof TestStateListener && item instanceof SampleListener) { // TL - all
                         RemoteListenerWrapper wrap = new RemoteListenerWrapper(rtl);
-                        subTree.replace(item, wrap);
+                        subTree.replaceKey(item, wrap);
                     } else if (item instanceof TestStateListener) {
                         RemoteTestListenerWrapper wrap = new RemoteTestListenerWrapper(rtl);
-                        subTree.replace(item, wrap);
+                        subTree.replaceKey(item, wrap);
                     } else if (item instanceof SampleListener) {
                         RemoteSampleListenerWrapper wrap = new RemoteSampleListenerWrapper(rtl);
-                        subTree.replace(item, wrap);
+                        subTree.replaceKey(item, wrap);
                     } else {
                         log.warn("Could not replace Remotable item "+item.getClass().getName());
                     }
--- a/src/core/org/apache/jmeter/gui/action/Save.java
+++ b/src/core/org/apache/jmeter/gui/action/Save.java
@@ -211,7 +211,7 @@
             JMeterTreeNode item = (JMeterTreeNode) iter.next();
             convertSubTree(tree.getTree(item));
             TestElement testElement = item.getTestElement(); // requires JMeterTreeNode
-            tree.replace(item, testElement);
+            tree.replaceKey(item, testElement);
         }
     }
 }
--- a/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java
+++ b/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java
@@ -127,7 +127,7 @@
             ReportTreeNode item = (ReportTreeNode) iter.next();
             convertSubTree(tree.getTree(item));
             TestElement testElement = item.getTestElement();
-            tree.replace(item, testElement);
+            tree.replaceKey(item, testElement);
         }
     }
 }