# HG changeset patch
# Parent fb51a0c6e832bd000dbe26bda6daf14f7dec1636
# User Ralph Benjamin Ruijs <ralphbenjamin@netbeans.org>
[no commit message]

diff --git a/refactoring.api/apichanges.xml b/refactoring.api/apichanges.xml
--- a/refactoring.api/apichanges.xml
+++ b/refactoring.api/apichanges.xml
@@ -49,6 +49,21 @@
     <apidef name="refactoring">Refactoring API</apidef>
 </apidefs>
 <changes>
+    <change id="ContextRemove">
+        <api name="refactoring"/>
+        <summary>Added method to remove value from Context.</summary>
+        <version major="1" minor="24"/>
+        <date day="11" month="4" year="2012"/>
+        <author login="ralphbenjamin"/>
+        <compatibility addition="yes"/>
+        <description>
+            <p>
+                Added the method remove to the refactoring Context.
+            </p>    
+        </description>
+        <class package="org.netbeans.modules.refactoring.api" name="Context"/>
+        <issue number="210673"/>
+    </change>
     <change id="RefactoringCommit">
         <api name="refactoring"/>
         <summary>Added RefactoringCommit and ModificationResult SPI classes.</summary>
diff --git a/refactoring.api/nbproject/project.properties b/refactoring.api/nbproject/project.properties
--- a/refactoring.api/nbproject/project.properties
+++ b/refactoring.api/nbproject/project.properties
@@ -4,5 +4,5 @@
 javadoc.apichanges=${basedir}/apichanges.xml
 javadoc.title=Refactoring API
 
-spec.version.base=1.23.0
+spec.version.base=1.24.0
 test.config.stableBTD.includes=**/*Test.class
diff --git a/refactoring.api/src/org/netbeans/modules/refactoring/api/Context.java b/refactoring.api/src/org/netbeans/modules/refactoring/api/Context.java
--- a/refactoring.api/src/org/netbeans/modules/refactoring/api/Context.java
+++ b/refactoring.api/src/org/netbeans/modules/refactoring/api/Context.java
@@ -55,6 +55,10 @@
 /**
  * Context contains "environment" in which the refactoring was invoked
  * e.g. Java refactoring might put instance of ClasspathInfo here
+ * 
+ * Context acts as a {@code Map<Class,Object>} keyed off the concrete
+ * implementation class of the "values".
+ * 
  * @see AbstractRefactoring
  * @author Jan Becicka
  */
@@ -74,18 +78,21 @@
      * for instance Java impl. puts instance of ClasspathInfo here.
      * If there is an instance already set for this context, old
      * value is replaced by new one.
+     * 
+     * @param value the instance the add
      */
     public void add(@NonNull Object value) {
         Parameters.notNull("value", value); // NOI18N
-        Object old = lookup(value.getClass());
-        if (old!=null) {
-            instanceContent.remove(old);
-        }
+        remove(value.getClass());
         instanceContent.add(value);
     }
     
     /**
-     * Removes value instance from this context.
+     * Removes instance from this context.
+     * 
+     * @param clazz the class to remove the instance of
+     * 
+     * @since 1.24
      */
     public void remove(@NonNull Class<?> clazz) {
         Parameters.notNull("clazz", clazz); // NOI18N
diff --git a/refactoring.java/nbproject/project.xml b/refactoring.java/nbproject/project.xml
--- a/refactoring.java/nbproject/project.xml
+++ b/refactoring.java/nbproject/project.xml
@@ -185,7 +185,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.22</specification-version>
+                        <specification-version>1.24</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>