Author: rob.stryker(a)jboss.com Date: 2009-07-03 06:34:22 -0400 (Fri, 03 Jul 2009) New Revision: 16378 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathCategory.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java Log: JBIDE-4491 - deleting a renamed xpath failed Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathCategory.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathCategory.java 2009-07-03 08:41:54 UTC (rev 16377) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathCategory.java 2009-07-03 10:34:22 UTC (rev 16378) @@ -104,7 +104,14 @@ children.put(query.getName(), query); query.setCategory(this); } - + protected void renameQuery(String oldName, String newName) { + getQueries(); + XPathQuery q = children.get(oldName); + if( q != null ) { + children.remove(oldName); + children.put(newName, q); + } + } public void removeQuery(XPathQuery query) { getQueries(); children.remove(query.getName()); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java 2009-07-03 08:41:54 UTC (rev 16377) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java 2009-07-03 10:34:22 UTC (rev 16378) @@ -151,6 +151,8 @@ return name; } public void setName(String name) { + if( category != null ) + category.renameQuery(this.name, name); this.name = name; } public String getFilePattern() {