From c4acbf563ff6b35ad1c13acca4301b0e543ae27f Mon Sep 17 00:00:00 2001 From: severin Date: Sat, 4 Jan 2014 14:15:05 +0100 Subject: [PATCH] Added precondition in layout control --- .../kernel/webcontrol/wsf_layout_control.e | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_layout_control.e b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_layout_control.e index 0ce05128..bc09d201 100644 --- a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_layout_control.e +++ b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_layout_control.e @@ -12,7 +12,7 @@ inherit WSF_STATELESS_MULTI_CONTROL [WSF_STATELESS_CONTROL] rename make as make_multi_control, - add_control as add_control_raw + add_control as add_control_raw end create @@ -38,14 +38,17 @@ feature -- Add control add_control_raw (div) end - add_control (col:INTEGER; c: WSF_STATELESS_CONTROL) + add_control (col: INTEGER; c: WSF_STATELESS_CONTROL) + require + col >= 1 and col <= controls.count + attached {WSF_STATELESS_MULTI_CONTROL [WSF_STATELESS_CONTROL]} controls [col] do - if attached {WSF_STATELESS_MULTI_CONTROL [WSF_STATELESS_CONTROL]}controls[col] as div then + if attached {WSF_STATELESS_MULTI_CONTROL [WSF_STATELESS_CONTROL]} controls [col] as div then div.add_control (c) end end - add_column (span:INTEGER) + add_column (span: INTEGER) local div: WSF_STATELESS_MULTI_CONTROL [WSF_STATELESS_CONTROL] do