Revision 25451 branches/v2_0_0_prep/libraries/libTools/src/org/gvsig/tools/dynobject/impl/DefaultDynClass.java

View differences:

DefaultDynClass.java
1 1
package org.gvsig.tools.dynobject.impl;
2 2

  
3
import java.util.Collection;
4
import java.util.HashMap;
5
import java.util.Iterator;
6
import java.util.LinkedHashMap;
7
import java.util.LinkedHashSet;
8
import java.util.Map;
9
import java.util.Set;
3
import java.util.*;
10 4

  
11
import org.gvsig.tools.dynobject.DynClass;
12
import org.gvsig.tools.dynobject.DynField;
13
import org.gvsig.tools.dynobject.DynObject;
14
import org.gvsig.tools.dynobject.DynObjectManager;
5
import org.gvsig.tools.dynobject.*;
15 6

  
16 7
public class DefaultDynClass implements DynClass {
17 8

  
......
31 22
		}
32 23
	}
33 24

  
34
    private DefaultDynObjectManager manager;
25
    private DynObjectManager manager;
35 26

  
36 27
    private String name;
37 28
    private String description;
......
56 47

  
57 48
    	this.forceConsolide();
58 49

  
59
    	this.manager = (DefaultDynObjectManager) manager;
50
    	this.manager = manager;
60 51
    	this.name = name;
61 52
    	this.description = description;
62 53
    }
......
71 62
    	}
72 63
    }
73 64

  
74
   	public DefaultDynObjectManager getManager() {
65
   	public DynObjectManager getManager() {
75 66
    	return this.manager;
76 67
    }
77 68

  
......
107 98
		int i=0;
108 99
		Iterator it = this.fieldsMap.values().iterator();
109 100
		while( it.hasNext() ) {
110
			DynField field = ((FieldAndIndex) it.next()).getDynField();
101
		    FieldAndIndex findex = (FieldAndIndex) it.next();
102
            DynField field = findex.getDynField();
111 103
			fields[i++] = field;
112 104
		}
113 105

  
......
200 192
    	if( this.fieldsMap == null ) {
201 193
    		consolide();
202 194
    	}
203
		return ((FieldAndIndex)this.fieldsMap.get(name)).field;
195
    	FieldAndIndex findex = (FieldAndIndex) fieldsMap.get(name);
196
        return findex == null ? null : findex.getDynField();
204 197
	}
205 198

  
206 199
	public FieldAndIndex getDynFieldAndIndex(String name) {
......
271 264
	public boolean isAnonymous() {
272 265
		return isAnonymous;
273 266
	}
267
	
268
	public int hashCode() {
269
        return name.hashCode();
270
    }
274 271

  
272
    public boolean equals(Object obj) {
273
        if (this == obj) {
274
            return true;
275
        }
276
        if (obj instanceof DynClass) {
277
            return name.equals(((DynClass) obj).getName());
278
        }
279
        return false;
280
    }
281

  
275 282
}

Also available in: Unified diff