Fixed creation procedures (make)

This commit is contained in:
severin
2013-11-02 18:34:48 +01:00
parent 1b831375ef
commit 10b950a7e7
28 changed files with 162 additions and 86 deletions

View File

@@ -0,0 +1,27 @@
note
description: "Summary description for {WSF_DROPDOWN_CONTROL}."
author: ""
date: "$Date$"
revision: "$Revision$"
class
WSF_DROPDOWN_CONTROL
inherit
WSF_MULTI_CONTROL [WSF_STATELESS_CONTROL]
rename
make as make_multi_control
end
create
make
feature {NONE} -- Initialization
make (n: STRING)
do
make_multi_control (n)
end
end

View File

@@ -10,16 +10,18 @@ class
inherit
WSF_REPEATER_CONTROL [G]
rename
make as make_repeater
redefine
render
end
create
make_grid
make
feature {NONE} -- Initialization
make_grid (n: STRING; a_columns: ITERABLE [WSF_GRID_COLUMN]; a_datasource: WSF_DATASOURCE [G])
make (n: STRING; a_columns: ITERABLE [WSF_GRID_COLUMN]; a_datasource: WSF_DATASOURCE [G])
do
make_repeater (n, a_datasource)
columns := a_columns

View File

@@ -10,13 +10,16 @@ class
inherit
WSF_CONTROL
rename
make as make_control
end
create
make_paging
make
feature {NONE}
make_paging (n: STRING; ds: WSF_PAGABLE_DATASOURCE [G])
make (n: STRING; ds: WSF_PAGABLE_DATASOURCE [G])
do
make_control (n, "ul")
add_class ("pagination")

View File

@@ -10,6 +10,8 @@ deferred class
inherit
WSF_MULTI_CONTROL [WSF_STATELESS_CONTROL]
rename
make as make_multi_control
redefine
set_state,
state,
@@ -18,7 +20,7 @@ inherit
feature {NONE} -- Initialization
make_repeater (n: STRING; a_datasource: WSF_DATASOURCE [G])
make (n: STRING; a_datasource: WSF_DATASOURCE [G])
local
p: WSF_PAGINATION_CONTROL [G]
do
@@ -26,7 +28,7 @@ feature {NONE} -- Initialization
datasource := a_datasource
datasource.set_on_update_agent (agent update)
if attached {WSF_PAGABLE_DATASOURCE [G]} a_datasource as ds then
create p.make_paging (n + "_paging", ds)
create p.make (n + "_paging", ds)
add_control (p)
pagination_control := p
end

View File

@@ -10,26 +10,28 @@ class
inherit
WSF_INPUT_CONTROL
rename
make as make_input
redefine
handle_callback,
state
end
create
make_autocomplete, make_autocomplete_with_agent
make, make_with_agent
feature {NONE} -- Initialization
make_autocomplete (n: STRING; c: WSF_AUTOCOMPLETION)
make (n: STRING; c: WSF_AUTOCOMPLETION)
-- Initialize with specified name and autocompletion
do
make_autocomplete_with_agent (n, agent c.autocompletion)
make_with_agent (n, agent c.autocompletion)
if attached c.template as t then
template := t
end
end
make_autocomplete_with_agent (n: STRING; c: FUNCTION [ANY, TUPLE [STRING], JSON_ARRAY])
make_with_agent (n: STRING; c: FUNCTION [ANY, TUPLE [STRING], JSON_ARRAY])
-- Initialize with specified name and autocompletion function
do
make_input (n, "")

View File

@@ -10,16 +10,19 @@ class
inherit
WSF_VALUE_CONTROL [BOOLEAN]
rename
make as make_value_control
end
create
make_checkbox
make
feature {NONE} -- Initialization
make_checkbox (n, l, c: STRING)
make (n, l, c: STRING)
-- Initialize with specified control name,
do
make_control (n, "input")
make_value_control (n, "input")
label := l
checked_value := c
end

View File

