diff --git a/ChangeLog b/ChangeLog index bcd0122..7ee6796 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-06-11 David Wetzel + * Testing/DynamicElements + Ported to WO names. + 2010-06-10 David Wetzel * GSWeb.framework/GNUmakefile * GSWeb.framework/WOKeyValueUnarchiver.m/h diff --git a/Testing/DynamicElements/BasePage.h b/Testing/DynamicElements/BasePage.h index f2589cb..929029f 100644 --- a/Testing/DynamicElements/BasePage.h +++ b/Testing/DynamicElements/BasePage.h @@ -32,7 +32,7 @@ #ifndef _BasePage_h__ #define _BasePage_h__ -@interface BasePage: GSWComponent +@interface BasePage: WOComponent { } @end diff --git a/Testing/DynamicElements/BasePage.m b/Testing/DynamicElements/BasePage.m index bd307df..5118bb6 100644 --- a/Testing/DynamicElements/BasePage.m +++ b/Testing/DynamicElements/BasePage.m @@ -28,13 +28,13 @@ **/ -#include +#include #include "BasePage.h" @implementation BasePage --(GSWComponent*)submitAction +-(WOComponent*)submitAction { return nil; }; diff --git a/Testing/DynamicElements/Browser1Page.gswc/Browser1Page.html b/Testing/DynamicElements/Browser1Page.gswc/Browser1Page.html deleted file mode 100644 index 79020d1..0000000 --- a/Testing/DynamicElements/Browser1Page.gswc/Browser1Page.html +++ /dev/null @@ -1,18 +0,0 @@ - - -GSWBrowser Test 1 - - -

GSWBrowser Test 1 (With value)

-
-Selected items :
-Selected item values :
-
- - - - -
- - - \ No newline at end of file diff --git a/Testing/DynamicElements/Browser1Page.m b/Testing/DynamicElements/Browser1Page.m index 77bb0e6..1dc2ed8 100644 --- a/Testing/DynamicElements/Browser1Page.m +++ b/Testing/DynamicElements/Browser1Page.m @@ -28,7 +28,7 @@ **/ -#include +#include #include "BasePage.h" #include "Browser1Page.h" diff --git a/Testing/DynamicElements/Browser1Page.wo/Browser1Page.html b/Testing/DynamicElements/Browser1Page.wo/Browser1Page.html new file mode 100644 index 0000000..347ed21 --- /dev/null +++ b/Testing/DynamicElements/Browser1Page.wo/Browser1Page.html @@ -0,0 +1,17 @@ + + +GSWBrowser Test 1 + + +

