From 795f82d51fb5f4c703ce400caaf206b8f8b4a2d4 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Mon, 10 Sep 2012 16:27:16 +0200 Subject: [PATCH] added WSF_VALUE.is_empty: BOOLEAN --- library/server/wsf/src/request/value/wsf_any.e | 5 +++++ .../wsf/src/request/value/wsf_multiple_string.e | 6 ++++++ library/server/wsf/src/request/value/wsf_table.e | 11 ++++++----- .../server/wsf/src/request/value/wsf_uploaded_file.e | 8 +++++++- library/server/wsf/src/request/wsf_value.e | 6 ++++++ 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/library/server/wsf/src/request/value/wsf_any.e b/library/server/wsf/src/request/value/wsf_any.e index 0d671051..af3bd776 100644 --- a/library/server/wsf/src/request/value/wsf_any.e +++ b/library/server/wsf/src/request/value/wsf_any.e @@ -45,6 +45,11 @@ feature -- Status report is_string: BOOLEAN = False -- Is Current as a WSF_STRING representation? + is_empty: BOOLEAN + do + Result := value = Void + end + feature -- Query string_representation: STRING_32 diff --git a/library/server/wsf/src/request/value/wsf_multiple_string.e b/library/server/wsf/src/request/value/wsf_multiple_string.e index 6636c649..4ab9721d 100644 --- a/library/server/wsf/src/request/value/wsf_multiple_string.e +++ b/library/server/wsf/src/request/value/wsf_multiple_string.e @@ -97,6 +97,12 @@ feature -- Status report Result := values.count = 1 end + is_empty: BOOLEAN + -- Is Current empty? + do + Result := values.is_empty + end + feature -- Conversion as_string: WSF_STRING diff --git a/library/server/wsf/src/request/value/wsf_table.e b/library/server/wsf/src/request/value/wsf_table.e index 0dab49f9..d15bd8cd 100644 --- a/library/server/wsf/src/request/value/wsf_table.e +++ b/library/server/wsf/src/request/value/wsf_table.e @@ -65,11 +65,6 @@ feature -- Access Result := values.item (k) end - is_empty: BOOLEAN - do - Result := count = 0 - end - count: INTEGER do Result := values.count @@ -102,6 +97,12 @@ feature -- Status report end end + is_empty: BOOLEAN + -- Is Current empty? + do + Result := values.is_empty + end + feature -- Conversion as_string: WSF_STRING diff --git a/library/server/wsf/src/request/value/wsf_uploaded_file.e b/library/server/wsf/src/request/value/wsf_uploaded_file.e index 11a3c1d3..fa750cc5 100644 --- a/library/server/wsf/src/request/value/wsf_uploaded_file.e +++ b/library/server/wsf/src/request/value/wsf_uploaded_file.e @@ -44,7 +44,13 @@ feature -- Element change feature -- Status report is_string: BOOLEAN = False - -- Is Current as a WSF_STRING representation? + -- Is Current as a WSF_STRING representation? + + is_empty: BOOLEAN + -- Is Current empty? + do + Result := size = 0 + end feature -- Conversion diff --git a/library/server/wsf/src/request/wsf_value.e b/library/server/wsf/src/request/wsf_value.e index c9ec4b75..e77fc43a 100644 --- a/library/server/wsf/src/request/wsf_value.e +++ b/library/server/wsf/src/request/wsf_value.e @@ -35,6 +35,12 @@ feature -- Status report deferred end + is_empty: BOOLEAN + -- Is Current empty? + --| i.e empty string, empty table, ... + deferred + end + feature -- Query as_string: WSF_STRING