Author: lfryc(a)redhat.com Date: 2010-11-17 05:21:03 -0500 (Wed, 17 Nov 2010) New Revision: 20070 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MatrixConfigurator.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/Use.java Log: patch for using strings in MatrixConfiguration and @Use Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MatrixConfigurator.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MatrixConfigurator.java 2010-11-17 10:20:27 UTC (rev 20069) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MatrixConfigurator.java 2010-11-17 10:21:03 UTC (rev 20070) @@ -316,6 +316,12 @@ return Arrays.asList(ArrayUtils.toObject(useAnnotation.decimals())); } } + + if (useAnnotation.strings().length > 0) { + if (parameterType == String.class) { + return Arrays.asList(useAnnotation.strings()); + } + } // tries satisfy parameter from fields List<Object> result = new LinkedList<Object>(); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/Use.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/Use.java 2010-11-17 10:20:27 UTC (rev 20069) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/Use.java 2010-11-17 10:21:03 UTC (rev 20070) @@ -36,6 +36,8 @@ String field() default ""; String[] value() default {}; + + String[] strings() default {}; int[] ints() default {};