/ - Diff - Library: org.gvsig.tools - gvSIG

     	private boolean readOnly = false;
     	private List customActions;
     	protected boolean emptyToNull = false;
     	public AbstractJDynFormField(DynObject parameters,
-...
+    		}
+    	}
+    }
     	public void setTranslateEmptyToNull(boolean emptyToNull) {
     	  this.emptyToNull = emptyToNull;
+    	}
     	public boolean translateEmptyToNull() {
     	  return this.emptyToNull;
+    	}
+    }

     import javax.swing.JComboBox;
     import javax.swing.JTextField;
     import javax.swing.text.JTextComponent;
     import org.apache.commons.lang3.StringUtils;
     import org.gvsig.tools.dataTypes.CoercionException;
     import org.gvsig.tools.dynform.JDynFormField;
-...
     				DynObjectValueItem value = (DynObjectValueItem) this.getJComboBox().getModel().getElementAt(selected);
     				s = value.getValue().toString();
+    			}
+    		}
+    		}
                     if( StringUtils.isEmpty(s) && this.translateEmptyToNull() ) {
                         return null;
+                    }
     		return s;
+    	}
     	public void setValue(Object value) {
     		String s = null;
     		if( value == null ) {
     		  this.setTranslateEmptyToNull(true);
     			value = this.getDefinition().getDefaultValue();
     			if( value == null ) {
     				s = this.getDefaultValue();
-...
     				s = value.toString();
+    			}
     		} else {
     		  this.setTranslateEmptyToNull(false);
     			s = value.toString();
     			try {
     				this.getDefinition().validate(value);
-...
     	public Object getValue() {
     		Object value = null;
     		String s = null;
     		if( this.contents instanceof JTextField ) {
     			s = this.getJTextField().getText();
     		} else {
     			s = this.getJComboBox().getSelectedItem().toString();
+    		}
     		try {
     			value = this.getDefinition().coerce(s);
     		} catch (CoercionException e) {
     			throw new IllegalFieldValue(this,"Can't convert value '"+s+"' to '"+this.getDefinition().getDataType().getName()+"'.");
+    		}
     		String s = this.getValueFromJComponent();
                     try {
                             value = this.getDefinition().coerce(s);
                     } catch (CoercionException e) {
                             throw new IllegalFieldValue(this,"Can't convert value '"+s+"' to '"+ this.getDefinition().getDataType().getName() + "'.");
+                    }
     		this.problemIndicator().clear();
     		return value;
+    	}

      */
     package org.gvsig.tools.dynform.services.dynformfield.String;
     import org.apache.commons.lang3.StringUtils;
     import org.gvsig.tools.dynform.spi.dynformfield.AbstractJDynFormFieldWithValueList;
     import org.gvsig.tools.dynobject.DynObject;
     import org.gvsig.tools.service.spi.ServiceManager;
-...
     	public Object getValue() {
     		Object value = null;
     		String s = this.getValueFromJComponent();
     		if( s.trim().length()==0 ) {
     		if( StringUtils.isBlank(s) ) {
     			Object x = this.getDefinition().getDefaultValue();
     			if( x == null ) {
     				value = "";
     			} else {
     				value = x.toString();
     			if( x != null ) {
                                 value = x.toString();
+    			}
     		} else {
     			value = s;

Application: gvSIG desktop » Library: org.gvsig.tools

Revision 1026