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

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

Revision: 2956
          http://joafip.svn.sourceforge.net/joafip/?rev=2956&view=rev
Author:   luc_peuvrier
Date:     2011-10-31 03:07:11 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
fix update

Modified Paths:
--------------
    trunk/joafip/src/main/java/net/sf/joafip/reflect/HelperReflect.java
    trunk/joafip/src/main/java/net/sf/joafip/store/entity/classinfo/ClassInfo.java
    trunk/joafip/src/main/java/net/sf/joafip/store/entity/classinfo/FieldInfo.java
    trunk/joafip/src/main/java/net/sf/joafip/store/entity/classinfo/FieldInfoForSerialization.java
    trunk/joafip/src/main/java/net/sf/joafip/store/entity/conversion/ValuedFieldList.java
    trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectStateMap.java
    trunk/joafip/src/main/java/net/sf/joafip/store/service/classinfo/ClassInfoFactory.java
    trunk/joafip/src/main/java/net/sf/joafip/store/service/classinfo/IClassInfoFactory.java
    trunk/joafip/src/main/java/net/sf/joafip/store/service/conversion/def/AbstractConversionDefinitionReader.java
    trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractFieldOwnerHandler.java
    trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/InObjectHandler.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/manager/AbstractObjectIOManagerDelegatingToStateMap.java
    trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/ObjectIOManager.java
    trunk/joafip/src/test/java/net/sf/joafip/service/sync/TestSynchronizedCollection.java

Modified: trunk/joafip/src/main/java/net/sf/joafip/reflect/HelperReflect.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/reflect/HelperReflect.java	2011-10-30 03:34:28 UTC (rev 2955)
+++ trunk/joafip/src/main/java/net/sf/joafip/reflect/HelperReflect.java	2011-10-31 03:07:11 UTC (rev 2956)
@@ -244,7 +244,7 @@
 
 	/**
 	 * @param object
-	 * @param field
+	 * @param fieldInfo
 	 * @param fieldValue
 	 * @throws ReflectException
 	 * @throws ReflectFailedSetException

Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/classinfo/ClassInfo.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/classinfo/ClassInfo.java	2011-10-30 03:34:28 UTC (rev 2955)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/classinfo/ClassInfo.java	2011-10-31 03:07:11 UTC (rev 2956)
@@ -821,6 +821,24 @@
 		return allDeclaredTransientOrNotFields; // NOPMD
 	}
 
+	public FieldInfo getFieldInfo(final String declaringClassName,
+			final String fieldName) throws ClassInfoException {
+		if (!fieldInfoInitialized) {
+			initializeFieldInfo();
+		}
+		FieldInfo fieldInfo = null;
+		final int length = allDeclaredTransientOrNotFields.length;
+		for (int index = 0; fieldInfo == null && index < length; index++) {
+			final FieldInfo candidate = allDeclaredTransientOrNotFields[index];
+			if (fieldName.equals(candidate.getFieldName())
+					&& declaringClassName.equals(candidate
+							.getDeclaringClassName())) {
+				fieldInfo = candidate;
+			}
+		}
+		return fieldInfo;
+	}
+
 	public FieldInfo[] getSerialPersistentFieldsInfo()
 			throws ClassInfoException {
 		if (!fieldInfoInitialized) {

Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/classinfo/FieldInfo.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/classinfo/FieldInfo.java	2011-10-30 03:34:28 UTC (rev 2955)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/classinfo/FieldInfo.java	2011-10-31 03:07:11 UTC (rev 2956)
@@ -77,6 +77,9 @@
 
 	private boolean persisted = true;
 
+	/**
+	 * null field information
+	 */
 	private FieldInfo() {
 		super();
 		this.field = null;// NOPMD
@@ -122,6 +125,7 @@
 		assertNotNull = field.isAnnotationPresent(AssertNotNull.class);
 	}
 
