/ - Diff - Application: gvSIG desktop - gvSIG

     import java.util.Date;
     import java.util.Locale;
     import org.gvsig.data.datastores.vectorial.driver.exception.FileNotFoundDriverException;
     import org.gvsig.data.datastores.vectorial.driver.exception.UnsupportedEncodingDriverException;
     import org.gvsig.data.exception.CloseException;
     import org.gvsig.data.exception.UnsupportedVersionException;
     import org.gvsig.data.exception.WriteException;
     import com.iver.utiles.bigfile.BigByteBuffer2;
     /**
-...
+    	}
     	public void setFieldValue(int rowIndex, int fieldId, Object obj)
     			throws IOException {
     	public void setFieldValue(int rowIndex, int fieldId, Object obj) throws UnsupportedEncodingDriverException, WriteException {
     		try{
     		int fieldOffset = myHeader.getFieldDescription(fieldId).myFieldDataAddress;
     		String str = fieldString(obj, fieldId);
     		byte[] data = new byte[myHeader.getFieldLength(fieldId)];
-...
     		aux.flip();
     		int numBytesWritten = channel.write(aux, recordOffset + fieldOffset);
     		//channel.force(true);
     		}catch (UnsupportedEncodingException e) {
     			throw new UnsupportedEncodingDriverException("DBF",e);
     		}catch (IOException e) {
     			throw new WriteException("DBF",e);
+    		}
+    	}
-...
+    	 *
     	 * @param file
     	 *            DOCUMENT ME!
     	 * @throws FileNotFoundDriverException
     	 * @throws UnsupportedVersionException
+    	 *
     	 * @throws IOException
     	 *             DOCUMENT ME!
     	 */
     	public void open(File file) {
     	public void open(File file) throws FileNotFoundDriverException, UnsupportedVersionException {
     		/*
     		 * 01h DOS USA code page 437 02h DOS Multilingual code page 850 03h
     		 * Windows ANSI code page 1252 04h Standard Macintosh 64h EE MS-DOS code
-...
+    		}
     		bytesCachedRecord = new byte[myHeader.getRecordLength()];
     		}catch (IOException e) {
     //			throw new FileNotFoundDriverException("DBF",e,file.getAbsolutePath());
     			throw new FileNotFoundDriverException("DBF",e,file.getAbsolutePath());
+    		}
+    	}
     	/**
     	 * Removes all data from the dataset
     	 * @throws CloseException
+    	 *
     	 * @throws IOException
     	 *             DOCUMENT ME!
     	 */
     	public void close() throws IOException {
     	public void close() throws CloseException {
     		try{
     		raf.close();
     		channel.close();
     		buffer = null;
     		posActual=-1;
     		}catch (Exception e) {
     			throw new CloseException("DBF",e);
+    		}
+    	}
     	public FileChannel getWriteChannel() {
-...
     		return o;
+    	}
     ////////////////////////////7777
     	public void setNumRecords(int numRows) {
     		myHeader.setNumRecords(numRows);
+    	}
     	public DbaseFileHeader getHeader() {
     		return myHeader;
+    	}
     /////////////////////////////7777
+    }

     import java.util.Calendar;
     import java.util.Date;
     import org.gvsig.data.datastores.vectorial.driver.exception.BadFieldDriverException;
     import org.gvsig.data.exception.UnsupportedVersionException;
     import org.gvsig.data.vectorial.IFeatureAttributeDescriptor;
     import org.gvsig.data.vectorial.IFeatureType;
-...
          * @param inFieldType DOCUMENT ME!
          * @param inFieldLength DOCUMENT ME!
          * @param inDecimalCount DOCUMENT ME!
          * @throws BadFieldDriverException
+         *
          * @throws Exception DOCUMENT ME!
          */
         public void addColumn(String inFieldName, char inFieldType,
             int inFieldLength, int inDecimalCount) {
             int inFieldLength, int inDecimalCount) throws BadFieldDriverException {
             if (inFieldLength <= 0) {
                 inFieldLength = 1;
+            }
-...
                 tempFieldDescriptors[myFieldDescriptions.length].myFieldLength = 1;
             } else {
     //            throw new Exception("Undefined field type " + inFieldType +
     //                " For column " + inFieldName);
                 throw new BadFieldDriverException("Undefined field type " + inFieldType +
                     " For column " + inFieldName,new Exception());
+            }
             // the length of a record
-...
          * Read the header data from the DBF file.
+         *
          * @param in DOCUMENT ME!
          * @throws UnsupportedVersionException
+         *
          * @throws IOException DOCUMENT ME!
          */
         public void readHeader(BigByteBuffer2 in) throws IOException {
         public void readHeader(BigByteBuffer2 in) throws UnsupportedVersionException {
             // type of file.
             myFileType = in.get();
             if (myFileType != 0x03) {
                 throw new IOException("Unsupported DBF file Type " +
                     Integer.toHexString(myFileType));
                 throw new UnsupportedVersionException("Unsupported DBF file Type " +
                     Integer.toHexString(myFileType),new Exception());
+            }
             // parse the update date information.
-...
     		return myLanguageID;
+    	}
     	public static DbaseFileHeader createDbaseHeader(IFeatureType featureType) {
     	public static DbaseFileHeader createDbaseHeader(IFeatureType featureType) throws BadFieldDriverException {
     		DbaseFileHeader header = new DbaseFileHeader();
     		for (int i=0;i<featureType.size();i++) {

     package org.gvsig.data.datastores.vectorial.driver.dbf.filedbf;
     import java.io.IOException;
     import java.io.UnsupportedEncodingException;
     import java.nio.ByteBuffer;
     import java.nio.MappedByteBuffer;
     import java.nio.channels.FileChannel;
-...
     import java.util.Date;
     import java.util.Locale;
     import org.gvsig.data.datastores.vectorial.driver.exception.UnsupportedEncodingDriverException;
     import org.gvsig.data.exception.CloseException;
     import org.gvsig.data.exception.InitializeWriterException;
     import org.gvsig.data.exception.WriteException;
     import org.gvsig.data.vectorial.IFeature;
     import org.gvsig.data.vectorial.IFeatureAttributeDescriptor;
     import org.gvsig.data.vectorial.IFeatureType;
-...
        * channel.
        * @param header The DbaseFileHeader to write.
        * @param out The Channel to write to.
      * @throws InitializeWriterException
        * @throws IOException If errors occur while initializing.
        */
       public DbaseFileWriter(DbaseFileHeader header,FileChannel out) throws IOException {
         header.writeHeader(out);
       public DbaseFileWriter(DbaseFileHeader header,FileChannel out) throws InitializeWriterException {
         try {
     		header.writeHeader(out);
     	} catch (IOException e) {
     		throw new InitializeWriterException("DBF Writer",e);
+    	}
         this.header = header;
         this.channel = out;
         init();
+      }
       private void init() throws IOException {
       private void init() throws InitializeWriterException {
     	  try{
         buffer = ByteBuffer.allocateDirect(header.getRecordLength());
     	  }catch (Exception e) {
     		throw new InitializeWriterException("DBF Writer",e);
+    	}
+      }
       private void write() throws IOException {
       private void write() throws WriteException {
         buffer.position(0);
         int r = buffer.remaining();
         while ( (r -= channel.write(buffer)) > 0) {
           ; // do nothing
+        }
         try {
     		while ( (r -= channel.write(buffer)) > 0) {
     		  ; // do nothing
+    		}
     	} catch (IOException e) {
     		throw new WriteException("DBF Writer",e);
+    	}
+      }
       /** Write a single dbase record.
        * @param record The entries to write.
      * @throws UnsupportedEncodingException
      * @throws WriteException
      * @throws UnsupportedEncodingDriverException
        * @throws IOException If IO error occurs.
        * @throws DbaseFileException If the entry doesn't comply to the header.
        */
       public void write(IFeature feature) throws IOException{
       public void write(IFeature feature) throws WriteException, UnsupportedEncodingDriverException{
     	  IFeatureType featureType=feature.getType();
         buffer.position(0);
-...
         			fieldString = "0";
+        		}
+        	}
         		buffer.put(fieldString.getBytes(charset.name()));
         		try {
     				buffer.put(fieldString.getBytes(charset.name()));
     			} catch (UnsupportedEncodingException e) {
     				throw new UnsupportedEncodingDriverException("DBF Writer",e);
+    			}
+        }
         write();
+      }
       /** Write a single dbase record. Useful to update a dbf.
        * @param record The entries to write.
      * @throws WriteException
      * @throws UnsupportedEncodingException
        * @throws IOException If IO error occurs.
        * @throws DbaseFileException If the entry doesn't comply to the header.
        */
       public void writeRecord(IFeature feature, int numReg) throws IOException{
       public void writeRecord(IFeature feature, int numReg) throws WriteException, UnsupportedEncodingException{
     	IFeatureType featureType=feature.getType();
     	if (!(channel instanceof FileChannel)) {
     	      throw new IOException("DbaseFileWriterNIO: channel is not a FileChannel. Cannot position properly");
     	      throw new WriteException("DBF Writer",new IOException("DbaseFileWriterNIO: channel is not a FileChannel. Cannot position properly"));
+    	}
         if (featureType.size() != header.getNumFields()) {
           throw new IOException("Wrong number of fields " + featureType.size() +
           " expected " +  header.getNumFields());
           throw new WriteException("DBF Writer",new IOException("Wrong number of fields " + featureType.size() +
           " expected " +  header.getNumFields()));
+        }
         FileChannel fileChannel = (FileChannel) channel;
-...
+        }
         fileChannel.write(buffer, newPos);
         try {
     		fileChannel.write(buffer, newPos);
     	} catch (IOException e) {
     		throw new WriteException("DBF Writer",e);
+    	}
+      }
       private String fieldString(String type,IFeature feature,int i){
-...
       /** Release resources associated with this writer.
        * <B>Highly recommended</B>
      * @throws CloseException
        * @throws IOException If errors occur.
        */
       public void close() throws IOException {
       public void close() throws CloseException {
           // IANS - GEOT 193, bogus 0x00 written. According to dbf spec, optional
           // eof 0x1a marker is, well, optional. Since the original code wrote a
           // 0x00 (which is wrong anyway) lets just do away with this :)
-...
     //    buffer.position(0);
     //    buffer.put((byte) 0).position(0).limit(1);
     //    write();
         channel.close();
         try {
     		channel.close();
     	} catch (IOException e) {
     		throw new CloseException("DBF Writer",e);
+    	}
         if (buffer instanceof MappedByteBuffer) {
          // NIOUtilities.clean(buffer);
+        }

     package org.gvsig.data.datastores.vectorial.driver.exception;
     import org.gvsig.data.exception.OpenException;
     public class FileNotFoundDriverException extends OpenException {
     	private String file="";
     	public FileNotFoundDriverException(String l,Throwable exception,String file) {
     		super(l,exception);
     		this.file=file;
     		init();
+    	}
     	public FileNotFoundDriverException(String l,Throwable exception) {
     		super(l,exception);
     		init();
+    	}
     	/**
+    	 *
     	 */
     	private void init() {
     		messageKey = "error_file_not_find_driver";
     		formatString = "Can?t find file: "+file+"\n in a driver: %(name) ";
+    	}
+    }

     package org.gvsig.data.datastores.vectorial.driver.exception;
     import org.gvsig.data.exception.ReadException;
     public class UnsupportedEncodingDriverException extends ReadException {
     	public UnsupportedEncodingDriverException(String driver,Throwable exception) {
     		super(driver,exception);
     		init();
+    	}
     	/**
+    	 *
     	 */
     	private void init() {
     		messageKey = "Unsupported encoding driver";
     		formatString = "Unsupported encoding of driver:  %(name) ";
+    	}
+    }

     package org.gvsig.data.datastores.vectorial.driver.exception;
     import org.gvsig.data.exception.OpenException;
     public class BadFieldDriverException extends OpenException {
     	private String description="";
     	public BadFieldDriverException(String l,Throwable exception) {
     		super(l,exception);
     		init();
+    	}
     	public BadFieldDriverException(String name, Throwable exception, String description) {
     		super(name,exception);
     		this.description=description;
     		init();
+    	}
     	/**
+    	 *
     	 */
     	private void init() {
     		messageKey = "error_field_layer";
     		formatString = "Can?t load field of the driver: %(name) "+"\n"+"incorrect type: "+description;
+    	}
+    }

Application: gvSIG desktop

Revision 19445