Author: scabanovich Date: 2008-06-11 04:34:28 -0400 (Wed, 11 Jun 2008) New Revision: 8704 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLModelObjectFinder.java Log: Algorithm improved Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLModelObjectFinder.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLModelObjectFinder.java 2008-06-11 07:52:58 UTC (rev 8703) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLModelObjectFinder.java 2008-06-11 08:34:28 UTC (rev 8704) @@ -59,8 +59,17 @@ } String childEntity = getChildEntity(chain.name, o); if(childEntity != null) { - XModelObject[] cs = o.getChildren(childEntity); - if(cs.length > chain.index) return findModelObject(chain.child, cs[chain.index]); + XModelObject[] cs = o.getChildren(); + if(cs.length <= chain.index) return o; + int index = -1; + for (int i = 0; i < cs.length; i++) { + if(chain.name != null && chain.name.equals(cs[i].getModelEntity().getXMLSubPath())) { + index++; + if(index == chain.index) { + return findModelObject(chain.child, cs[i]); + } + } + } return o; } else { XModelObject[] cs = o.getChildren();