Fix message, clean up comments

svn path=/projects/java-config-2/trunk/; revision=5944

3 files changed, 18 insertions, 20 deletions

diff --git a/src/java-config-2 b/src/java-config-2
index aeef769..9647e18 100755
--- a/src/java-config-2
+++ b/src/java-config-2
@@ -341,7 +341,7 @@ if __name__ == '__main__':
             fatalError("The active vm could not be found")
         except ProviderUnavailableError, e:
             message = "No providers are available, please ensure you have one of the following VM's or Package's;\n"	
-            message += "VM's (Your active vm must be one of these: " + e.vms() + "\n"
+            message += "VM's (Your active vm must be one of these): " + e.vms() + "\n"
             message += "Packages's: " + e.packages() + "\n"
             fatalError(message)
 
diff --git a/src/java_config_2/EnvironmentManager.py b/src/java_config_2/EnvironmentManager.py
index b7d4050..9e76a50 100644
--- a/src/java_config_2/EnvironmentManager.py
+++ b/src/java_config_2/EnvironmentManager.py
@@ -442,17 +442,22 @@ class EnvironmentManager(object):
 
     def have_provider(self, virtuals, virtualMachine, versionManager):
         result=True
-        for virtualKey in virtuals.split():
-            if self.get_package(virtualKey):
-                try:
-                    self.get_package(virtualKey).get_provider().classpath()
-                    result= (result and True)
-                    continue
-                except AttributeError:
-                    if not self.get_package(virtualKey).get_available_vms().count(virtualMachine.name()) > 0:
-                        result = False
-                    else:
-                        result=result & True
+        storeVM = self.get_active_vm()
+        self.set_active_vm(virtualMachine)
+        try:
+            for virtualKey in virtuals.split():
+                if self.get_package(virtualKey):
+                    try:
+                        self.get_package(virtualKey).get_provider().classpath()
+                        result= (result and True)
+                        continue
+                    except AttributeError:
+                        if not self.get_package(virtualKey).get_available_vms().count(virtualMachine.name()) > 0:
+                            result = False
+                        else:
+                            result=result and True
+        finally:
+            self.set_active_vm(storeVM)
         return result
     
 # Singleton hack 
diff --git a/src/java_config_2/Virtual.py b/src/java_config_2/Virtual.py
index fc74859..949776c 100644
--- a/src/java_config_2/Virtual.py
+++ b/src/java_config_2/Virtual.py
@@ -106,8 +106,6 @@ class Virtual(Package):
         """
         if self.min_target:
             return self.min_target
-        #Big Big Hack
-        #return "1.4"
         try:
             return self.get_provider().query("TARGET")
         except EnvironmentUndefinedError:
@@ -123,7 +121,7 @@ class Virtual(Package):
             return classpath
         except:
             active_vm = self._manager.get_active_vm()
-            if active_vm and not self.get_available_vms().count(active_vm.name()) > 1:
+            if active_vm and self.get_available_vms().count(active_vm.name()):
                 if self._config.has_key("VM_CLASSPATH"):
                     return self._manager.get_active_vm().query('JAVA_HOME') + self._config["VM_CLASSPATH"]
             else:
@@ -139,11 +137,7 @@ class Virtual(Package):
             return self.classpath()
         if var == "TARGET":
             return self.min_target
-        #try:
         return self.get_provider().query(var)
-        #except EnvironmentUndefinedError:
-        #except:
-        #    return self._config["VM"]
 
     def deps(self):
         """
@@ -187,7 +181,6 @@ class Virtual(Package):
             vm = self._manager.get_active_vm()
             try:
                 if self._vms.count(vm.name()):
-                    # This is acceptable so return false
                     return vm
             except ValueError:
                 if not self.active_package: