/ - Diff - Application: gvSIG desktop - gvSIG

Revision 6483

     					Integer.parseInt(
     							getJTxtFieldPrecision().getText()));
+    		}
     		else
     			newField.setFieldDecimalCount(0);
     		String defaultValue = getJTxtDefaultValue().getText();
     		if (defaultValue != null)
+    		{
     			newField.setDefaultValue(ValueFactory.createValueByType(defaultValue, fieldType));
     			if (defaultValue.compareTo("")==0)
     				newField.setDefaultValue(ValueFactory.createNullValue());
     			else
     				newField.setDefaultValue(ValueFactory.createValueByType(defaultValue, fieldType));
+    		}
     		return newField;

     	protected ArrayList listFields = new ArrayList();
     	protected ArrayList listInternalFields = new ArrayList();
     	protected boolean bFieldsHasBeenChanged = false;
     	/**
     	 * La clave ser? el fieldIndex. Para buscar si un value de una row ha de ser
     	 * La clave ser? el fieldId. Para buscar si un value de una row ha de ser
     	 * rellenado con defaultValue o con lo que venga del expansion file,
     	 * miraremos si existe en este hash. Si existe, usamos el value del
     	 * expansion file. Si no existe, usamos el defaultValue del campo busc?ndolo
     	 * en la lista internalFields. Por cierto, en listInternalFields NO se
     	 * borran campos. Solo se marcan como borrados.
     	 * borran campos. Solo se van a?adiendo nuevos actualFields.
     	 */
     	protected TreeMap actualFields; // la clave ser? el fieldIndex.
     	protected TreeMap actualFields; // la clave ser? el fieldId.
     	protected ArrayList fastAccessFields = new ArrayList();
     	protected class MyFieldManager extends AbstractFieldManager {
-...
     		listInternalFields.clear();
     		actualIndexFields = 0;
     		actualFields = new TreeMap();
     //		fastAccessFields = new ArrayList();
     		for (int i=0; i < fields.length; i++)
+    		{
     			InternalField field = new InternalField(fields[i], InternalField.ORIGINAL, new Integer(i));
     			listFields.add(field);
     			// field.setFieldIndex(i);
     			actualFields.put(field.getFieldId(), field);
     //			fastAccessFields.add(fields[i]);
     			System.out.println("INITIALIZEFIELDS: FIELD " + field.getFieldDesc().getFieldAlias());
+    		}
     		try {
     			fieldsChanged();
     			bFieldsHasBeenChanged = false;
     		} catch (EditionException e) {
     			e.printStackTrace();
     			throw new DriverException(e);
-...
+    	}
     	private void fieldsChanged() throws EditionException {
     		// Actualizamos los fieldIndex
     //		int i=0;
     //		for (Iterator iter = actualFields.values().iterator(); iter.hasNext();) {
     //			InternalField fld = (InternalField) iter.next();
     //			fld.setFieldIndex(i++);
     //		}
     		fastAccessFields= new ArrayList();
     		for (Iterator iter = actualFields.values().iterator(); iter.hasNext();) {
     			InternalField fld = (InternalField) iter.next();
     			fastAccessFields.add(fld.getFieldDesc());
+    		}
     		listInternalFields.add(actualFields.clone());
     		actualIndexFields = listInternalFields.size()-1;
     		try {
     			ds = null;
     			getRecordset().mapExternalFields();
     			bFieldsHasBeenChanged = true;
     		} catch (DriverLoadException e) {
     			e.printStackTrace();
     			throw new EditionException(e);
-...
     		 * @see com.hardcode.gdbms.engine.data.driver.ReadAccess#getFieldCount()
     		 */
     		public int getFieldCount() throws DriverException {
     			return actualFields.size();
     			return fastAccessFields.size();
+    		}
     		/*
-...
     		 * @see com.hardcode.gdbms.engine.data.driver.ReadAccess#getFieldName(int)
     		 */
     		public String getFieldName(int fieldId) throws DriverException {
     			int i=0;
     			for (Iterator iter = actualFields.values().iterator(); iter.hasNext();) {
     				InternalField fld = (InternalField) iter.next();
     //				if (fld.getFieldIndex() == fieldId)
     //			int i=0;
     //			for (Iterator iter = actualFields.values().iterator(); iter.hasNext();) {
     //				InternalField fld = (InternalField) iter.next();
     //				if (i == fieldId)
     //					return fld.getFieldDesc().getFieldAlias();
     				if (i == fieldId)
     					return fld.getFieldDesc().getFieldAlias();
     				i++;
+    			}
     			throw new DriverException("FieldId " + fieldId + " not found ");
     //				i++;
     //
     //			}
     //			throw new DriverException("FieldId " + fieldId + " not found ");
     			FieldDescription aux = (FieldDescription) fastAccessFields.get(fieldId);
     			return aux.getFieldAlias();
     			// return null;
     			// return ods.getFieldName(fieldId);
+    		}
-...
     		 * @see com.hardcode.gdbms.engine.data.driver.ReadAccess#getFieldType(int)
     		 */
     		public int getFieldType(int fieldId) throws DriverException {
     			int i=0;
     			for (Iterator iter = actualFields.values().iterator(); iter.hasNext();) {
     				InternalField fld = (InternalField) iter.next();
     //				if (fld.getFieldIndex() == i)
     //			int i=0;
     //			for (Iterator iter = actualFields.values().iterator(); iter.hasNext();) {
     //				InternalField fld = (InternalField) iter.next();
     //				if (i == fieldId)
     //					return fld.getFieldDesc().getFieldType();
     				if (i == fieldId)
     					return fld.getFieldDesc().getFieldType();
     				i++;
+    			}
     //				i++;
     //
     //			}
     			FieldDescription aux = (FieldDescription) fastAccessFields.get(fieldId);
     			return aux.getFieldType();
     			return ods.getFieldType(i);
     //			return ods.getFieldType(i);
+    		}
     		public int getFieldWidth(int fieldId) throws DriverException {
     			int i=0;
     			for (Iterator iter = actualFields.values().iterator(); iter.hasNext();) {
     				InternalField fld = (InternalField) iter.next();
     //				if (fld.getFieldIndex() == i)
     //			int i=0;
     //			for (Iterator iter = actualFields.values().iterator(); iter.hasNext();) {
     //				InternalField fld = (InternalField) iter.next();
     ////				if (fld.getFieldIndex() == i)
     ////					return fld.getFieldDesc().getFieldLength();
     //				if (i == fieldId)
     //					return fld.getFieldDesc().getFieldLength();
     				if (i == fieldId)
     					return fld.getFieldDesc().getFieldLength();
     				i++;
+    			}
     //				i++;
     //
     //			}
     //
     //			return ods.getFieldWidth(i);
     			FieldDescription aux = (FieldDescription) fastAccessFields.get(fieldId);
     			return aux.getFieldLength();
     			return ods.getFieldWidth(i);
+    		}
     		public void reload() throws IOException, DriverException {
-...
     	 */
     	public IRowEdited createExternalRow(IRowEdited edRow,
     			int indexInternalFields) {
     		// para acelerar
     		if (bFieldsHasBeenChanged == false)
     			return edRow;
     		Value[] att = edRow.getAttributes();
     		TreeMap ancientFields = (TreeMap) listInternalFields
     				.get(indexInternalFields);
-...
     			// antiguos. Por eso no nos preocupamos de mantener actuallizados
     			// el resto de campos cuando se borra o a?ade un nuevo campo.
     			InternalField fld = (InternalField) it.next();
     			System.err.println("fld = " + fld.getFieldDesc().getFieldAlias() +  " id=" + fld.getFieldId());
     			// System.err.println("fld = " + fld.getFieldDesc().getFieldAlias() +  " id=" + fld.getFieldId());
     			if (ancientFields.containsKey(fld.getFieldId())) {
     				InternalField ancientField = (InternalField) ancientFields
     						.get(fld.getFieldId());
     				// val = att[ancientField.getFieldIndex()];
     				val = att[ancientField.getFieldId().intValue()];
     				System.out.println("fld: " + fld.getFieldDesc().getFieldAlias() + " ancient:" + " val" + val);
     				// System.out.println("fld: " + fld.getFieldDesc().getFieldAlias() + " ancient:" + " val" + val);
     			} else
     				val = fld.getFieldDesc().getDefaultValue();
     			newAtt[i++] = val;

     			fieldsDescrip[i].setFieldType(type);
     			fieldsDescrip[i].setFieldName(getFieldName(i));
     			fieldsDescrip[i].setFieldLength(getFieldWidth(i));
     			if (NumberUtilities.isNumericInteger(type))
     			if (NumberUtilities.isNumeric(type))
+    			{
     				if (!NumberUtilities.isNumericInteger(type))
     					// TODO: If there is a lost in precision, this should be changed.
     					fieldsDescrip[i].setFieldDecimalCount(6);
+    			}
     			else
     				fieldsDescrip[i].setFieldDecimalCount(0);
     			else
     				// TODO: If there is a lost in precision, this should be changed.
     				fieldsDescrip[i].setFieldDecimalCount(6);
+    		}
     		return fieldsDescrip;
+    	}

     import com.iver.cit.gvsig.fmap.DriverException;
     import com.iver.cit.gvsig.fmap.FMap;
     import com.iver.cit.gvsig.fmap.MapControl;
     import com.iver.cit.gvsig.fmap.drivers.FieldDescription;
     import com.iver.cit.gvsig.fmap.drivers.ILayerDefinition;
     import com.iver.cit.gvsig.fmap.drivers.shp.IndexedShpDriver;
     import com.iver.cit.gvsig.fmap.edition.EditionEvent;
-...
+    				}
+    			}
+    		}
     		vea.cleanSelectableDatasource();
     		layer.setRecordset(vea.getRecordset()); // Queremos que el recordset del layer
     		// refleje los cambios en los campos.
     		ILayerDefinition lyrDef = EditionUtilities.createLayerDefinition(layer);
     		String aux="FIELDS:";
     		FieldDescription[] flds = lyrDef.getFieldsDesc();
     		for (int i=0; i < flds.length; i++)
+    		{
     			aux = aux + ", " + flds[i].getFieldAlias();
+    		}
     		System.err.println("Escribiendo la capa " + lyrDef.getName() +
     				" con los campos " + aux);
     		writer.initialize(lyrDef);
     		vea.stopEdition(writer, EditionEvent.GRAPHIC);

Also available in: Unified diff