GSWBrowser Test 1 (With value) (currently broken DON'T use as examle, use Browser 2)

+
+Selected items :
+
+ + + + +
+ + + diff --git a/Testing/DynamicElements/Browser1Page.gswc/Browser1Page.gswd b/Testing/DynamicElements/Browser1Page.wo/Browser1Page.wod similarity index 50% rename from Testing/DynamicElements/Browser1Page.gswc/Browser1Page.gswd rename to Testing/DynamicElements/Browser1Page.wo/Browser1Page.wod index 738746a..57f31ab 100644 --- a/Testing/DynamicElements/Browser1Page.gswc/Browser1Page.gswd +++ b/Testing/DynamicElements/Browser1Page.wo/Browser1Page.wod @@ -1,25 +1,34 @@ -#include "Base" -ABrowser: GSWBrowser +ABrowser: WOBrowser { list = application.bundleInfo.Browser.list; item = anItem; value = anItem.value; displayString = anItem.label; selections = selectedItems; - selectionValues = selectedValues; - selectedValues = selectedValues; multiple = YES; name = "BROWSERNAME"; }; -SelectedItems: GSWString +SelectedItems: WOString { value = selectedItems; }; -SelectedValues: GSWString +MainPageLink: WOHyperlink { - value = selectedValues; + pageName = "Main"; + string = "Main Page"; +}; + +Form: WOForm +{ + enctype = "multipart/form-data"; +}; + +SubmitButton: WOSubmitButton +{ + action = submitAction; + value = "Submit"; }; diff --git a/Testing/DynamicElements/Browser2Page.gswc/Browser2Page.gswd b/Testing/DynamicElements/Browser2Page.gswc/Browser2Page.gswd deleted file mode 100644 index 2615ea0..0000000 --- a/Testing/DynamicElements/Browser2Page.gswc/Browser2Page.gswd +++ /dev/null @@ -1,24 +0,0 @@ -#include "Base" - -ABrowser: GSWBrowser -{ - list = application.bundleInfo.Browser.list; - item = anItem; - displayString = anItem.label; - selections = selectedItems; - selectionValues = selectedValues; - selectedValues = selectedValues; - multiple = YES; - name = "BROWSERNAME"; -}; - -SelectedItems: GSWString -{ - value = selectedItems; -}; - -SelectedValues: GSWString -{ - value = selectedValues; -}; - diff --git a/Testing/DynamicElements/Browser2Page.gswc/Browser2Page.html b/Testing/DynamicElements/Browser2Page.gswc/Browser2Page.html deleted file mode 100644 index 41d362e..0000000 --- a/Testing/DynamicElements/Browser2Page.gswc/Browser2Page.html +++ /dev/null @@ -1,18 +0,0 @@ - - -GSWBrowser Test 2 - - -

GSWBrowser Test 2 (Without value: AutoValue)

-
-Selected items :
-Selected item values :
-
- - - - -
- - - \ No newline at end of file diff --git a/Testing/DynamicElements/Browser2Page.m b/Testing/DynamicElements/Browser2Page.m index 9076171..778fec6 100644 --- a/Testing/DynamicElements/Browser2Page.m +++ b/Testing/DynamicElements/Browser2Page.m @@ -28,7 +28,7 @@ **/ -#include +#include #include "BasePage.h" #include "Browser2Page.h" diff --git a/Testing/DynamicElements/Browser2Page.wo/Browser2Page.html b/Testing/DynamicElements/Browser2Page.wo/Browser2Page.html new file mode 100644 index 0000000..e44850d --- /dev/null +++ b/Testing/DynamicElements/Browser2Page.wo/Browser2Page.html @@ -0,0 +1,17 @@ + + +GSWBrowser Test 2 + + +

GSWBrowser Test 2 (Without value: AutoValue)

+
+Selected items :
+
+ + + + +
+ + + diff --git a/Testing/DynamicElements/Browser2Page.wo/Browser2Page.wod b/Testing/DynamicElements/Browser2Page.wo/Browser2Page.wod new file mode 100644 index 0000000..357de85 --- /dev/null +++ b/Testing/DynamicElements/Browser2Page.wo/Browser2Page.wod @@ -0,0 +1,33 @@ + +ABrowser: WOBrowser +{ + list = application.bundleInfo.Browser.list; + item = anItem; + displayString = anItem.label; + selections = selectedItems; + multiple = YES; + name = "BROWSERNAME"; +}; + +SelectedItems: WOString +{ + value = selectedItems; +}; + +MainPageLink: WOHyperlink +{ + pageName = "Main"; + string = "Main Page"; +}; + +Form: WOForm +{ + enctype = "multipart/form-data"; +}; + +SubmitButton: WOSubmitButton +{ + action = submitAction; + value = "Submit"; +}; + diff --git a/Testing/DynamicElements/CheckBox1Page.gswc/CheckBox1Page.gswd b/Testing/DynamicElements/CheckBox1Page.gswc/CheckBox1Page.gswd deleted file mode 100644 index 3edb775..0000000 --- a/Testing/DynamicElements/CheckBox1Page.gswc/CheckBox1Page.gswd +++ /dev/null @@ -1,18 +0,0 @@ -#include "Base" - -ACheckBox: GSWCheckBox -{ - value = "MyValue"; - selection = checkBoxValue; - checked = isChecked; -}; - -CheckValue: GSWString -{ - value = checkBoxValue; -}; - -IsCheckedValue: GSWString -{ - value = isChecked; -}; \ No newline at end of file diff --git a/Testing/DynamicElements/CheckBox1Page.gswc/CheckBox1Page.html b/Testing/DynamicElements/CheckBox1Page.gswc/CheckBox1Page.html deleted file mode 100644 index 104587c..0000000 --- a/Testing/DynamicElements/CheckBox1Page.gswc/CheckBox1Page.html +++ /dev/null @@ -1,18 +0,0 @@ - - -GSWCheckBox Test 1 - - -

GSWCheckBox Test 1

-
-Value :
-Is Checked :
-
- -Check Me ! - - -
- - - \ No newline at end of file diff --git a/Testing/DynamicElements/CheckBox1Page.m b/Testing/DynamicElements/CheckBox1Page.m index 1fc0b41..ff05a00 100644 --- a/Testing/DynamicElements/CheckBox1Page.m +++ b/Testing/DynamicElements/CheckBox1Page.m @@ -28,7 +28,7 @@ **/ -#include +#include #include "BasePage.h" #include "CheckBox1Page.h" diff --git a/Testing/DynamicElements/CheckBox1Page.wo/CheckBox1Page.html b/Testing/DynamicElements/CheckBox1Page.wo/CheckBox1Page.html new file mode 100644 index 0000000..46f75d6 --- /dev/null +++ b/Testing/DynamicElements/CheckBox1Page.wo/CheckBox1Page.html @@ -0,0 +1,17 @@ + + +GSWCheckBox Test 1 + + +

GSWCheckBox Test 1

+
+Value :
+
+ +Check Me ! + + +
+ + + diff --git a/Testing/DynamicElements/CheckBox1Page.wo/CheckBox1Page.wod b/Testing/DynamicElements/CheckBox1Page.wo/CheckBox1Page.wod new file mode 100644 index 0000000..5149397 --- /dev/null +++ b/Testing/DynamicElements/CheckBox1Page.wo/CheckBox1Page.wod @@ -0,0 +1,29 @@ + +ACheckBox: WOCheckBox +{ + value = "MyValue"; + selection = checkBoxValue; +}; + +CheckValue: WOString +{ + value = checkBoxValue; +}; + +MainPageLink: WOHyperlink +{ + pageName = "Main"; + string = "Main Page"; +}; + +Form: WOForm +{ + enctype = "multipart/form-data"; +}; + +SubmitButton: WOSubmitButton +{ + action = submitAction; + value = "Submit"; +}; + diff --git a/Testing/DynamicElements/CheckBox2Page.gswc/CheckBox2Page.gswd b/Testing/DynamicElements/CheckBox2Page.gswc/CheckBox2Page.gswd deleted file mode 100644 index a63bfc3..0000000 --- a/Testing/DynamicElements/CheckBox2Page.gswc/CheckBox2Page.gswd +++ /dev/null @@ -1,17 +0,0 @@ -#include "Base" - -ACheckBox: GSWCheckBox -{ - selection = checkBoxValue; - checked = isChecked; -}; - -CheckValue: GSWString -{ - value = checkBoxValue; -}; - -IsCheckedValue: GSWString -{ - value = isChecked; -}; \ No newline at end of file diff --git a/Testing/DynamicElements/CheckBox2Page.gswc/CheckBox2Page.html b/Testing/DynamicElements/CheckBox2Page.gswc/CheckBox2Page.html deleted file mode 100644 index 413bbd9..0000000 --- a/Testing/DynamicElements/CheckBox2Page.gswc/CheckBox2Page.html +++ /dev/null @@ -1,18 +0,0 @@ - - -GSWCheckBox Test 2 - - -

GSWCheckBox Test 2

-
-Value :
-Is Checked :
-
- -Check Me ! - - -
- - - \ No newline at end of file diff --git a/Testing/DynamicElements/CheckBox2Page.m b/Testing/DynamicElements/CheckBox2Page.m index 6c07ef6..e36f06d 100644 --- a/Testing/DynamicElements/CheckBox2Page.m +++ b/Testing/DynamicElements/CheckBox2Page.m @@ -28,7 +28,7 @@ **/ -#include +#include #include "BasePage.h" #include "CheckBox2Page.h" diff --git a/Testing/DynamicElements/CheckBox2Page.wo/CheckBox2Page.html b/Testing/DynamicElements/CheckBox2Page.wo/CheckBox2Page.html new file mode 100644 index 0000000..6e58e6f --- /dev/null +++ b/Testing/DynamicElements/CheckBox2Page.wo/CheckBox2Page.html @@ -0,0 +1,17 @@ + + +GSWCheckBox Test 2 + + +

GSWCheckBox Test 2

+
+Is Checked :
+
+ +Check Me ! + + +
+ + + diff --git a/Testing/DynamicElements/CheckBox2Page.wo/CheckBox2Page.wod b/Testing/DynamicElements/CheckBox2Page.wo/CheckBox2Page.wod new file mode 100644 index 0000000..70e476c --- /dev/null +++ b/Testing/DynamicElements/CheckBox2Page.wo/CheckBox2Page.wod @@ -0,0 +1,28 @@ + +ACheckBox: WOCheckBox +{ + selection = checkBoxValue; + checked = isChecked; +}; + +IsCheckedValue: WOString +{ + value = isChecked; +}; +MainPageLink: WOHyperlink +{ + pageName = "Main"; + string = "Main Page"; +}; + +Form: WOForm +{ + enctype = "multipart/form-data"; +}; + +SubmitButton: WOSubmitButton +{ + action = submitAction; + value = "Submit"; +}; + diff --git a/Testing/DynamicElements/CheckBoxList1Page.gswc/CheckBoxList1Page.gswd b/Testing/DynamicElements/CheckBoxList1Page.gswc/CheckBoxList1Page.gswd deleted file mode 100644 index 79262d3..0000000 --- a/Testing/DynamicElements/CheckBoxList1Page.gswc/CheckBoxList1Page.gswd +++ /dev/null @@ -1,22 +0,0 @@ -#include "Base" - -ACheckBoxList: GSWCheckBoxList -{ - list = application.bundleInfo.CheckBoxList.list; - item = anItem; - value = anItem.value; - displayString = anItem.label; - selections = selectedItems; - name = "CHECKNAME"; -}; - -SelectedItems: GSWString -{ - value = selectedItems; -}; - -SelectedValues: GSWString -{ - value = selectedValues; -}; - diff --git a/Testing/DynamicElements/CheckBoxList1Page.gswc/CheckBoxList1Page.html b/Testing/DynamicElements/CheckBoxList1Page.gswc/CheckBoxList1Page.html deleted file mode 100644 index 9319ebc..0000000 --- a/Testing/DynamicElements/CheckBoxList1Page.gswc/CheckBoxList1Page.html +++ /dev/null @@ -1,17 +0,0 @@ - - -GSWCheckBoxList Test 1 - - -

GSWCheckBoxList Test 1 (With value)

-
-Selected items :
-
- - - - -
- - - \ No newline at end of file diff --git a/Testing/DynamicElements/CheckBoxList1Page.gswc/RadioButtonList1Page.gswd b/Testing/DynamicElements/CheckBoxList1Page.gswc/RadioButtonList1Page.gswd deleted file mode 100644 index ef1e88e..0000000 --- a/Testing/DynamicElements/CheckBoxList1Page.gswc/RadioButtonList1Page.gswd +++ /dev/null @@ -1,16 +0,0 @@ -#include "Base" - -ARadioButtonList: GSWRadioButtonList -{ - list = application.bundleInfo.RadioButtonList.list; - item = anItem; - value = anItem.value; - displayString = anItem.label; - selection = selectedItem; -}; - -SelectedItem: GSWString -{ - value = selectedItem; -}; - diff --git a/Testing/DynamicElements/CheckBoxList1Page.m b/Testing/DynamicElements/CheckBoxList1Page.m index a174309..188b774 100644 --- a/Testing/DynamicElements/CheckBoxList1Page.m +++ b/Testing/DynamicElements/CheckBoxList1Page.m @@ -28,7 +28,7 @@ **/ -#include +#include #include "BasePage.h" #include "CheckBoxList1Page.h" diff --git a/Testing/DynamicElements/CheckBoxList1Page.wo/CheckBoxList1Page.html b/Testing/DynamicElements/CheckBoxList1Page.wo/CheckBoxList1Page.html new file mode 100644 index 0000000..bcf9ae8 --- /dev/null +++ b/Testing/DynamicElements/CheckBoxList1Page.wo/CheckBoxList1Page.html @@ -0,0 +1,17 @@ + + +GSWCheckBoxList Test 1 + + +

GSWCheckBoxList Test 1 (With value)

+
+Selected items :
+
+ + + + +
+ + + diff --git a/Testing/DynamicElements/CheckBoxList1Page.wo/CheckBoxList1Page.wod b/Testing/DynamicElements/CheckBoxList1Page.wo/CheckBoxList1Page.wod new file mode 100644 index 0000000..cb12ed4 --- /dev/null +++ b/Testing/DynamicElements/CheckBoxList1Page.wo/CheckBoxList1Page.wod @@ -0,0 +1,38 @@ + +ACheckBoxList: WOCheckBoxList +{ + list = application.bundleInfo.CheckBoxList.list; + item = anItem; + value = anItem.value; + displayString = anItem.label; + selections = selectedItems; + name = "CHECKNAME"; +}; + +SelectedItems: WOString +{ + value = selectedItems; +}; + +SelectedValues: WOString +{ + value = selectedValues; +}; + +MainPageLink: WOHyperlink +{ + pageName = "Main"; + string = "Main Page"; +}; + +Form: WOForm +{ + enctype = "multipart/form-data"; +}; + +SubmitButton: WOSubmitButton +{ + action = submitAction; + value = "Submit"; +}; + diff --git a/Testing/DynamicElements/CheckBoxList1Page.gswc/RadioButtonList1Page.html b/Testing/DynamicElements/CheckBoxList1Page.wo/RadioButtonList1Page.html similarity index 100% rename from Testing/DynamicElements/CheckBoxList1Page.gswc/RadioButtonList1Page.html rename to Testing/DynamicElements/CheckBoxList1Page.wo/RadioButtonList1Page.html diff --git a/Testing/DynamicElements/CheckBoxList2Page.gswc/CheckBoxList2Page.gswd b/Testing/DynamicElements/CheckBoxList2Page.gswc/CheckBoxList2Page.gswd deleted file mode 100644 index 4378657..0000000 --- a/Testing/DynamicElements/CheckBoxList2Page.gswc/CheckBoxList2Page.gswd +++ /dev/null @@ -1,16 +0,0 @@ -#include "Base" - -ACheckBoxList: GSWCheckBoxList -{ - list = application.bundleInfo.CheckBoxList.list; - item = anItem; - displayString = anItem.label; - selections = selectedItems; - name = "CHECKNAME"; -}; - -SelectedItems: GSWString -{ - value = selectedItems; -}; - diff --git a/Testing/DynamicElements/CheckBoxList2Page.gswc/CheckBoxList2Page.html b/Testing/DynamicElements/CheckBoxList2Page.gswc/CheckBoxList2Page.html deleted file mode 100644 index d7f75fa..0000000 --- a/Testing/DynamicElements/CheckBoxList2Page.gswc/CheckBoxList2Page.html +++ /dev/null @@ -1,17 +0,0 @@ - - -GSWCheckBoxList Test 2 - - -

GSWCheckBoxList Test 2 (Without value: AutoValue)

-
-Selected items :
-
- - - - -
- - - \ No newline at end of file diff --git a/Testing/DynamicElements/CheckBoxList2Page.gswc/RadioButtonList2Page.gswd b/Testing/DynamicElements/CheckBoxList2Page.gswc/RadioButtonList2Page.gswd deleted file mode 100644 index 06ac99e..0000000 --- a/Testing/DynamicElements/CheckBoxList2Page.gswc/RadioButtonList2Page.gswd +++ /dev/null @@ -1,15 +0,0 @@ -#include "Base" - -ARadioButtonList: GSWRadioButtonList -{ - list = application.bundleInfo.RadioButtonList.list; - item = anItem; - displayString = anItem.label; - selection = selectedItem; -}; - -SelectedItem: GSWString -{ - value = selectedItem; -}; - diff --git a/Testing/DynamicElements/CheckBoxList2Page.m b/Testing/DynamicElements/CheckBoxList2Page.m index 34e6ab0..8500415 100644 --- a/Testing/DynamicElements/CheckBoxList2Page.m +++ b/Testing/DynamicElements/CheckBoxList2Page.m @@ -28,7 +28,7 @@ **/ -#include +#include #include "BasePage.h" #include "CheckBoxList2Page.h" diff --git a/Testing/DynamicElements/CheckBoxList2Page.wo/CheckBoxList2Page.html b/Testing/DynamicElements/CheckBoxList2Page.wo/CheckBoxList2Page.html new file mode 100644 index 0000000..1e6a3f9 --- /dev/null +++ b/Testing/DynamicElements/CheckBoxList2Page.wo/CheckBoxList2Page.html @@ -0,0 +1,17 @@ + + +GSWCheckBoxList Test 2 + + +

GSWCheckBoxList Test 2 (Without value: AutoValue)

+
+Selected items :
+
+ + + + +
+ + + diff --git a/Testing/DynamicElements/CheckBoxList2Page.wo/CheckBoxList2Page.wod b/Testing/DynamicElements/CheckBoxList2Page.wo/CheckBoxList2Page.wod new file mode 100644 index 0000000..d93186c --- /dev/null +++ b/Testing/DynamicElements/CheckBoxList2Page.wo/CheckBoxList2Page.wod @@ -0,0 +1,32 @@ + +ACheckBoxList: WOCheckBoxList +{ + list = application.bundleInfo.CheckBoxList.list; + item = anItem; + displayString = anItem.label; + selections = selectedItems; + name = "CHECKNAME"; +}; + +SelectedItems: WOString +{ + value = selectedItems; +}; + +MainPageLink: WOHyperlink +{ + pageName = "Main"; + string = "Main Page"; +}; + +Form: WOForm +{ + enctype = "multipart/form-data"; +}; + +SubmitButton: WOSubmitButton +{ + action = submitAction; + value = "Submit"; +}; + diff --git a/Testing/DynamicElements/CheckBoxList2Page.gswc/RadioButtonList2Page.html b/Testing/DynamicElements/CheckBoxList2Page.wo/RadioButtonList2Page.html similarity index 100% rename from Testing/DynamicElements/CheckBoxList2Page.gswc/RadioButtonList2Page.html rename to Testing/DynamicElements/CheckBoxList2Page.wo/RadioButtonList2Page.html diff --git a/Testing/DynamicElements/DynamicElements.h b/Testing/DynamicElements/DynamicElements.h index 26572c9..35765fa 100644 --- a/Testing/DynamicElements/DynamicElements.h +++ b/Testing/DynamicElements/DynamicElements.h @@ -1,3 +1,5 @@ +#include + //==================================================================== -@interface DynamicElements : GSWApplication +@interface DynamicElements : WOApplication @end diff --git a/Testing/DynamicElements/DynamicElements.m b/Testing/DynamicElements/DynamicElements.m index a436f8d..70c80f8 100644 --- a/Testing/DynamicElements/DynamicElements.m +++ b/Testing/DynamicElements/DynamicElements.m @@ -1,12 +1,23 @@ -#include +#include #include "DynamicElements.h" +/* Those are just empty to make the demo work. + * In an real application, you might want to add real code to these classes + * and split them into separate files. + */ + @implementation DynamicElements @end -@interface Session: GSWSession +@interface Session: WOSession @end @implementation Session @end +@interface DirectAction: WODirectAction +@end + +@implementation DirectAction +@end + diff --git a/Testing/DynamicElements/DynamicElements_main.m b/Testing/DynamicElements/DynamicElements_main.m index 1f51800..4d885c3 100644 --- a/Testing/DynamicElements/DynamicElements_main.m +++ b/Testing/DynamicElements/DynamicElements_main.m @@ -1,10 +1,10 @@ -#include +#include int main(int argc, const char *argv[]) { int ret=0; NSAutoreleasePool *arp = [NSAutoreleasePool new]; - ret=GSWApplicationMain(@"DynamicElements", argc, argv); + ret=WOApplicationMain(@"DynamicElements", argc, argv); [arp release]; return ret; } diff --git a/Testing/DynamicElements/FileUpload1Page.gswc/FileUpload1Page.gswd b/Testing/DynamicElements/FileUpload1Page.gswc/FileUpload1Page.gswd deleted file mode 100644 index 62b9f59..0000000 --- a/Testing/DynamicElements/FileUpload1Page.gswc/FileUpload1Page.gswd +++ /dev/null @@ -1,23 +0,0 @@ -#include "Base" - -AFileUpload: GSWFileUpload -{ - filePath=aFilePath; - data=aFileData; -}; - -FileName: GSWString -{ - value = aFilePath; -}; - -FileSize: GSWString -{ - value = aFileData.length.description; -}; - -FileContent: GSWString -{ - value = aFileData.description; -}; - diff --git a/Testing/DynamicElements/FileUpload1Page.gswc/FileUpload1Page.html b/Testing/DynamicElements/FileUpload1Page.gswc/FileUpload1Page.html deleted file mode 100644 index 65fbf7e..0000000 --- a/Testing/DynamicElements/FileUpload1Page.gswc/FileUpload1Page.html +++ /dev/null @@ -1,19 +0,0 @@ - - - GSWFileUpload Test 1 - - -

GSWFileUpload Test 1

-
- FileName :
- FileSize :
- FileContent :
-
- - - - -
- - - diff --git a/Testing/DynamicElements/FileUpload1Page.m b/Testing/DynamicElements/FileUpload1Page.m index 37e1f6e..ab6e9f2 100644 --- a/Testing/DynamicElements/FileUpload1Page.m +++ b/Testing/DynamicElements/FileUpload1Page.m @@ -28,7 +28,7 @@ **/ -#include +#include #include "BasePage.h" #include "FileUpload1Page.h" diff --git a/Testing/DynamicElements/FileUpload1Page.wo/FileUpload1Page.html b/Testing/DynamicElements/FileUpload1Page.wo/FileUpload1Page.html new file mode 100644 index 0000000..8b94c21 --- /dev/null +++ b/Testing/DynamicElements/FileUpload1Page.wo/FileUpload1Page.html @@ -0,0 +1,19 @@ + + + GSWFileUpload Test 1 + + +

GSWFileUpload Test 1

+
+ FileName :
+ FileSize :
+ FileContent :
+
+ + + + +
+ + + diff --git a/Testing/DynamicElements/FileUpload1Page.wo/FileUpload1Page.wod b/Testing/DynamicElements/FileUpload1Page.wo/FileUpload1Page.wod new file mode 100644 index 0000000..3722bbc --- /dev/null +++ b/Testing/DynamicElements/FileUpload1Page.wo/FileUpload1Page.wod @@ -0,0 +1,39 @@ + +AFileUpload: WOFileUpload +{ + filePath=aFilePath; + data=aFileData; +}; + +FileName: WOString +{ + value = aFilePath; +}; + +FileSize: WOString +{ + value = aFileData.length.description; +}; + +FileContent: WOString +{ + value = aFileData.description; +}; + +MainPageLink: WOHyperlink +{ + pageName = "Main"; + string = "Main Page"; +}; + +Form: WOForm +{ + enctype = "multipart/form-data"; +}; + +SubmitButton: WOSubmitButton +{ + action = submitAction; + value = "Submit"; +}; + diff --git a/Testing/DynamicElements/GNUmakefile b/Testing/DynamicElements/GNUmakefile index d96c96e..725286e 100644 --- a/Testing/DynamicElements/GNUmakefile +++ b/Testing/DynamicElements/GNUmakefile @@ -22,12 +22,8 @@ # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -include ../../config.mak include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/Auxiliary/gsweb.make -ifeq ($(GDL2),yes) -include $(GNUSTEP_MAKEFILES)/Auxiliary/gdl2.make -endif GSWAPP_NAME=DynamicElements DynamicElements_HAS_GSWCOMPONENTS=YES @@ -37,7 +33,6 @@ DynamicElements_GSWAPP_INFO_PLIST=Resources/Info-DynamicElements.plist # The bundle resource files and directories DynamicElements_RESOURCE_FILES = \ Resources/Info-DynamicElements.plist \ -Resources/Base.gswd \ # The Objective-C source files to be compiled @@ -58,29 +53,33 @@ PopUpButton2Page.m \ TextField1Page.m \ CheckBox1Page.m \ CheckBox2Page.m \ -RadioButton1Page.m \ -RadioButton2Page.m \ +RadioButton1Page.m DynamicElements_COMPONENTS = \ -Main.gswc \ -FileUpload1Page.gswc \ -RadioButtonList1Page.gswc \ -RadioButtonList2Page.gswc \ -CheckBoxList1Page.gswc \ -CheckBoxList2Page.gswc \ -Browser1Page.gswc \ -Browser2Page.gswc \ -PopUpButton1Page.gswc \ -PopUpButton2Page.gswc \ -TextField1Page.gswc \ -CheckBox1Page.gswc \ -CheckBox2Page.gswc \ -RadioButton1Page.gswc \ -RadioButton2Page.gswc \ +Main.wo \ +FileUpload1Page.wo \ +RadioButtonList1Page.wo \ +RadioButtonList2Page.wo \ +CheckBoxList1Page.wo \ +CheckBoxList2Page.wo \ +Browser1Page.wo \ +Browser2Page.wo \ +PopUpButton1Page.wo \ +PopUpButton2Page.wo \ +TextField1Page.wo \ +CheckBox1Page.wo \ +CheckBox2Page.wo \ +RadioButton1Page.wo -include Makefile.preamble include $(GNUSTEP_MAKEFILES)/gswapp.make +ifneq ($(FOUNDATION_LIB),gnu) +AUXILIARY_GSW_LIBS = -framework WebObjects -framework WOExtensions +else +AUXILIARY_GSW_LIBS += -lWebObjects -lWOExtensions +endif + -include Makefile.postamble diff --git a/Testing/DynamicElements/Main.h b/Testing/DynamicElements/Main.h index 9d0093b..57fb861 100644 --- a/Testing/DynamicElements/Main.h +++ b/Testing/DynamicElements/Main.h @@ -10,9 +10,9 @@ */ -#include +#include -@interface Main: GSWComponent +@interface Main: WOComponent { id tmpDynamicElement; } diff --git a/Testing/DynamicElements/Main.gswc/Main.html b/Testing/DynamicElements/Main.wo/Main.html similarity index 56% rename from Testing/DynamicElements/Main.gswc/Main.html rename to Testing/DynamicElements/Main.wo/Main.html index 32d4690..b71798d 100644 --- a/Testing/DynamicElements/Main.gswc/Main.html +++ b/Testing/DynamicElements/Main.wo/Main.html @@ -5,9 +5,9 @@

GNUstepWeb Dynamic Elements Testing

    - -
    • -     + +
    • +
diff --git a/Testing/DynamicElements/Main.gswc/Main.gswd b/Testing/DynamicElements/Main.wo/Main.wod similarity index 89% rename from Testing/DynamicElements/Main.gswc/Main.gswd rename to Testing/DynamicElements/Main.wo/Main.wod index 46ca124..f473e97 100644 --- a/Testing/DynamicElements/Main.gswc/Main.gswd +++ b/Testing/DynamicElements/Main.wo/Main.wod @@ -9,19 +9,19 @@ * DynamicElements Testing application. */ -Repetition: GSWRepetition +Repetition: WORepetition { item = tmpDynamicElement; list = application.bundleInfo.dynamicElements; }; -Link: GSWHyperlink +Link: WOHyperlink { pageName = tmpDynamicElement.pageName; string = tmpDynamicElement.label; }; -Comment: GSWString +Comment: WOString { value = tmpDynamicElement.comment; }; diff --git a/Testing/DynamicElements/PopUpButton1Page.gswc/PopUpButton1Page.gswd b/Testing/DynamicElements/PopUpButton1Page.gswc/PopUpButton1Page.gswd deleted file mode 100644 index fc14120..0000000 --- a/Testing/DynamicElements/PopUpButton1Page.gswc/PopUpButton1Page.gswd +++ /dev/null @@ -1,25 +0,0 @@ -#include "Base" - -APopUpButton: GSWPopUpButton -{ - list = application.bundleInfo.PopUpButton.list; - item = anItem; - value = anItem.value; - displayString = anItem.label; - selection = selectedItem; - selectedValue = selectedValue; - selectionValue = selectedValue; - noSelectionString = "Nothing Selected"; - name = "POPNAME"; -}; - -SelectedItem: GSWString -{ - value = selectedItem; -}; - -SelectedValue: GSWString -{ - value = selectedValue; -}; - diff --git a/Testing/DynamicElements/PopUpButton1Page.gswc/PopUpButton1Page.html b/Testing/DynamicElements/PopUpButton1Page.gswc/PopUpButton1Page.html deleted file mode 100644 index 7dd7442..0000000 --- a/Testing/DynamicElements/PopUpButton1Page.gswc/PopUpButton1Page.html +++ /dev/null @@ -1,18 +0,0 @@ - - -GSWPopUpButton Test 1 - - -

GSWPopUpButton Test 1 (With value)

-
-Selected item :
-Selected value :
-
- - - - -
- - - \ No newline at end of file diff --git a/Testing/DynamicElements/PopUpButton1Page.m b/Testing/DynamicElements/PopUpButton1Page.m index 19ab1da..b78a9b8 100644 --- a/Testing/DynamicElements/PopUpButton1Page.m +++ b/Testing/DynamicElements/PopUpButton1Page.m @@ -28,7 +28,7 @@ **/ -#include +#include #include "BasePage.h" #include "PopUpButton1Page.h" diff --git a/Testing/DynamicElements/PopUpButton1Page.wo/PopUpButton1Page.html b/Testing/DynamicElements/PopUpButton1Page.wo/PopUpButton1Page.html new file mode 100644 index 0000000..6eeb502 --- /dev/null +++ b/Testing/DynamicElements/PopUpButton1Page.wo/PopUpButton1Page.html @@ -0,0 +1,18 @@ + + +GSWPopUpButton Test 1 + + +

GSWPopUpButton Test 1 (With value)

+
+Selected item :
+Selected value :
+
+ + + + +
+ + + diff --git a/Testing/DynamicElements/PopUpButton1Page.wo/PopUpButton1Page.wod b/Testing/DynamicElements/PopUpButton1Page.wo/PopUpButton1Page.wod new file mode 100644 index 0000000..fcb66d2 --- /dev/null +++ b/Testing/DynamicElements/PopUpButton1Page.wo/PopUpButton1Page.wod @@ -0,0 +1,39 @@ + +APopUpButton: WOPopUpButton +{ + list = application.bundleInfo.PopUpButton.list; + item = anItem; + value = anItem.value; + displayString = anItem.label; + selection = selectedItem; + noSelectionString = "Nothing Selected"; + name = "POPNAME"; +}; + +SelectedItem: WOString +{ + value = selectedItem; +}; + +SelectedValue: WOString +{ + value = selectedItem.value; +}; + +MainPageLink: WOHyperlink +{ + pageName = "Main"; + string = "Main Page"; +}; + +Form: WOForm +{ + enctype = "multipart/form-data"; +}; + +SubmitButton: WOSubmitButton +{ + action = submitAction; + value = "Submit"; +}; + diff --git a/Testing/DynamicElements/PopUpButton2Page.gswc/PopUpButton2Page.gswd b/Testing/DynamicElements/PopUpButton2Page.gswc/PopUpButton2Page.gswd deleted file mode 100644 index bf4bb79..0000000 --- a/Testing/DynamicElements/PopUpButton2Page.gswc/PopUpButton2Page.gswd +++ /dev/null @@ -1,24 +0,0 @@ -#include "Base" - -APopUpButton: GSWPopUpButton -{ - list = application.bundleInfo.PopUpButton.list; - item = anItem; - displayString = anItem.label; - selection = selectedItem; - selectedValue = selectedValue; - selectionValue = selectedValue; - noSelectionString = "Nothing Selected"; - name = "POPNAME"; -}; - -SelectedItem: GSWString -{ - value = selectedItem; -}; - -SelectedValue: GSWString -{ - value = selectedValue; -}; - diff --git a/Testing/DynamicElements/PopUpButton2Page.gswc/PopUpButton2Page.html b/Testing/DynamicElements/PopUpButton2Page.gswc/PopUpButton2Page.html deleted file mode 100644 index ac3f333..0000000 --- a/Testing/DynamicElements/PopUpButton2Page.gswc/PopUpButton2Page.html +++ /dev/null @@ -1,18 +0,0 @@ - - -GSWPopUpButton Test 2 - - -

GSWPopUpButton Test 2 (Without value: AutoValue)

-
-Selected item :
-Selected value :
-
- - - - -
- - - \ No newline at end of file diff --git a/Testing/DynamicElements/PopUpButton2Page.m b/Testing/DynamicElements/PopUpButton2Page.m index a5db6b6..962d2ea 100644 --- a/Testing/DynamicElements/PopUpButton2Page.m +++ b/Testing/DynamicElements/PopUpButton2Page.m @@ -28,7 +28,7 @@ **/ -#include +#include #include "BasePage.h" #include "PopUpButton2Page.h" diff --git a/Testing/DynamicElements/PopUpButton2Page.wo/PopUpButton2Page.html b/Testing/DynamicElements/PopUpButton2Page.wo/PopUpButton2Page.html new file mode 100644 index 0000000..9049d21 --- /dev/null +++ b/Testing/DynamicElements/PopUpButton2Page.wo/PopUpButton2Page.html @@ -0,0 +1,18 @@ + + +GSWPopUpButton Test 2 + + +

GSWPopUpButton Test 2 (Without value: AutoValue)

+
+Selected item :
+Selected value :
+
+ + + + +
+ + + diff --git a/Testing/DynamicElements/PopUpButton2Page.wo/PopUpButton2Page.wod b/Testing/DynamicElements/PopUpButton2Page.wo/PopUpButton2Page.wod new file mode 100644 index 0000000..269b9b4 --- /dev/null +++ b/Testing/DynamicElements/PopUpButton2Page.wo/PopUpButton2Page.wod @@ -0,0 +1,38 @@ + +APopUpButton: WOPopUpButton +{ + list = application.bundleInfo.PopUpButton.list; + item = anItem; + displayString = anItem.label; + selection = selectedItem; + noSelectionString = "Nothing Selected"; + name = "POPNAME"; +}; + +SelectedItem: WOString +{ + value = selectedItem; +}; + +SelectedValue: WOString +{ + value = selectedItem.value; +}; + +MainPageLink: WOHyperlink +{ + pageName = "Main"; + string = "Main Page"; +}; + +Form: WOForm +{ + enctype = "multipart/form-data"; +}; + +SubmitButton: WOSubmitButton +{ + action = submitAction; + value = "Submit"; +}; + diff --git a/Testing/DynamicElements/RadioButton1Page.gswc/RadioButton1Page.gswd b/Testing/DynamicElements/RadioButton1Page.gswc/RadioButton1Page.gswd deleted file mode 100644 index 83d0e0c..0000000 --- a/Testing/DynamicElements/RadioButton1Page.gswc/RadioButton1Page.gswd +++ /dev/null @@ -1,46 +0,0 @@ -#include "Base" - - -RadioButton1: GSWRadioButton -{ - value = "MyValue1"; - selection = value; - checked = isChecked1; - name = "RadioButton"; -}; - -RadioButton2: GSWRadioButton -{ - value = "MyValue2"; - selection = value; - checked = isChecked2; - name = "RadioButton"; -}; - -RadioButton3: GSWRadioButton -{ - value = "MyValue3"; - selection = value; - checked = isChecked3; - name = "RadioButton"; -}; - -CheckValue: GSWString -{ - value = value; -}; - -IsCheckedValue1: GSWString -{ - value = isChecked1; -}; - -IsCheckedValue2: GSWString -{ - value = isChecked2; -}; - -IsCheckedValue3: GSWString -{ - value = isChecked3; -}; \ No newline at end of file diff --git a/Testing/DynamicElements/RadioButton1Page.gswc/RadioButton1Page.html b/Testing/DynamicElements/RadioButton1Page.gswc/RadioButton1Page.html deleted file mode 100644 index 51af014..0000000 --- a/Testing/DynamicElements/RadioButton1Page.gswc/RadioButton1Page.html +++ /dev/null @@ -1,22 +0,0 @@ - - -GSWRadioButton Test 1 - - -

GSWRadioButton Test 1

-
-Value :
-Is Checked 1 :
-Is Checked 2 :
-Is Checked 3 :
-
- -Check Me 1 ! -Check Me 2 ! -Check Me 3 ! - - -
- - - \ No newline at end of file diff --git a/Testing/DynamicElements/RadioButton1Page.m b/Testing/DynamicElements/RadioButton1Page.m index ee827a2..373535c 100644 --- a/Testing/DynamicElements/RadioButton1Page.m +++ b/Testing/DynamicElements/RadioButton1Page.m @@ -28,7 +28,7 @@ **/ -#include +#include #include "BasePage.h" #include "RadioButton1Page.h" diff --git a/Testing/DynamicElements/RadioButton1Page.wo/RadioButton1Page.html b/Testing/DynamicElements/RadioButton1Page.wo/RadioButton1Page.html new file mode 100644 index 0000000..0303655 --- /dev/null +++ b/Testing/DynamicElements/RadioButton1Page.wo/RadioButton1Page.html @@ -0,0 +1,21 @@ + + +GSWRadioButton Test 1 + + +

GSWRadioButton Test 1

+
+Is Checked 1 :
+Is Checked 2 :
+Is Checked 3 :
+
+ +Check Me 1 ! +Check Me 2 ! +Check Me 3 ! + + +
+ + + diff --git a/Testing/DynamicElements/RadioButton1Page.wo/RadioButton1Page.wod b/Testing/DynamicElements/RadioButton1Page.wo/RadioButton1Page.wod new file mode 100644 index 0000000..6d3cdd2 --- /dev/null +++ b/Testing/DynamicElements/RadioButton1Page.wo/RadioButton1Page.wod @@ -0,0 +1,54 @@ + + +RadioButton1: WORadioButton +{ + selection = value; + checked = isChecked1; + name = "RadioButton"; +}; + +RadioButton2: WORadioButton +{ + selection = value; + checked = isChecked2; + name = "RadioButton"; +}; + +RadioButton3: WORadioButton +{ + selection = value; + checked = isChecked3; + name = "RadioButton"; +}; + +IsCheckedValue1: WOString +{ + value = isChecked1; +}; + +IsCheckedValue2: WOString +{ + value = isChecked2; +}; + +IsCheckedValue3: WOString +{ + value = isChecked3; +}; +MainPageLink: WOHyperlink +{ + pageName = "Main"; + string = "Main Page"; +}; + +Form: WOForm +{ + enctype = "multipart/form-data"; +}; + +SubmitButton: WOSubmitButton +{ + action = submitAction; + value = "Submit"; +}; + diff --git a/Testing/DynamicElements/RadioButton2Page.gswc/RadioButton2Page.gswd b/Testing/DynamicElements/RadioButton2Page.gswc/RadioButton2Page.gswd deleted file mode 100644 index 777ceea..0000000 --- a/Testing/DynamicElements/RadioButton2Page.gswc/RadioButton2Page.gswd +++ /dev/null @@ -1,43 +0,0 @@ -#include "Base" - - -RadioButton1: GSWRadioButton -{ - selection = value; - checked = isChecked1; - name = "RadioButton"; -}; - -RadioButton2: GSWRadioButton -{ - selection = value; - checked = isChecked2; - name = "RadioButton"; -}; - -RadioButton3: GSWRadioButton -{ - selection = value; - checked = isChecked3; - name = "RadioButton"; -}; - -CheckValue: GSWString -{ - value = value; -}; - -IsCheckedValue1: GSWString -{ - value = isChecked1; -}; - -IsCheckedValue2: GSWString -{ - value = isChecked2; -}; - -IsCheckedValue3: GSWString -{ - value = isChecked3; -}; \ No newline at end of file diff --git a/Testing/DynamicElements/RadioButton2Page.gswc/RadioButton2Page.html b/Testing/DynamicElements/RadioButton2Page.gswc/RadioButton2Page.html deleted file mode 100644 index 58d69da..0000000 --- a/Testing/DynamicElements/RadioButton2Page.gswc/RadioButton2Page.html +++ /dev/null @@ -1,22 +0,0 @@ - - -GSWRadioButton Test 2 - - -

GSWRadioButton Test 2

-
-Value :
-Is Checked 1 :
-Is Checked 2 :
-Is Checked 3 :
-
- -Check Me 1 ! -Check Me 2 ! -Check Me 3 ! - - -
- - - \ No newline at end of file diff --git a/Testing/DynamicElements/RadioButton2Page.h b/Testing/DynamicElements/RadioButton2Page.h deleted file mode 100644 index 27019fc..0000000 --- a/Testing/DynamicElements/RadioButton2Page.h +++ /dev/null @@ -1,44 +0,0 @@ -/** RadioButton2Page.h - GSWeb Testing: Class RadioButton2Page - - Copyright (C) 2002 Free Software Foundation, Inc. - - Written by: Manuel Guesdon - Date: Dec 2002 - - $Revision$ - $Date$ - $Id$ - - This file is part of the GNUstep Web Library. - - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -**/ - - -#ifndef _RadioButton2Page_h__ - #define _RadioButton2Page_h__ - -@interface RadioButton2Page: BasePage -{ - id _value; - id _isChecked1; - id _isChecked2; - id _isChecked3; -} -@end - -#endif //_RadioButton2Page_h__ diff --git a/Testing/DynamicElements/RadioButton2Page.m b/Testing/DynamicElements/RadioButton2Page.m deleted file mode 100644 index b11f2bf..0000000 --- a/Testing/DynamicElements/RadioButton2Page.m +++ /dev/null @@ -1,39 +0,0 @@ -/** RadioButton2Page.m - GSWeb Testing: Class RadioButton2Page - - Copyright (C) 2002 Free Software Foundation, Inc. - - Written by: Manuel Guesdon - Date: Dec 2002 - - $Revision$ - $Date$ - $Id$ - - This file is part of the GNUstep Web Library. - - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -**/ - -#include -#include "BasePage.h" -#include "RadioButton2Page.h" - - -@implementation RadioButton2Page - -@end - diff --git a/Testing/DynamicElements/RadioButtonList1Page.gswc/RadioButtonList1Page.gswd b/Testing/DynamicElements/RadioButtonList1Page.gswc/RadioButtonList1Page.gswd deleted file mode 100644 index cc41411..0000000 --- a/Testing/DynamicElements/RadioButtonList1Page.gswc/RadioButtonList1Page.gswd +++ /dev/null @@ -1,17 +0,0 @@ -#include "Base" - -ARadioButtonList: GSWRadioButtonList -{ - list = application.bundleInfo.RadioButtonList.list; - item = anItem; - value = anItem.value; - displayString = anItem.label; - selection = selectedItem; - name = "RADIONAME"; -}; - -SelectedItem: GSWString -{ - value = selectedItem; -}; - diff --git a/Testing/DynamicElements/RadioButtonList1Page.gswc/RadioButtonList1Page.html b/Testing/DynamicElements/RadioButtonList1Page.gswc/RadioButtonList1Page.html deleted file mode 100644 index 0aeb728..0000000 --- a/Testing/DynamicElements/RadioButtonList1Page.gswc/RadioButtonList1Page.html +++ /dev/null @@ -1,17 +0,0 @@ - - -GSWRadioButtonList Test 1 - - -

GSWRadioButtonList Test 1 (With value)

-
-Selected item :
-
- - - - -
- - - \ No newline at end of file diff --git a/Testing/DynamicElements/RadioButtonList1Page.m b/Testing/DynamicElements/RadioButtonList1Page.m index 543b526..7ad9dd9 100644 --- a/Testing/DynamicElements/RadioButtonList1Page.m +++ b/Testing/DynamicElements/RadioButtonList1Page.m @@ -28,7 +28,7 @@ **/ -#include +#include #include "BasePage.h" #include "RadioButtonList1Page.h" diff --git a/Testing/DynamicElements/RadioButtonList1Page.wo/RadioButtonList1Page.html b/Testing/DynamicElements/RadioButtonList1Page.wo/RadioButtonList1Page.html new file mode 100644 index 0000000..bbeb745 --- /dev/null +++ b/Testing/DynamicElements/RadioButtonList1Page.wo/RadioButtonList1Page.html @@ -0,0 +1,17 @@ + + +GSWRadioButtonList Test 1 + + +

GSWRadioButtonList Test 1 (With value)

+
+Selected item :
+
+ + + + +
+ + + diff --git a/Testing/DynamicElements/RadioButtonList1Page.wo/RadioButtonList1Page.wod b/Testing/DynamicElements/RadioButtonList1Page.wo/RadioButtonList1Page.wod new file mode 100644 index 0000000..e5740ff --- /dev/null +++ b/Testing/DynamicElements/RadioButtonList1Page.wo/RadioButtonList1Page.wod @@ -0,0 +1,33 @@ + +ARadioButtonList: WORadioButtonList +{ + list = application.bundleInfo.RadioButtonList.list; + item = anItem; + value = anItem.value; + displayString = anItem.label; + selection = selectedItem; + name = "RADIONAME"; +}; + +SelectedItem: WOString +{ + value = selectedItem; +}; + +MainPageLink: WOHyperlink +{ + pageName = "Main"; + string = "Main Page"; +}; + +Form: WOForm +{ + enctype = "multipart/form-data"; +}; + +SubmitButton: WOSubmitButton +{ + action = submitAction; + value = "Submit"; +}; + diff --git a/Testing/DynamicElements/RadioButtonList2Page.gswc/RadioButtonList2Page.gswd b/Testing/DynamicElements/RadioButtonList2Page.gswc/RadioButtonList2Page.gswd deleted file mode 100644 index 5f33023..0000000 --- a/Testing/DynamicElements/RadioButtonList2Page.gswc/RadioButtonList2Page.gswd +++ /dev/null @@ -1,16 +0,0 @@ -#include "Base" - -ARadioButtonList: GSWRadioButtonList -{ - list = application.bundleInfo.RadioButtonList.list; - item = anItem; - displayString = anItem.label; - selection = selectedItem; - name = "RADIONAME"; -}; - -SelectedItem: GSWString -{ - value = selectedItem; -}; - diff --git a/Testing/DynamicElements/RadioButtonList2Page.gswc/RadioButtonList2Page.html b/Testing/DynamicElements/RadioButtonList2Page.gswc/RadioButtonList2Page.html deleted file mode 100644 index 9bf5498..0000000 --- a/Testing/DynamicElements/RadioButtonList2Page.gswc/RadioButtonList2Page.html +++ /dev/null @@ -1,17 +0,0 @@ - - -GSWRadioButtonList Test 2 - - -

GSWRadioButtonList Test 2 (Without value: AutoValue)

-
-Selected item :
-
- - - - -
- - - \ No newline at end of file diff --git a/Testing/DynamicElements/RadioButtonList2Page.m b/Testing/DynamicElements/RadioButtonList2Page.m index b543562..a7e7338 100644 --- a/Testing/DynamicElements/RadioButtonList2Page.m +++ b/Testing/DynamicElements/RadioButtonList2Page.m @@ -28,7 +28,7 @@ **/ -#include +#include #include "BasePage.h" #include "RadioButtonList2Page.h" diff --git a/Testing/DynamicElements/RadioButtonList2Page.wo/RadioButtonList2Page.html b/Testing/DynamicElements/RadioButtonList2Page.wo/RadioButtonList2Page.html new file mode 100644 index 0000000..9679224 --- /dev/null +++ b/Testing/DynamicElements/RadioButtonList2Page.wo/RadioButtonList2Page.html @@ -0,0 +1,17 @@ + + +GSWRadioButtonList Test 2 + + +

GSWRadioButtonList Test 2 (Without value: AutoValue)

+
+Selected item :
+
+ + + + +
+ + + diff --git a/Testing/DynamicElements/RadioButtonList2Page.wo/RadioButtonList2Page.wod b/Testing/DynamicElements/RadioButtonList2Page.wo/RadioButtonList2Page.wod new file mode 100644 index 0000000..72cbfd2 --- /dev/null +++ b/Testing/DynamicElements/RadioButtonList2Page.wo/RadioButtonList2Page.wod @@ -0,0 +1,32 @@ + +ARadioButtonList: WORadioButtonList +{ + list = application.bundleInfo.RadioButtonList.list; + item = anItem; + displayString = anItem.label; + selection = selectedItem; + name = "RADIONAME"; +}; + +SelectedItem: WOString +{ + value = selectedItem; +}; + +MainPageLink: WOHyperlink +{ + pageName = "Main"; + string = "Main Page"; +}; + +Form: WOForm +{ + enctype = "multipart/form-data"; +}; + +SubmitButton: WOSubmitButton +{ + action = submitAction; + value = "Submit"; +}; + diff --git a/Testing/DynamicElements/Resources/Base.gswd b/Testing/DynamicElements/Resources/Base.gswd deleted file mode 100644 index fcf0537..0000000 --- a/Testing/DynamicElements/Resources/Base.gswd +++ /dev/null @@ -1,17 +0,0 @@ -MainPageLink: GSWHyperlink -{ - pageName = "Main"; - string = "Main Page"; -}; - -Form: GSWForm -{ - enctype = "multipart/form-data"; -}; - -SubmitButton: GSWSubmitButton -{ - action = submitAction; - value = "Submit"; -}; - diff --git a/Testing/DynamicElements/Resources/Info-DynamicElements.plist b/Testing/DynamicElements/Resources/Info-DynamicElements.plist index 1f0affc..be9fa53 100644 --- a/Testing/DynamicElements/Resources/Info-DynamicElements.plist +++ b/Testing/DynamicElements/Resources/Info-DynamicElements.plist @@ -78,11 +78,6 @@ pageName = "RadioButton1Page"; label = "RadioButton 1"; comment = "GSWRadioButton Test 1"; - }, - { - pageName = "RadioButton2Page"; - label = "RadioButton 2"; - comment = "GSWRadioButton Test 2"; } ); RadioButtonList = { diff --git a/Testing/DynamicElements/TextField1Page.gswc/TextField1Page.gswd b/Testing/DynamicElements/TextField1Page.gswc/TextField1Page.gswd deleted file mode 100644 index 72f014e..0000000 --- a/Testing/DynamicElements/TextField1Page.gswc/TextField1Page.gswd +++ /dev/null @@ -1,12 +0,0 @@ -#include "Base" - -ATextField: GSWTextField -{ - value = aString; -}; - -EnteredString: GSWString -{ - value = aString; -}; - diff --git a/Testing/DynamicElements/TextField1Page.gswc/TextField1Page.html b/Testing/DynamicElements/TextField1Page.gswc/TextField1Page.html deleted file mode 100644 index 437b83c..0000000 --- a/Testing/DynamicElements/TextField1Page.gswc/TextField1Page.html +++ /dev/null @@ -1,17 +0,0 @@ - - -GSWTextField Test 1 - - -

GSWTextField Test 1

-
-Entered String :
-
- - - - -
- - - \ No newline at end of file diff --git a/Testing/DynamicElements/TextField1Page.m b/Testing/DynamicElements/TextField1Page.m index 8e05852..415111d 100644 --- a/Testing/DynamicElements/TextField1Page.m +++ b/Testing/DynamicElements/TextField1Page.m @@ -28,7 +28,7 @@ **/ -#include +#include #include "BasePage.h" #include "TextField1Page.h" diff --git a/Testing/DynamicElements/TextField1Page.wo/TextField1Page.html b/Testing/DynamicElements/TextField1Page.wo/TextField1Page.html new file mode 100644 index 0000000..e8363ad --- /dev/null +++ b/Testing/DynamicElements/TextField1Page.wo/TextField1Page.html @@ -0,0 +1,17 @@ + + +GSWTextField Test 1 + + +

GSWTextField Test 1

+
+Entered String :
+
+ + + + +
+ + + diff --git a/Testing/DynamicElements/TextField1Page.wo/TextField1Page.wod b/Testing/DynamicElements/TextField1Page.wo/TextField1Page.wod new file mode 100644 index 0000000..fdc2bb9 --- /dev/null +++ b/Testing/DynamicElements/TextField1Page.wo/TextField1Page.wod @@ -0,0 +1,28 @@ + +ATextField: WOTextField +{ + value = aString; +}; + +EnteredString: WOString +{ + value = aString; +}; + +MainPageLink: WOHyperlink +{ + pageName = "Main"; + string = "Main Page"; +}; + +Form: WOForm +{ + enctype = "multipart/form-data"; +}; + +SubmitButton: WOSubmitButton +{ + action = submitAction; + value = "Submit"; +}; +