Revision 43641 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/main/java/org/gvsig/fmap/dal/feature/impl/DefaultFeatureRules.java

View differences:

DefaultFeatureRules.java
24 24
package org.gvsig.fmap.dal.feature.impl;
25 25

  
26 26
import java.util.ArrayList;
27
import java.util.Iterator;
28 27

  
29 28
import org.gvsig.fmap.dal.exception.DataException;
30 29
import org.gvsig.fmap.dal.feature.Feature;
......
48 47
		return super.add(rule);
49 48
	}
50 49

  
50
        @Override
51 51
	public FeatureRule getRule(int index) {
52 52
		return (FeatureRule) super.get(index);
53 53
	}
54 54

  
55
        @Override
55 56
	public boolean remove(FeatureRule rule) {
56 57
		return super.remove(rule);
57 58
	}
58 59

  
60
        @Override
59 61
	public FeatureRules getCopy() {
60 62
		DefaultFeatureRules copy = new DefaultFeatureRules();
61 63
		copy.addAll(this);
......
70 72
	public void validate(Feature feature) throws DataException {
71 73
            logger.warn("Calling deprecated method validate without mode.");
72 74
            FeatureStore store = ((DefaultFeature)feature).getStore();
73
            Iterator featureRules=iterator();
74
            while (featureRules.hasNext()) {
75
                    FeatureRule rule = (FeatureRule) featureRules.next();
76
                    rule.validate(feature, store);
75
            for( FeatureRule rule : this ) {
76
                rule.validate(feature, store);
77 77
            }
78 78

  
79 79
	}
80 80

  
81 81
	public void validate(Feature feature, int mode) throws DataException {
82 82
            FeatureStore store = ((DefaultFeature)feature).getStore();
83
            Iterator featureRules=iterator();
84
            while (featureRules.hasNext()) {
85
                FeatureRule rule = (FeatureRule) featureRules.next();
83
            for( FeatureRule rule : this ) {
86 84
                if( rule.checkAtFinishEditing() && mode == Feature.FINISH_EDITING ) {
87 85
                    rule.validate(feature, store);
88 86
                }

Also available in: Unified diff