litesoft

Explore

Commits

Diff Revisions 2 vs 12 for /trunk/Java/PoVoGenerator/Generator/src/org/litesoft/generator/AbstractTypeFileGenerator.java

		@@ -288,9 +288,9 @@
288	288		if ( zOptions != null )
289	289		{
290	290		zProperties.add( "Options.of( sValidOptions" + zName + " )" );
291		-	zEnumType = "ValidOptions";
	291	+	zEnumType = (zAttributeType instanceof HasOpenOption) ? "OpenValidOptions" : "ValidOptions";
292	292		}
293		-	else if ( A_ArrayOptions.TYPE.equals( zAttributeType ) )
	293	+	else if ( zAttributeType instanceof AbstractArrayOptionsAttributeTypeSimple )
294	294		{
295	295		String zArrayRef = Utils.noEmpty( zPM.get_String( PMD_FullyQualifiedStringArrayPath.NAME, "" ) );
296	296		if ( zArrayRef == null )
		@@ -298,7 +298,7 @@
298	298		mErrorSinc.addError( "AttributeStringArrayPath", "Missing", pAttribute.toString(), mObjectMetaData.toStringForError() );
299	299		}
300	300		zProperties.add( "Options.of( " + zArrayRef + " )" );
301		-	zEnumType = "ValidOptions";
	301	+	zEnumType = (zAttributeType instanceof HasOpenOption) ? "OpenValidOptions" : "ValidOptions";
302	302		}
303	303		else if ( A_Password.TYPE.equals( zAttributeType ) )
304	304		{