Changeset 22680

Timestamp:

03/09/10 10:58:58 (17 months ago)

Author:

rns

Message:

Fix error when editing a constraint to/ from a subclass constraint.

File:

• branches/mnw21/pathquery_refactor/intermine/web/main/src/org/intermine/web/struts/QueryBuilderConstraintAction.java (modified) (1 diff)

branches/mnw21/pathquery_refactor/intermine/web/main/src/org/intermine/web/struts/QueryBuilderConstraintAction.java

@@ -218 +218 @@
         }
         if ((oldConstraint != null) && (newConstraint != null)) {
-            query.replaceConstraint(oldConstraint, newConstraint);
+            // subclass constraints don't have a code but all other constraint types do
+            if (oldConstraint instanceof PathConstraintSubclass
+                    || newConstraint instanceof PathConstraintSubclass) {
+                query.removeConstraint(oldConstraint);
+                query.addConstraint(newConstraint);
+            } else {
+                query.replaceConstraint(oldConstraint, newConstraint);
+            }
         } else if (newConstraint != null) {
             query.addConstraint(newConstraint);