+	// FIXMELUC ______known field: called ?
 	public FieldInfo(final ClassInfo declaringClass, final String fieldName,
 			final ClassInfo fieldType, final Boolean staticField,
 			final Boolean transientField) throws ClassInfoException {

Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/classinfo/FieldInfoForSerialization.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/classinfo/FieldInfoForSerialization.java	2011-10-30 03:34:28 UTC (rev 2955)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/classinfo/FieldInfoForSerialization.java	2011-10-31 03:07:11 UTC (rev 2956)
@@ -51,6 +51,7 @@
 			final String fieldName, final ClassInfo fieldType,
 			final Boolean staticField, final Boolean transientField)
 			throws ClassInfoException {
+		// FIXMELUC ______known field
 		super(declaringClass, fieldName, fieldType, staticField, transientField);
 		unshared = false;
 		securityException = null;
@@ -61,6 +62,7 @@
 			final String fieldName, final ClassInfo fieldType,
 			final NoSuchFieldException noSuchFieldException)
 			throws ClassInfoException {
+		// FIXMELUC ______known field
 		super(declaringClass, fieldName, fieldType, null, null);
 		unshared = false;
 		this.noSuchFieldException = noSuchFieldException;
@@ -71,6 +73,7 @@
 			final String fieldName, final ClassInfo fieldType,
 			final SecurityException securityException)
 			throws ClassInfoException {
+		// FIXMELUC ______known field
 		super(declaringClass, fieldName, fieldType, null, null);
 		unshared = false;
 		this.securityException = securityException;

Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/conversion/ValuedFieldList.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/conversion/ValuedFieldList.java	2011-10-30 03:34:28 UTC (rev 2955)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/conversion/ValuedFieldList.java	2011-10-31 03:07:11 UTC (rev 2956)
@@ -101,6 +101,7 @@
 		// ASSERTX
 		assert fieldValue != null : "field value must be set";
 		try {
+			// FIXMELUC ______known field
 			final FieldInfo fieldInfo = new FieldInfo(declaringClass,
 					fieldName, fieldType, Boolean.valueOf(staticField),
 					Boolean.valueOf(transientField));
@@ -164,6 +165,7 @@
 			final boolean transientField, final int index)
 			throws ConversionException {
 		try {
+			// FIXMELUC ______known field
 			final FieldInfo fieldInfo = new FieldInfo(declaringClass,
 					fieldName, fieldType, Boolean.valueOf(staticField),
 					Boolean.valueOf(transientField));
@@ -205,6 +207,7 @@
 			final ClassInfo fieldType, final boolean staticField,
 			final boolean transientField) throws ConversionException {
 		try {
+			// FIXMELUC ______known field
 			final FieldInfo originalFieldInfo = new FieldInfo(
 					originalDeclaringClass, originalFieldName,
 					originalFieldType, null, null);

Modified: trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectStateMap.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectStateMap.java	2011-10-30 03:34:28 UTC (rev 2955)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/entity/objectio/ObjectStateMap.java	2011-10-31 03:07:11 UTC (rev 2956)
@@ -582,7 +582,7 @@
 	private void removeWeaked(final ObjectAndPersistInfo toRemove) {
 		stateMap.remove(toRemove);
 		stateMapByIdentifier.remove(toRemove.dataRecordIdentifier);
-		// FIXMELUC ___assert failure, why ?
+		// FIXMELUC ?___assert failure, why ?
 		// assert x == toRemove : x + "\n" + toRemove;
 		toRemove.clearSubstitution();
 		removeFromQueue(toRemove);

Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/classinfo/ClassInfoFactory.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/classinfo/ClassInfoFactory.java	2011-10-30 03:34:28 UTC (rev 2955)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/classinfo/ClassInfoFactory.java	2011-10-31 03:07:11 UTC (rev 2956)
@@ -201,6 +201,19 @@
 	}
 
 	@Override
+	public ClassInfo getClassInfo(final Class<?> clazz)
+			throws ClassInfoException {
+		final String className = clazz.getName();
+		assert className.indexOf(ClassEnhancer.JOAFIP_SUFIX) == -1;
+		ClassInfo classInfo = classInfoMap.get(className);
+		if (classInfo == null) {
+			classInfo = createClassInfoOfExistingClass(clazz, className);
+		}
+		setAttributes(classInfo, className);
+		return classInfo;
+	}
+
+	@Override
 	public ClassInfo getNoProxyClassInfo(final Class<?> clazz)
 			throws ClassInfoException {
 		String className = clazz.getName();

Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/classinfo/IClassInfoFactory.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/classinfo/IClassInfoFactory.java	2011-10-30 03:34:28 UTC (rev 2955)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/classinfo/IClassInfoFactory.java	2011-10-31 03:07:11 UTC (rev 2956)
@@ -60,6 +60,9 @@
 	ClassInfo knownAsNotExisting(String className)
 			throws ClassNotFoundException, ClassInfoException;
 
+	ClassInfo getClassInfo(Class<?> clazz) throws ClassInfoException;
+
+	// FIXMELUC __(rename) call only if can be a proxy
 	ClassInfo getNoProxyClassInfo(Class<?> clazz) throws ClassInfoException;
 
 	Class<?> getNoProxyClass(Class<?> clazz) throws ClassInfoException;

Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/conversion/def/AbstractConversionDefinitionReader.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/conversion/def/AbstractConversionDefinitionReader.java	2011-10-30 03:34:28 UTC (rev 2955)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/conversion/def/AbstractConversionDefinitionReader.java	2011-10-31 03:07:11 UTC (rev 2956)
@@ -180,6 +180,7 @@
 				final ClassInfo declaringClass = classForName(declaringClassName);
 				FieldInfo fieldInfo;
 				try {
+					// FIXMELUC ______known field
 					fieldInfo = new FieldInfo(declaringClass, fieldName,// NOPMD
 							fieldClass, staticField, transientField);
 				} catch (ClassInfoException exception) {

Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractFieldOwnerHandler.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractFieldOwnerHandler.java	2011-10-30 03:34:28 UTC (rev 2955)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/AbstractFieldOwnerHandler.java	2011-10-31 03:07:11 UTC (rev 2956)
@@ -79,6 +79,7 @@
 			final Boolean staticField, final Boolean transientField)
 			throws ImportException, ImportClassNotFoundException {
 		try {
+			// FIXMELUC ______known field
 			return new FieldInfo(fieldDeclaringClass, originalFieldName,
 					fieldType, staticField, transientField);
 		} catch (ClassInfoException exception) {

Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/InObjectHandler.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/InObjectHandler.java	2011-10-30 03:34:28 UTC (rev 2955)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/InObjectHandler.java	2011-10-31 03:07:11 UTC (rev 2956)
@@ -97,10 +97,14 @@
 
 					FieldInfo fieldInfo;
 
-					fieldInfo = new FieldInfo(currentObject.getClassInfo(),
-							"dataModelIdentifier",
-							classInfoFactory.getNoProxyClassInfo(int.class),
-							false, false);
+					final ClassInfo currentObjectClassInfo = currentObject
+							.getClassInfo();
+					fieldInfo = currentObjectClassInfo.getFieldInfo(
+							StoreRoot4.class.getName(), "dataModelIdentifier");
+					// fieldInfo = new FieldInfo(currentObjectClassInfo,
+					// "dataModelIdentifier",
+					// classInfoFactory.getClassInfo(int.class),
+					// false, false);
 					currentObject.setValue(
 							2,
 							fieldInfo,
@@ -109,10 +113,13 @@
 									classInfoFactory
 											.getNoProxyClassInfo(int.class)));
 
-					fieldInfo = new FieldInfo(currentObject.getClassInfo(),
-							"dataRecordIdOfpersistedStaticSet",
-							classInfoFactory.getNoProxyClassInfo(Set.class),
-							false, false);
+					fieldInfo = currentObjectClassInfo.getFieldInfo(
+							StoreRoot4.class.getName(),
+							"dataRecordIdOfpersistedStaticSet");
+					// fieldInfo = new FieldInfo(currentObjectClassInfo,
+					// "dataRecordIdOfpersistedStaticSet",
+					// classInfoFactory.getClassInfo(Set.class),
+					// false, false);
 
 					Set<Long> dataRecordIdOfpersistedStaticSet = storeRoot
 							.getDataRecordIdOfpersistedStaticSet();

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-30 03:34:28 UTC (rev 2955)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/export_import/in/XmlImporter.java	2011-10-31 03:07:11 UTC (rev 2956)
@@ -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/manager/AbstractObjectIOManagerDelegatingToStateMap.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/AbstractObjectIOManagerDelegatingToStateMap.java	2011-10-30 03:34:28 UTC (rev 2955)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/AbstractObjectIOManagerDelegatingToStateMap.java	2011-10-31 03:07:11 UTC (rev 2956)
@@ -150,7 +150,7 @@
 			final DataRecordIdentifier dataRecordIdentifier) {
 		objectStateMgr
 				.clearObjectAndPersistInfoByDataRecordIdentifier(dataRecordIdentifier);
-		// FIXMELUC ___clear statemap ?
+		// FIXMELUC ?___clear statemap ?
 	}
 
 	@Override

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-10-30 03:34:28 UTC (rev 2955)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/objectio/manager/ObjectIOManager.java	2011-10-31 03:07:11 UTC (rev 2956)
@@ -121,7 +121,7 @@
 	private FileOutputStream changeFileOutputStream;
 
 	/** true if proxy notify object access */
-	// FIXMELUC ___no more needed ?
+	// FIXMELUC ?___no more needed ?
 	private boolean maintainInMemoryEnabled;// NOPMD
 
 	private IFilePersistenceAutoSaver saver;

Modified: trunk/joafip/src/test/java/net/sf/joafip/service/sync/TestSynchronizedCollection.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/sync/TestSynchronizedCollection.java	2011-10-30 03:34:28 UTC (rev 2955)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/sync/TestSynchronizedCollection.java	2011-10-31 03:07:11 UTC (rev 2956)
@@ -66,7 +66,7 @@
 			FilePersistenceDataCorruptedException,
 			FilePersistenceNotSerializableException,
 			FilePersistenceTooBigForSerializationException {
-		// FIXMELUC ______known problem to solve
+		// FIXMELUC __known problem to solve
 		if (buildMode) {
 			warnSkipped();
 			return;

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