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

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

Revision: 2976
          http://joafip.svn.sourceforge.net/joafip/?rev=2976&view=rev
Author:   luc_peuvrier
Date:     2011-11-21 19:53:58 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
refactoring

Modified Paths:
--------------
    trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/ExportStoreQue.java
    trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/AbstractObjectIOManagerIOForObject.java
    trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/ObjectIOManager.java
    trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/SerializerObjectIOManager.java
    trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceNoG.java
    trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/serialize/AbstractSerializeTest.java

Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/ExportStoreQue.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/ExportStoreQue.java	2011-11-21 07:14:22 UTC (rev 2975)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/out/ExportStoreQue.java	2011-11-21 19:53:58 UTC (rev 2976)
@@ -39,7 +39,7 @@
 @NotStorableClass
 public class ExportStoreQue {
 
-	// FIXMELUC ____________________________why not empty ?
+	// FIXMELUC ______why not empty ?
 	// HeapFileDataManager not accept empty data
 	// net.sf.joafip.heapfile.service.HeapException: associated data size must
 	// be defined

Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/AbstractObjectIOManagerIOForObject.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/AbstractObjectIOManagerIOForObject.java	2011-11-21 07:14:22 UTC (rev 2975)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/AbstractObjectIOManagerIOForObject.java	2011-11-21 19:53:58 UTC (rev 2976)
@@ -833,10 +833,10 @@
 
 	@Override
 	public void newObjectLoaded() throws ObjectIOException {
-		autoSave();
+		checkForAutoSave();
 	}
 
-	protected abstract void autoSave() throws ObjectIOException;
+	protected abstract void checkForAutoSave() throws ObjectIOException;
 
 	/**
 	 * creation of a not existing object delegating to

Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/ObjectIOManager.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/ObjectIOManager.java	2011-11-21 07:14:22 UTC (rev 2975)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/ObjectIOManager.java	2011-11-21 19:53:58 UTC (rev 2976)
@@ -308,7 +308,7 @@
 	public void saveAndUnsetProxyObjectState(
 			final ObjectAndPersistInfo objectAndItsClassInfo)
 			throws ObjectIOException, ObjectIOInvalidClassException {
-		save();
+		autoSave();
 		unsetProxyObjectState(objectAndItsClassInfo);
 	}
 
@@ -677,17 +677,16 @@
 	}
 
 	@Override
-	protected void autoSave() throws ObjectIOException {
+	protected void checkForAutoSave() throws ObjectIOException {
 		if (autoSaveEnabled) {
-			// final int numberOfObjectState = getNumberOfObjectState();
 			final int numberOfObjectState = getNumberOfReferenced();
 			if (numberOfObjectState >= maxInMemoryThreshold && doAutoSave()) {
-				save();
+				autoSave();
 			}
 		}
 	}
 
-	protected void save() throws ObjectIOException {
+	protected void autoSave() throws ObjectIOException {
 		try {
 			final long beginTime = System.currentTimeMillis();
 			final boolean saveDone = saver.autoSave();

Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/SerializerObjectIOManager.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/SerializerObjectIOManager.java	2011-11-21 07:14:22 UTC (rev 2975)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/SerializerObjectIOManager.java	2011-11-21 19:53:58 UTC (rev 2976)
@@ -409,7 +409,7 @@
 	}
 
 	@Override
-	protected void autoSave() throws ObjectIOException {
+	protected void checkForAutoSave() throws ObjectIOException {
 		// no implementation
 	}
 

Modified: trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceNoG.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceNoG.java	2011-11-21 07:14:22 UTC (rev 2975)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceNoG.java	2011-11-21 19:53:58 UTC (rev 2976)
@@ -32,8 +32,7 @@
 		builder.setGarbageManagement(false);
 		builder.setCrashSafeMode(false);
 		filePersistence = (FilePersistence) builder.build();
-		// FIXMELUC ______________________NoPersistenceConstraintCheck
-		// annotation
+		// FIXMELUC ___________NoPersistenceConstraintCheck annotation
 		final Method method = Bob1.class.getDeclaredMethod(
 				"doSomethingOnOtherBob1Private", new Class<?>[] { Bob1.class });
 		filePersistence.addToNotCheckMethod(method);

Modified: trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/serialize/AbstractSerializeTest.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/serialize/AbstractSerializeTest.java	2011-11-21 07:14:22 UTC (rev 2975)
+++ trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/serialize/AbstractSerializeTest.java	2011-11-21 19:53:58 UTC (rev 2976)
@@ -261,5 +261,4 @@
 	protected abstract void assertUnserialized(Object unserialized);
 
 	protected abstract Object[] modifyObjectToSerialize(Object object);
-
 }

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