Revision 2537 org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.dynform/org.gvsig.tools.dynform.impl/src/main/java/org/gvsig/tools/dynform/impl/DefaultDynFormFieldDefinition.java

View differences:

DefaultDynFormFieldDefinition.java
27 27
import org.gvsig.tools.dynform.DynFormFieldDefinition;
28 28
import org.gvsig.tools.dynobject.DynField;
29 29
import org.gvsig.tools.dynobject.DynField_v2;
30
import org.gvsig.tools.dynobject.DynMethod;
30 31
import org.gvsig.tools.dynobject.DynObjectManager;
31 32
import org.gvsig.tools.dynobject.impl.DefaultDynField;
32 33
import org.gvsig.tools.service.Manager;
......
52 53
		this.setOrder(definition.getOder());
53 54
                this.setSubtype(definition.getSubtype());
54 55

  
55
		this.setAvailableValues(definition.getAvailableValues());
56 56

  
57 57
		this.manager = manager;
58 58
		DynObjectManager dynManager = ToolsLocator.getDynObjectManager();
59 59
		this.label = (String) dynManager.getAttributeValue(definition, "label");
60 60
		if(definition instanceof DynField_v2){
61
                        this.setDefaultValueSupplier(((DynField_v2)definition).getDefaultValueSupplier());
62
			this.setClassOfValue(((DynField_v2)definition).getDynClassOfValue());
63
			this.setClassOfValue(((DynField_v2)definition).getClassOfValue());
61
                        DynField_v2 definition2 = (DynField_v2)definition;
62
                        DynMethod method = definition2.getAvailableValuesMethod();
63
                        if( method == null ) {
64
                            this.setAvailableValues(definition.getAvailableValues());
65
                        } else {
66
                            this.setAvailableValues(method);
67
                        }
68
                        this.setDefaultValueSupplier(definition2.getDefaultValueSupplier());
69
			this.setClassOfValue(definition2.getDynClassOfValue());
70
			this.setClassOfValue(definition2.getClassOfValue());
64 71
                        if( definition.isContainer() ) {
65
                            this.setClassOfItems(((DynField_v2)definition).getDynClassOfItems());
66
                            this.setClassOfItems(((DynField_v2)definition).getClassOfItems());
67
                            this.setTypeOfItems(((DynField_v2)definition).getTypeOfItems());
72
                            this.setClassOfItems(definition2.getDynClassOfItems());
73
                            this.setClassOfItems(definition2.getClassOfItems());
74
                            this.setTypeOfItems(definition2.getTypeOfItems());
68 75
                        }
69
			this.getTags().add(((DynField_v2)definition).getTags());
76
			this.getTags().add(definition2.getTags());
70 77

  
71 78
		}else{
72
			this.setSubtype(definition.getSubtype());
79
        		this.setAvailableValues(definition.getAvailableValues());
80
//			this.setSubtype(definition.getSubtype());
73 81
		}
74 82
	}
75 83

  

Also available in: Unified diff