[Joafip-svn] SF.net SVN: joafip:[2954] trunk/joafip/src

[<luc...@us...>]

Revision: 2954
          http://joafip.svn.sourceforge.net/joafip/?rev=2954&view=rev
Author:   luc_peuvrier
Date:     2011-10-30 03:09:09 +0000 (Sun, 30 Oct 2011)
Log Message:
-----------
fix done, code cleaner

Modified Paths:
--------------
    trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectAndPersistInfo.java
    trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/XmlImporter.java
    trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/output/AbstractObjectOutput.java
    trunk/joafip/src/main/java/net/sf/joafip/store/service/proxy/ProxyManager2.java
    trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceSetupByProperties.java
    trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestHugeList.java

Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectAndPersistInfo.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectAndPersistInfo.java	2011-10-29 20:06:13 UTC (rev 2953)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectAndPersistInfo.java	2011-10-30 03:09:09 UTC (rev 2954)
@@ -539,6 +539,9 @@
 	}
 
 	public void setIsLoaded() throws ObjectIOException {
+		// out of constructor, no more acceded, to do before set is
+		// loaded
+		acceded = false;
 		if (proxyIntanceOrEnhanced) {
 			/*
 			 * set loaded state can call save and object is referenced only by
@@ -549,6 +552,13 @@
 		}
 	}
 
+	public void newInstanceAndCreatedBySave(final StorageInfo storageInfo)
+			throws ObjectIOException {
+		unWeakReferenceOnObject();
+		setStorageInfo(storageInfo);
+		setIsLoaded();
+	}
+
 	public void unloadAfterSave() throws ObjectIOException,
 			ObjectIOInvalidClassException {
 		if (proxyIntanceOrEnhanced && !acceded) {

Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/XmlImporter.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/XmlImporter.java	2011-10-29 20:06:13 UTC (rev 2953)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/XmlImporter.java	2011-10-30 03:09:09 UTC (rev 2954)
@@ -68,7 +68,7 @@
 			throw new ImportException(exportFile + " does not exists");
 		}
 		final SAXParserFactory factory = SAXParserFactory.newInstance();
-		// FIXMELUC ___________why not validating
+		// FIXMELUC ____why not validating
 		factory.setValidating(false);
 		factory.setNamespaceAware(true);
 		final SchemaFactory schemaFactory = SchemaFactory

Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/output/AbstractObjectOutput.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/output/AbstractObjectOutput.java	2011-10-29 20:06:13 UTC (rev 2953)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/serialize/output/AbstractObjectOutput.java	2011-10-30 03:09:09 UTC (rev 2954)
@@ -443,7 +443,7 @@
 			final List<ReferenceChange> referenceChangeList)
 			throws ObjectIOException {
 		final boolean stateChanged;
-		// FIXMELUC ___________only for exclusive das
+		// FIXMELUC ____only for exclusive das
 		if (originalReferenced.referenceLost()) {
 			stateChanged = true;
 		} else {

Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/proxy/ProxyManager2.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/proxy/ProxyManager2.java	2011-10-29 20:06:13 UTC (rev 2953)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/proxy/ProxyManager2.java	2011-10-30 03:09:09 UTC (rev 2954)
@@ -280,32 +280,13 @@
 
 			if (constructed) {
 				assert getProxyCallBack(instanceCreated) != NULL_PROXY_CALL_BACK_INSTANCE;
-				// FIXMELUC ___________unweak needed ?
 				assert objectAndPersistInfo.isNotWeak();
-				// objectAndPersistInfo.unWeakReferenceOnObject();
-				// out of constructor, no more acceded, to do before set is
-				// loaded
-				objectAndPersistInfo.acceded = false;
-				// set is loaded is last operation for auto save
-				setIsLoaded(instanceCreated);
+				objectAndPersistInfo.setIsLoaded();
 			}
 		} else {
-			// FIXMELUC ___________one method for objectAndPersistInfo action
 			// created by save
 			assert constructed;
-			objectAndPersistInfo.unWeakReferenceOnObject();
-			objectIOManager
-					.dataRecordIdentifierAssociatedToObjectSetted(objectAndPersistInfo);
-			objectAndPersistInfo.setStorageInfo(storageInfo);
-			/*
-			 * FIXMELUC __for setIsLoaded, call of
-			 * objectAndPersistInfo.setIsLoaded() should be good to, may be
-			 * better
-			 */
-			// out of constructor, no more acceded, to do before set is loaded
-			objectAndPersistInfo.acceded = false;
-			// set is loaded is last operation for auto save
-			setIsLoaded(instanceCreated);
+			objectAndPersistInfo.newInstanceAndCreatedBySave(storageInfo);
 		}
 		return objectAndPersistInfo;
 	}
@@ -383,17 +364,18 @@
 		return loaded;
 	}
 
-	public static void setIsLoaded(final Object object) throws ProxyException {
-		try {
-			if (useJavaAgent) {
-				StaticProxyCallBack.setIsLoaded(object);
-			} else if (isProxy(object)) {
-				((IProxyCallBackProxyDelegation) object).setIsLoaded$JOAFIP$();
-			}
-		} catch (ObjectIOException exception) {
-			throw new ProxyException(exception);
-		}
-	}
+	// public static void setIsLoaded(final Object object) throws ProxyException
+	// {
+	// try {
+	// if (useJavaAgent) {
+	// StaticProxyCallBack.setIsLoaded(object);
+	// } else if (isProxy(object)) {
+	// ((IProxyCallBackProxyDelegation) object).setIsLoaded$JOAFIP$();
+	// }
+	// } catch (ObjectIOException exception) {
+	// throw new ProxyException(exception);
+	// }
+	// }
 
 	public static void setIsLoadedNoSave(final Object object)
 			throws ProxyException {

Modified: trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceSetupByProperties.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceSetupByProperties.java	2011-10-29 20:06:13 UTC (rev 2953)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceSetupByProperties.java	2011-10-30 03:09:09 UTC (rev 2954)
@@ -74,6 +74,7 @@
 		filePersistence = new FilePersistence(
 				"net/sf/joafip/service/joafip_for_test.properties", true);
 		filePersistence.addToNotCheckMethod(Bob1.class);
+		filePersistence.addToNotCheckMethod(Bob1Substitute.class);
 		session = filePersistence.createDataAccessSession();
 		// Logger.getLogger(ProxyCallBackInterceptEnd.class).setLevel(Level.DEBUG);
 		// Logger.getLogger(StoreSaver3.class).setLevel(Level.DEBUG);

Modified: trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestHugeList.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestHugeList.java	2011-10-29 20:06:13 UTC (rev 2953)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestHugeList.java	2011-10-30 03:09:09 UTC (rev 2954)
@@ -102,10 +102,9 @@
 		if (logger.debugEnabled) {
 			logger.debug("begin set free memory");
 		}
-		// FIXMELUC _________to reactivate win xp jvm 32 bits
 		// yes, only 512Ko of free memory, on Xp 32 bits jvm
 		MEMORY_EATER.setFreeMemory(512 * 1024);
-		// FIXMELUC _________to test win 7 with 64 bits jvm
+		// FIXMELUC ____to test win 7 with 64 bits jvm
 		// MEMORY_EATER.setFreeMemory(4 * 1024 * 1024);
 		if (logger.debugEnabled) {
 			logger.debug("end end set free memory");

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.