litesoft

URLs

Explore

Commits

Diff Revisions 2 vs 6 for /trunk/Java/KeyHole/src/org/litesoft/aokeyhole/objects/ObjectMetaData.java

		@@ -95,9 +95,9 @@
95	95		return add( mAttributeFactory.createAttributeMetaDataID( getObjectSet(), Mode.Rehydrating, isEditable(), pName ) );
96	96		}
97	97
98		-	public AttributeMetaData unpersistAttributeValidOptions( String[] pNameAndOptions, boolean pVirtual )
	98	+	public AttributeMetaData unpersistAttributeValidOptions( AttributeType pType, String[] pNameAndOptions, boolean pVirtual )
99	99		{
100		-	return add( mAttributeFactory.createAttributeMetaDataValidOptions( getObjectSet(), Mode.Rehydrating, isEditable(), pVirtual, pNameAndOptions ) );
	100	+	return add( mAttributeFactory.createAttributeMetaDataValidOptions( getObjectSet(), Mode.Rehydrating, isEditable(), pType, pVirtual, pNameAndOptions ) );
101	101		}
102	102
103	103		public AttributeMetaData unpersistAttributeSimple( AttributeType pType, String pName, boolean pVirtual )
		@@ -181,9 +181,9 @@
181	181		}
182	182		return add( mAttributeFactory.createAttributeMetaDataRelatedPersisted( getObjectSet(), Mode.New, isEditable(), pType, null ) );
183	183		}
184		-	if ( A_ValidOptions.TYPE.equals( pType ) )
	184	+	if ( pType instanceof AbstractValidOptionsAttributeTypeSimple )
185	185		{
186		-	return add( mAttributeFactory.createAttributeMetaDataValidOptions( getObjectSet(), Mode.New, isEditable(), pVirtual, (String) null ) );
	186	+	return add( mAttributeFactory.createAttributeMetaDataValidOptions( getObjectSet(), Mode.New, isEditable(), pType, pVirtual, (String) null ) );
187	187		}
188	188		// Simple
189	189		return add( mAttributeFactory.createAttributeMetaDataSimple( getObjectSet(), Mode.New, isEditable(), pType, pVirtual, null ) );
		@@ -512,10 +512,10 @@
512	512		parts = pOPS.parseData( 3, '\|' );
513	513		return unpersistAttributeRelatedPersisted( zType, parts[0], parts[1], parts[2] );
514	514		}
515		-	if ( zType instanceof A_ValidOptions )
	515	+	if ( zType instanceof AbstractValidOptionsAttributeTypeSimple )
516	516		{
517	517		parts = pOPS.parseData( '\|' );
518		-	return unpersistAttributeValidOptions( parts, pVirtual );
	518	+	return unpersistAttributeValidOptions( zType, parts, pVirtual );
519	519		}
520	520		parts = pOPS.parseData( 1, '\|' );
521	521		if ( zType instanceof A_ID )

View View this file contents

History View the full history

Feeds

Commits for /trunk/Java/KeyHole/src/org/litesoft/aokeyhole/objects/ObjectMetaData.java