Changeset 8266 for trunk

Timestamp:

30/11/11 12:22:58 (6 months ago)

Author:

westram

Message:

• DRYed code in ED4_with_whole_block

Files:

• trunk/EDIT4/ED4_block.cxx (modified) (2 diffs)

trunk/EDIT4/ED4_block.cxx

@@ -179 +179 @@
             break;
         }
-        case ED4_BT_LINEBLOCK: { // @@@ dry
+        case ED4_BT_LINEBLOCK:
+        case ED4_BT_MODIFIED_COLUMNBLOCK:
+        case ED4_BT_COLUMNBLOCK: {
             ED4_list_elem *listElem = ED4_ROOT->selected_objects.first();
             while (listElem && !error) {
@@ -185 +187 @@
                 ED4_sequence_terminal *seqTerm        = selectionEntry->object->get_parent(ED4_L_SPECIES)->search_spec_child_rek(ED4_L_SEQUENCE_STRING)->to_sequence_terminal();
 
-                error    = perform_block_operation_on_whole_sequence(block_operation, seqTerm, repeat);
-                listElem = listElem->next();
-            }
-            break;
-        }
-        case ED4_BT_MODIFIED_COLUMNBLOCK:
-        case ED4_BT_COLUMNBLOCK: { // @@@ vs here
-            ED4_list_elem *listElem = ED4_ROOT->selected_objects.first();
-            while (listElem && !error) {
-                ED4_selection_entry *selectionEntry = (ED4_selection_entry*)listElem->elem();
-                ED4_sequence_terminal *seqTerm = selectionEntry->object->get_parent(ED4_L_SPECIES)->search_spec_child_rek(ED4_L_SEQUENCE_STRING)->to_sequence_terminal();
-
-                error    = perform_block_operation_on_part_of_sequence(block_operation, seqTerm, repeat);
+                error = blocktype == ED4_BT_LINEBLOCK
+                    ? perform_block_operation_on_whole_sequence(block_operation, seqTerm, repeat)
+                    : perform_block_operation_on_part_of_sequence(block_operation, seqTerm, repeat);
+
                 listElem = listElem->next();
             }