split complex methods

yast · Aug 6, 2014 · 4ddc27d · 4ddc27d
1 parent 1176de1
commit 4ddc27d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/src/lib/registration/ui/autoyast_config_dialog.rb b/src/lib/registration/ui/autoyast_config_dialog.rb
@@ -61,15 +61,17 @@ def run
 
       attr_reader :config
 
-      def content
-        regsettings = VBox(
+      def content_reg_settings
+        VBox(
           Left(
             CheckBox(Id(:do_registration), Opt(:notify), _("Register the Product"),
               config.do_registration)
           )
         )
+      end
 
-        reg_code_settings = VBox(
+      def content_reg_code_settings
+        VBox(
           # Translators: Text for UI Label - capitalized
           Frame(_("Registration"),
             VBox(
@@ -84,8 +86,10 @@ def content
             )
           )
         )
+      end
 
-        server_settings = VBox(
+      def content_server_settings
+        VBox(
           # Translators: Text for UI Label - capitalized
           Frame(_("Server Settings"),
             VBox(
@@ -132,17 +136,19 @@ def content
             )
           )
         )
+      end
 
+      def content
         VBox(
           VSpacing(1),
-          regsettings,
+          content_reg_settings,
           HBox(
             HSpacing(2),
             VBox(
               VSpacing(1),
-              reg_code_settings,
+              content_reg_code_settings,
               VSpacing(1),
-              server_settings,
+              content_server_settings,
               VSpacing(0.4),
               PushButton(Id(:addons), _("Register Extensions or Modules...")),
               VSpacing(0.4)

diff --git a/src/lib/registration/ui/autoyast_config_workflow.rb b/src/lib/registration/ui/autoyast_config_workflow.rb
@@ -108,6 +108,13 @@ def addons_reg_codes
         :next
       end
 
+      def find_addon(addon)
+        config.addons.find do |a|
+          a["name"] == addon["name"] &&  a["version"] == addon["version"] &&
+            a["arch"] == addon["arch"] && a["release_type"] == addon["release_type"]
+        end
+      end
+
       def update_addons(known_reg_codes)
         ::Registration::Addon.selected.each do |addon|
           new_addon = {
@@ -119,10 +126,7 @@ def update_addons(known_reg_codes)
           }
 
           # already known?
-          config_addon = config.addons.find{ |a|
-            a["name"] == new_addon["name"] &&  a["version"] == new_addon["version"] &&
-              a["arch"] == new_addon["arch"] && a["release_type"] == new_addon["release_type"]
-          }
+          config_addon = find_addon(new_addon)
 
           # add or edit
           if config_addon