@@ -10,6 +10,8 @@ class
inherit
WSF_VALUE_CONTROL [LIST [STRING]]
rename
make as make_control
undefine
load_state,
full_state,
@@ -17,13 +19,16 @@ inherit
end
WSF_MULTI_CONTROL [WSF_CHECKBOX_CONTROL]
rename
make as make_multi_control
end
create
make_checkbox_list_control
make
feature {NONE} -- Initializaton
make_checkbox_list_control (n: STRING)
make (n: STRING)
-- Initialize with specified control name
do
make_multi_control (n)

View File

@@ -8,10 +8,13 @@ class
WSF_CODEVIEW_CONTROL
inherit
WSF_TEXTAREA_CONTROL
rename
make_textarea as make_codeview
make as make_codeview
end
create
make_codeview
end

View File

@@ -10,16 +10,19 @@ class
inherit
WSF_VALUE_CONTROL [STRING]
rename
make as make_value_control
end
create
make_input
make
feature {NONE} -- Initialization
make_input (n, v: STRING)
make (n, v: STRING)
-- Initialize with specified name and value
do
make_control (n, "input")
make_value_control (n, "input")
type := "text"
text := v
end

View File

@@ -10,13 +10,16 @@ class
inherit
WSF_INPUT_CONTROL
rename
make as make_input
end
create
make_password
make
feature {NONE} -- Initialization
make_password (n, v: STRING)
make (n, v: STRING)
-- Initialize with specified control name and text
do
make_input (n, v)

View File

@@ -10,16 +10,18 @@ class
inherit
WSF_INPUT_CONTROL
rename
make as make_input
redefine
render
end
create
make_textarea
make
feature {NONE} -- Initialization
make_textarea (n, t: STRING)
make (n, t: STRING)
-- Initialize with specified control name and text to be displayed in this textarea
do
make_input (n, t)

View File

@@ -10,16 +10,18 @@ class
inherit
WSF_MULTI_CONTROL [WSF_STATELESS_CONTROL]
rename
make as make_multi_control
redefine
render
end
create
make_navbar, make_navbar_with_brand
make, make_with_brand
feature {NONE} -- Initialization
make_navbar (n: STRING)
make (n: STRING)
--Initialize
do
make_multi_control (n)
@@ -31,10 +33,10 @@ feature {NONE} -- Initialization
nav_right.add_class ("nav navbar-nav navbar-right")
end
make_navbar_with_brand (n, b: STRING)
make_with_brand (n, b: STRING)
-- Initialize with specified brand string
do
make_navbar (n)
make (n)
brand := b
end

View File

@@ -10,13 +10,16 @@ class
inherit
WSF_CONTROL
rename
make as make_control
end
create
make_progress, make_progress_with_source
make, make_with_source
feature {NONE} -- Initialization
make_progress (n: STRING)
make (n: STRING)
-- Initialize with specified control name
do
make_control (n, "div")
@@ -24,10 +27,10 @@ feature {NONE} -- Initialization
progress := 0
end
make_progress_with_source (n: STRING; p: WSF_PROGRESSSOURCE)
make_with_source (n: STRING; p: WSF_PROGRESSSOURCE)
-- Initialize with specified control name and progresssource
do
make_progress (n)
make (n)
progress_source := p
end

View File

@@ -10,20 +10,23 @@ class
inherit
WSF_CONTROL
rename
make as make_control
end
create
make_slider
make
feature {NONE} -- Initialization
make_slider (n: STRING)
make (n: STRING)
-- Initialize with specified name
do
make_control (n, "div")
add_class ("carousel slide")
create list.make_with_tag_name (control_name + "_links", "ol")
list.add_class ("carousel-indicators")
create slide_wrapper.make_multi_control (control_name + "_wrapper")
create slide_wrapper.make (control_name + "_wrapper")
slide_wrapper.add_class ("carousel-inner")
end
@@ -88,7 +91,7 @@ feature -- Change
cl: STRING
item: WSF_MULTI_CONTROL [WSF_STATELESS_CONTROL]
do
create item.make_multi_control (control_name + "_item" + slide_wrapper.controls.count.out)
create item.make (control_name + "_item" + slide_wrapper.controls.count.out)
item.add_class ("item")
item.add_control (c)
if attached caption as capt then

View File

@@ -10,13 +10,16 @@ class
inherit
WSF_CONTROL
rename
make as make_control
end
create
make_button
make
feature {NONE} -- Initialization
make_button (n: STRING; t: STRING)
make (n: STRING; t: STRING)
-- Initialize with specified control name and text
do
make_control (n, "button")

View File

@@ -10,19 +10,21 @@ deferred class
inherit
WSF_STATELESS_CONTROL
rename
make as make_stateless_control
redefine
render_tag
end
feature {NONE} -- Initialization
make_control (n, a_tag_name: STRING)
make (n, a_tag_name: STRING)
-- Initialize with specified control name and tag
require
not n.is_empty
not a_tag_name.is_empty
do
make (a_tag_name)
make_stateless_control (a_tag_name)
control_name := n
create state_changes.make
create actions.make_array

View File

@@ -10,15 +10,18 @@ class
inherit
WSF_MULTI_CONTROL [WSF_CONTROL]
rename
make as make_multi_control
end
WSF_VALIDATABLE
create
make_form_control
make
feature {NONE} -- Initialization
make_form_control (n: STRING)
make (n: STRING)
-- Initialize
do
make_multi_control (n)

View File

@@ -10,6 +10,8 @@ class
inherit
WSF_CONTROL
rename
make as make_control
redefine
read_state_changes,
load_state,
@@ -19,17 +21,17 @@ inherit
WSF_VALIDATABLE
create
make_form_element, make_form_element_with_validators
make, make_with_validators
feature {NONE} -- Initialization
make_form_element (a_label: STRING; c: WSF_VALUE_CONTROL [G])
make (a_label: STRING; c: WSF_VALUE_CONTROL [G])
-- Initialize form element control with a specific label and value control
do
make_form_element_with_validators (a_label, c, create {ARRAYED_LIST [WSF_VALIDATOR [G]]}.make (0))
make_with_validators (a_label, c, create {ARRAYED_LIST [WSF_VALIDATOR [G]]}.make (0))
end
make_form_element_with_validators (a_label: STRING; c: WSF_VALUE_CONTROL [G]; v: LIST [WSF_VALIDATOR [G]])
make_with_validators (a_label: STRING; c: WSF_VALUE_CONTROL [G]; v: LIST [WSF_VALIDATOR [G]])
-- Initialize form element control with a specific label, value control and list of validators
do
make_control (c.control_name + "_container", "div")

View File

@@ -10,16 +10,17 @@ class
inherit
WSF_VALUE_CONTROL [STRING]
rename make as make_value_control end
create
make_html
make
feature {NONE} -- Initialization
make_html (n, t, v: STRING)
make (n, t, v: STRING)
-- Initialize
do
make_control (n, t)
make_value_control (n, t)
html := v
end

View File

@@ -10,6 +10,8 @@ class
inherit
WSF_CONTROL
rename
make as make_control
redefine
full_state,
read_state_changes,
@@ -17,11 +19,11 @@ inherit
end
create
make_multi_control, make_with_tag_name
make, make_with_tag_name
feature {NONE} -- Initialization
make_multi_control (n: STRING)
make (n: STRING)
-- Initialize with specified control name and default tag "div"
do
make_with_tag_name (n, "div")
@@ -130,7 +132,7 @@ feature -- Change
add_control (c: G)
-- Add a control to this multi control
do
controls.extend (c)
controls.extend (c)
end
feature -- Properties

View File

@@ -11,7 +11,7 @@ inherit
WSF_CONTROL
rename
make as make_wsf_control
make as make_control
redefine
full_state,
read_state_changes

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="wsf_js_widget" uuid="660D6D82-2218-11E3-86B1-F23C91AEC05E" library_target="wsf_js_widget">
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-11-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-11-0 http://www.eiffel.com/developers/xml/configuration-1-11-0.xsd" name="wsf_js_widget" uuid="660D6D82-2218-11E3-86B1-F23C91AEC05E" library_target="wsf_js_widget">
<target name="wsf_js_widget">
<root all_classes="true"/>
<file_rule>
@@ -7,7 +7,7 @@
<exclude>/EIFGENs$</exclude>
<exclude>/.svn$</exclude>
</file_rule>
<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="transitional" syntax="standard">
</option>
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
<library name="encoder" location="..\..\..\library\text\encoder\encoder-safe.ecf"/>