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

     			manager.saveState(state, out);
     			out.close();
+    		}
     		protected PersistentState saveAndRestoreState(Object obj) throws Exception {
     			PersistentState state1 = manager.getState(obj);
-...
     			return state2;
+    		}
     		protected void saveObject(Object obj) throws Exception {
     			File f = File.createTempFile("gvsig-test-pers-"+getTestId(), "OS.zip");
     			OutputStream out = new FileOutputStream(f);
     			manager.putObject(out,obj);
     			out.close();
+    		}
     		protected Object saveAndRestoreObject(Object obj) throws Exception {
     			File f = File.createTempFile("gvsig-test-pers-"+getTestId(), "OSR.zip");
     			OutputStream out = new FileOutputStream(f);
     			manager.putObject(out,obj);
     			out.close();
     			InputStream in = new FileInputStream(f);
     			Object obj2 = manager.getObject(in);
     			in.close();
     			return obj2;
+    		}
     		public void doSetUp() throws Exception {
     			this.manager = ToolsLocator.getPersistenceManager();
     			manager.setAutoValidation(PersistenceManager.MANDATORY);

     			obj1.check(obj2);
+    		}
     		public void testPutObject() throws Exception {
     			MyObject obj = new MyObject();
     			saveObject(obj);
+    		}
     		public void testGetObject() throws Exception {
     			MyObject obj1 = new MyObject();
     			MyObject obj2 = (MyObject) this.saveAndRestoreObject(obj1);
     			obj1.check(obj2);
+    		}
+    }

     import java.io.IOException;
     import java.io.InputStream;
     import java.io.OutputStream;
     import java.util.ArrayList;
     import java.util.Collections;
     import java.util.Iterator;
-...
     import org.gvsig.tools.persistence.exception.DuplicatePersistentDefinitionException;
     import org.gvsig.tools.persistence.exception.FieldNotDeclaredException;
     import org.gvsig.tools.persistence.exception.PersistenceClassNotRegistered;
     import org.gvsig.tools.persistence.exception.PersistenceCreateException;
     import org.gvsig.tools.persistence.exception.PersistenceException;
     import org.gvsig.tools.persistence.exception.PersistenceTypeNotSupportedException;
     import org.gvsig.tools.persistence.exception.PersistenceValidateExceptions;
     import org.gvsig.tools.persistence.exception.PersistenceWriteExeption;
     import org.gvsig.tools.persistence.impl.exception.CantFindDefinitionInStreamException;
     import org.gvsig.tools.persistence.impl.exception.PersistenceDomainNotRegisterdException;
     import org.gvsig.tools.persistence.impl.exception.PersistenceIllegalStateTheClassNameNotSetException;
-...
     		return ref.getObject();
+    	}
     	public Object getObject(InputStream is) {
     		Object obj = null;
     		PersistentState state = null;
     		String theClassName = null;
     		try {
     			state = this.loadState(is);
     			theClassName = state.getTheClassName();
     			obj = this.create(state);
     		} catch (PersistenceException e) {
     			throw new PersistenceCreateException(theClassName,e);
+    		}
     		return obj;
+    	}
     	public void putObject(OutputStream os, Object obj) {
     		PersistentState state;
     		try {
     			state = this.getState(obj);
     			this.saveState(state, os);
     		} catch (PersistenceException e) {
     			throw new PersistenceWriteExeption(e);
+    		}
+    	}
     	public DynStruct getDefinition(Class persistentClass) {
     		return getDefinition(persistentClass.getName());
+    	}

     	public PersistenceCreateException(Class theClass, Throwable cause) {
     		super(MESSAGE_FORMAT1, cause, MESSAGE_KEY, serialVersionUID);
     		this.setValue("class", theClass.getName());
     		if( cause instanceof InstantiationException ) {
     			boolean needEmptyConstructor = true;
     			Constructor[] constructors = theClass.getConstructors();
     			for( int  i=0; i<constructors.length; i++ ) {
     				Constructor constructor = constructors[i];
     				Class[] parameters = constructor.getParameterTypes();
     				if( parameters.length == 0) {
     					needEmptyConstructor = false;
     		if( theClass == null ) {
     			this.setValue("class", "UNKNOW");
     		} else {
     			this.setValue("class", theClass.getName());
     			if( cause instanceof InstantiationException ) {
     				boolean needEmptyConstructor = true;
     				Constructor[] constructors = theClass.getConstructors();
     				for( int  i=0; i<constructors.length; i++ ) {
     					Constructor constructor = constructors[i];
     					Class[] parameters = constructor.getParameterTypes();
     					if( parameters.length == 0) {
     						needEmptyConstructor = false;
+    					}
+    				}
     				if( needEmptyConstructor ) {
     					this.setFormatString(MESSAGE_FORMAT2);
+    				}
+    			}
     			if( needEmptyConstructor ) {
     				this.setFormatString(MESSAGE_FORMAT2);
+    			}
+    		}
+    	}
     	public PersistenceCreateException(String theClass, Throwable cause) {
     		super(MESSAGE_FORMAT1, cause, MESSAGE_KEY, serialVersionUID);
     		if( theClass == null ) {
     			this.setValue("class", "UNKNOW");
     		} else {
     			this.setValue("class", theClass);
+    		}
+    	}
+    }

     package org.gvsig.tools.persistence.exception;
     public class PersistenceWriteExeption extends PersistenceRuntimeException {
     	/**
+    	 *
     	 */
     	private static final long serialVersionUID = -6059143552335997976L;
     	private final static String MESSAGE_FORMAT1 = "Can't write object.";
     	private final static String MESSAGE_KEY = "_Cant_write_object";
     	public PersistenceWriteExeption(Throwable cause) {
     		super(MESSAGE_FORMAT1, cause, MESSAGE_KEY, serialVersionUID);
+    	}
+    }

     	 * data which has been serialized by the same implementation.
     	 * </p>
+    	 *
     	 * @param reader
     	 * @param out
     	 * @return
     	 * @throws PersistenceValidateExceptions
     	 */
-...
     	/**
     	 * <p>
     	 * De-serializes an state from the data read from the provided
     	 * <code>is</code>. Depending on the implementation the serialized data
     	 * may have different formats, such as XML or binary data.
     	 * </p>
+    	 *
     	 * <p>
     	 * Note that a particular implementation will only be able to de-serialize
     	 * data which has been serialized by the same implementation.
     	 * </p>
+    	 *
     	 * @param reader
     	 * @return
+    	 *
     	 * @param is
     	 * @return
     	 */
     	public Object getObject(InputStream is);
     	/**
     	 * <p>
     	 * Serializes the object "obj" and writes the serialized data in
     	 * the provided {@link OutputStream}. Depending on the implementation the
     	 * serialized data may have different formats, such as XML or binary data.
     	 * </p>
+    	 *
     	 * <p>
     	 * Note that a particular implementation will only be able to de-serialize
     	 * data which has been serialized by the same implementation.
     	 * </p>
+    	 *
     	 * @param os
     	 * @param obj
     	 */
     	public void putObject(OutputStream os, Object obj);
     	/**
     	 * <p>
     	 * Sets the validation which will be applied in {@link #getState(Object)},
     	 * {@link #create(PersistentState)} methods. Validation ensures that
     	 * persisted or de-persisted objects match the declared definition (which

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

Revision 639