[lmi-commits] [5163] Fix defect introduced 20100704T1645Z

[Greg Chicares]

Revision: 5163
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5163
Author:   chicares
Date:     2011-04-06 16:13:21 +0000 (Wed, 06 Apr 2011)
Log Message:
-----------
Fix defect introduced 20100704T1645Z

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/input_sequence_entry.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2011-03-23 15:37:29 UTC (rev 5162)
+++ lmi/trunk/ChangeLog 2011-04-06 16:13:21 UTC (rev 5163)
@@ -27729,3 +27729,9 @@
   version.hpp
 Designate release candidate.
 
+20110406T1613Z <address@hidden> [655]
+
+  input_sequence_entry.cpp
+Fix defect introduced 20100704T1645Z. See:
+  http://lists.nongnu.org/archive/html/lmi/2010-08/msg00018.html
+

Modified: lmi/trunk/input_sequence_entry.cpp
===================================================================
--- lmi/trunk/input_sequence_entry.cpp  2011-03-23 15:37:29 UTC (rev 5162)
+++ lmi/trunk/input_sequence_entry.cpp  2011-04-06 16:13:21 UTC (rev 5163)
@@ -1073,47 +1073,44 @@
     editor.CentreOnParent();
 
     std::string sequence_string = std::string(text_->GetValue());
-    if(!sequence_string.empty())
-        {
-        std::string const name(GetName().c_str());
-        datum_sequence const& ds = 
*member_cast<datum_sequence>(input->operator[](name));
+    std::string const name(GetName().c_str());
+    datum_sequence const& ds = 
*member_cast<datum_sequence>(input->operator[](name));
 
-        std::map<std::string,std::string> const kwmap = ds.allowed_keywords();
-        std::vector<std::string> const keywords =
-            detail::extract_keys_from_string_map(kwmap);
+    std::map<std::string,std::string> const kwmap = ds.allowed_keywords();
+    std::vector<std::string> const keywords =
+        detail::extract_keys_from_string_map(kwmap);
 
-        bool keywords_only =
-                ds.keyword_values_are_allowable()
-            && !ds.numeric_values_are_allowable()
-            ;
-        LMI_ASSERT(!(keywords_only && keywords.empty()));
-        editor.set_keywords(keywords, keywords_only, ds.default_keyword());
+    bool keywords_only =
+            ds.keyword_values_are_allowable()
+        && !ds.numeric_values_are_allowable()
+        ;
+    LMI_ASSERT(!(keywords_only && keywords.empty()));
+    editor.set_keywords(keywords, keywords_only, ds.default_keyword());
 
-        InputSequence sequence
-            (sequence_string
-            ,input->years_to_maturity()
-            ,input->issue_age        ()
-            ,input->retirement_age   ()
-            ,input->inforce_year     ()
-            ,input->effective_year   ()
-            ,0
-            ,keywords
-            );
+    InputSequence sequence
+        (sequence_string
+        ,input->years_to_maturity()
+        ,input->issue_age        ()
+        ,input->retirement_age   ()
+        ,input->inforce_year     ()
+        ,input->effective_year   ()
+        ,0
+        ,keywords
+        );
 
-        std::string const diagnostics = sequence.formatted_diagnostics();
-        if(!diagnostics.empty())
-            {
-            warning()
-                << "The sequence is invalid and cannot be edited visually.\n"
-                << diagnostics
-                << LMI_FLUSH
-                ;
-            return;
-            }
-
-        editor.sequence(sequence);
+    std::string const diagnostics = sequence.formatted_diagnostics();
+    if(!diagnostics.empty())
+        {
+        warning()
+            << "The sequence is invalid and cannot be edited visually.\n"
+            << diagnostics
+            << LMI_FLUSH
+            ;
+        return;
         }
 
+    editor.sequence(sequence);
+
     if(wxID_OK == editor.ShowModal())
         {
         text_->SetValue(editor.sequence_string());