Author: aschnell Date: Wed Nov 5 19:15:12 2008 New Revision: 52955 URL: http://svn.opensuse.org/viewcvs/yast?rev=52955&view=rev Log: - added Integer::Clamp Modified: trunk/yast2/VERSION trunk/yast2/library/types/src/Integer.ycp trunk/yast2/library/types/testsuite/tests/Integer.out trunk/yast2/library/types/testsuite/tests/Integer.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=52955&r1=52954&r2=52955&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Wed Nov 5 19:15:12 2008 @@ -1 +1 @@ -2.17.44 +2.17.45 Modified: trunk/yast2/library/types/src/Integer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/src/Integer.ycp?rev=52955&r1=52954&r2=52955&view=diff ============================================================================== --- trunk/yast2/library/types/src/Integer.ycp (original) +++ trunk/yast2/library/types/src/Integer.ycp Wed Nov 5 19:15:12 2008 @@ -82,4 +82,15 @@ { return list::reduce(integer x, integer y, values, { return x > y ? x : y; }); } + + + /** + * Clamps the integer i. + */ + global integer Clamp(integer i, integer min, integer max) + { + if (i < min) return min; + if (i > max) return max; + return i; + } } Modified: trunk/yast2/library/types/testsuite/tests/Integer.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/testsuite/tests/Integer.out?rev=52955&r1=52954&r2=52955&view=diff ============================================================================== --- trunk/yast2/library/types/testsuite/tests/Integer.out (original) +++ trunk/yast2/library/types/testsuite/tests/Integer.out Wed Nov 5 19:15:12 2008 @@ -27,3 +27,9 @@ Return 1 Return 2 Return 2 +Dump Integer::Clamp +Return 2 +Return 2 +Return 3 +Return 4 +Return 4 Modified: trunk/yast2/library/types/testsuite/tests/Integer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/testsuite/tests/Integer.ycp?rev=52955&r1=52954&r2=52955&view=diff ============================================================================== --- trunk/yast2/library/types/testsuite/tests/Integer.ycp (original) +++ trunk/yast2/library/types/testsuite/tests/Integer.ycp Wed Nov 5 19:15:12 2008 @@ -40,4 +40,11 @@ TEST(``(Integer::Max([1, 2])), [], nil); TEST(``(Integer::Max([2, 1])), [], nil); +DUMP("Integer::Clamp"); +TEST(``(Integer::Clamp(1, 2, 4)), [], nil); +TEST(``(Integer::Clamp(2, 2, 4)), [], nil); +TEST(``(Integer::Clamp(3, 2, 4)), [], nil); +TEST(``(Integer::Clamp(4, 2, 4)), [], nil); +TEST(``(Integer::Clamp(5, 2, 4)), [], nil); + } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=52955&r1=52954&r2=52955&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Nov 5 19:15:12 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 05 19:14:39 CET 2008 - aschnell@suse.de + +- added Integer::Clamp (also used for #429908) +- 2.17.45 + +------------------------------------------------------------------- Wed Nov 05 14:25:37 CET 2008 - aschnell@suse.de - added Integer::Min and Integer::Max (needed for bnc #429908) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org