[gentoo-commits] proj/java-config:master commit in: src/java_config_2/

["Ralph Sennhauser" <sera@gentoo.org>]

commit:     a98d389c9bbc5f691938780c22557533fb885e8b
Author:     Ralph Sennhauser <sera <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 10:49:39 2013 +0000
Commit:     Ralph Sennhauser <sera <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 12:28:00 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/java-config.git;a=commit;h=a98d389c

Rename variable active to active_vm

Self-documenting code is good

---
 src/java_config_2/EnvironmentManager.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/java_config_2/EnvironmentManager.py b/src/java_config_2/EnvironmentManager.py
index ab83dd1..d573d64 100644
--- a/src/java_config_2/EnvironmentManager.py
+++ b/src/java_config_2/EnvironmentManager.py
@@ -24,7 +24,7 @@ class EnvironmentManager(object):
         self.virtuals = {}
         self.virtuals_pref = None
         self.virtual_machines = None
-        self.active = None
+        self.active_vm = None
 
         self.eprefix = eprefix
         self.eroot = root + eprefix
@@ -107,7 +107,7 @@ class EnvironmentManager(object):
         if vm_name:
             vm = self.get_vm(vm_name)
             if vm:
-                self.active = vm
+                self.active_vm = vm
                 return vm
 
         for link in self.vm_links():
@@ -115,17 +115,17 @@ class EnvironmentManager(object):
                 vm_name = basename(os.readlink(link))
                 vm = self.get_vm(vm_name)
                 if vm:
-                    self.active = vm
+                    self.active_vm = vm
                     return vm
         raise InvalidVMError("Unable to determine valid vm. Please see http://www.gentoo.org/doc/en/java.xml#doc_chap4")
 
     def set_active_vm(self, vm):
-        self.active = vm
+        self.active_vm = vm
  
     def get_active_vm(self):
-        if self.active is None:
+        if self.active_vm is None:
             self.load_active_vm()
-        return self.active
+        return self.active_vm
 
     def get_virtual_machines(self):
         if self.virtual_machines is None: