LanItems: replaced several globals using accessors.

Just to make things better testeable.
yast · Nov 26, 2014 · a55faac · a55faac
1 parent 0c194af
commit a55faac
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb
@@ -586,7 +586,7 @@ def current_renamed_to
 
     # Tells if current item was renamed
     def renamed?(item_id)
-      return false if !@Items[item_id].has_key?("renamed_to")
+      return false if !LanItems.Items[item_id].has_key?("renamed_to")
       renamed_to(item_id) != GetDeviceName(item_id)
     end
 
@@ -1312,31 +1312,31 @@ def BuildLanOverview
 
       Builtins.foreach(
         Convert.convert(
-          Map.Keys(@Items),
+          Map.Keys(LanItems.Items),
           :from => "list",
           :to   => "list <integer>"
         )
       ) do |key|
         rich = ""
         ip = _("Not configured")
 
-        item_hwinfo = @Items[key]["hwinfo"] || {}
+        item_hwinfo = LanItems.Items[key]["hwinfo"] || {}
         descr = item_hwinfo["name"] || ""
 
         note = ""
         bullets = []
-        ifcfg_name = @Items[key]["ifcfg"] || ""
+        ifcfg_name = LanItems.Items[key]["ifcfg"] || ""
 
-        @type = NetworkInterfaces.GetType(ifcfg_name)
+        LanItems.type = NetworkInterfaces.GetType(ifcfg_name)
         if !ifcfg_name.empty?
           NetworkInterfaces.Select(ifcfg_name)
 
           ifcfg_desc = GetDeviceMap(key)["NAME"]
           descr = ifcfg_desc if !ifcfg_desc.nil? && !ifcfg_desc.empty?
-          descr = CheckEmptyName(@type, descr)
+          descr = CheckEmptyName(LanItems.type, descr)
           ip = DeviceProtocol(NetworkInterfaces.Current)
           status = DeviceStatus(
-            @type,
+            LanItems.type,
             NetworkInterfaces.device_num(NetworkInterfaces.Name),
             NetworkInterfaces.Current
           )
@@ -1345,7 +1345,7 @@ def BuildLanOverview
           bullets = bullets + startmode_overview
           bullets = bullets + ip_overview(ip) if NetworkInterfaces.Current["STARTMODE"] != "managed"
 
-          if @type == "wlan" &&
+          if LanItems.type == "wlan" &&
             NetworkInterfaces.Current["WIRELESS_AUTH_MODE"] == "open" &&
             IsEmpty(NetworkInterfaces.Current["WIRELESS_KEY_0"])
 
@@ -1359,7 +1359,7 @@ def BuildLanOverview
             links << href
           end
 
-          if @type == "bond"
+          if LanItems.type == "bond"
             bond_slaves_desc = ("%s: %s") % [
               _("Bonding slaves"),
               GetBondSlaves(ifcfg_name).join(" ")
@@ -1386,7 +1386,7 @@ def BuildLanOverview
 
           overview << Summary.Device(descr, status)
         else
-          descr = CheckEmptyName(@type, descr)
+          descr = CheckEmptyName(LanItems.type, descr)
           overview << Summary.Device(descr, Summary.NotConfigured)
         end
         conn = ""
@@ -1430,7 +1430,7 @@ def BuildLanOverview
           end
           @current = curr
         end
-        @Items[key]["table_descr"] = {
+        LanItems.Items[key]["table_descr"] = {
           "rich_descr" => rich,
           "table_descr" => [descr, ip, ifcfg_name, note]
         }