Revision 308

View differences:

org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.lib/src/main/java/org/gvsig/tools/dynobject/impl/DefaultDynObjectManager.java
230 230
                    if (this.current.hasNext()) {
231 231
                        return true;
232 232
                    }
233
                    while (this.others.hasNext()) {
234
                        this.current = (Iterator) others.next();
233
                    while (this.others.hasNext()) { 
234
                        Object obj = others.next();
235
                        this.current = (Iterator) ((HashMap) obj).values().iterator();
235 236
                        if (this.current.hasNext()) {
236 237
                            return true;
237 238
                        }
......
244 245
                        return this.current.next();
245 246
                    }
246 247
                    while (this.others.hasNext()) {
247
                        this.current = (Iterator) others.next();
248
                        Object obj = others.next();
249
                        this.current = (Iterator) ((HashMap) obj).values().iterator();
248 250
                        if (this.current.hasNext()) {
249 251
                            return this.current.next();
250 252
                        }
......
622 624

  
623 625
    public DynObjectPagingHelper createDynObjectPagingHelper(DynObjectSet set)
624 626
        throws BaseException {
625
        return new DefaultDynObjectPagingHelper(set);
627
        return new DefaultDynObjectPagingHelper(set); 
626 628
    }
627 629

  
628 630
    public DynObjectPagingHelper createDynObjectPagingHelper(DynObjectSet set,
......
637 639
    public DynClassName createDynClassName(String name) {
638 640
        return new DefaultDynClassName(name);
639 641
    }
640
    
641 642

  
642 643
    public Iterator iterator(String namespace) {
643 644
        List list = new ArrayList();
644

  
645 645
        Iterator it = this.classes.iterator();
646 646
        while( it.hasNext() ) {
647
            DynStruct dynStruct = (DynStruct)it.next();
648
            if (dynStruct.getNamespace().equals(namespace)){
649
                list.add(dynStruct);
650
            }
647
            
648
            Object obj = it.next();
649
            DynStruct dynStruct = (DynStruct) obj;
650
            list.add(dynStruct);                      
651
            
651 652
        }
652 653
        return list.iterator();
653 654
    }

Also available in: Unified diff