litesoft

URLs

Explore

Commits

Diff Revisions 193 vs 787 for /trunk/Java/KeyHole/src/org/litesoft/aokeyhole/objects/AttributeMetaDataValidOptions.java

		@@ -7,21 +7,17 @@
7	7
8	8		public class AttributeMetaDataValidOptions extends AttributeMetaDataSimple implements HasValidOptions
9	9		{
10		-	public AttributeMetaDataValidOptions( AttributeSet pAttributeSet, Mode pMode, boolean pEditable, boolean pVirtual, PropertyMetaData[] pPropertyMetaDatas, IdentifierValidator pNameValidator, String pName )
	10	+	public AttributeMetaDataValidOptions( AttributeSet pAttributeSet, Mode pMode, boolean pEditable, boolean pVirtual, PropertyMetaData[] pPropertyMetaDatas,
	11	+	IdentifierValidator pNameValidator, String pName )
11	12		{
12	13		super( pAttributeSet, pMode, pEditable, pVirtual, pPropertyMetaDatas, pNameValidator, pName );
13	14		}
14	15
15		-	public AttributeMetaDataValidOptions( AttributeSet pAttributeSet, Mode pMode, boolean pEditable, boolean pVirtual, PropertyMetaData[] pPropertyMetaDatas, IdentifierValidator pNameValidator, String... pNameAndOptions )
	16	+	public AttributeMetaDataValidOptions( AttributeSet pAttributeSet, Mode pMode, boolean pEditable, boolean pVirtual, PropertyMetaData[] pPropertyMetaDatas,
	17	+	IdentifierValidator pNameValidator, String pName, String... pOptions )
16	18		{
17		-	this( pAttributeSet, pMode, pEditable, pVirtual, pPropertyMetaDatas, pNameValidator, pNameAndOptions[0] );
18		-
19		-	int zOptions = pNameAndOptions.length - 1;
20		-	mValidOptions = new String[zOptions];
21		-	if ( zOptions > 0 )
22		-	{
23		-	System.arraycopy( pNameAndOptions, 1, mValidOptions, 0, zOptions );
24		-	}
	19	+	this( pAttributeSet, pMode, pEditable, pVirtual, pPropertyMetaDatas, pNameValidator, pName );
	20	+	setValidOptions( pOptions );
25	21		}
26	22
27	23		private String[] mValidOptions = UtilsCommon.EMPTY_STRING_ARRAY;
		@@ -40,13 +36,9 @@
40	36		}
41	37
42	38		@Override
43		-	protected void addLineExtra( StringBuilder pSB )
	39	+	protected String[] getAdditionalValues()
44	40		{
45		-	if ( anyValidOptions() )
46		-	{
47		-	pSB.append( '\|' );
48		-	mergeValidOptions( pSB );
49		-	}
	41	+	return anyValidOptions() ? mValidOptions : null;
50	42		}
51	43
52	44		private boolean anyValidOptions()

View View this file contents

History View the full history

Feeds

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