make name/file functions actualy work and not get overriden by the string objects

svn path=/java-config-ng/branches/axxo/; revision=224

2 files changed, 13 insertions, 13 deletions

diff --git a/src/java_config/EnvironmentManager.py b/src/java_config/EnvironmentManager.py
index 9fde4a8..4f8fd7d 100644
--- a/src/java_config/EnvironmentManager.py
+++ b/src/java_config/EnvironmentManager.py
@@ -96,11 +96,11 @@ class EnvironmentManager:
       results = []
 
       for package in iter(self.get_packages()):
-         if package.name in packages:
+         if package.name() in packages:
             value = package.query(query)
             if value:
                results.append(value)
-            packages.remove(package.name)
+            packages.remove(package.name())
 
       return results
 
diff --git a/src/java_config/Package.py b/src/java_config/Package.py
index 770f0df..c79e0db 100644
--- a/src/java_config/Package.py
+++ b/src/java_config/Package.py
@@ -8,31 +8,31 @@ import EnvFileParser
 
 class Package:
    def __init__(self,file, name):
-      self.file = file
-      self.name = name
-      self.config = EnvFileParser.EnvFileParser(file).get_config()
+      self._file = file
+      self._name = name
+      self._config = EnvFileParser.EnvFileParser(file).get_config()
 
    def name(self):
-      return self.name
+      return self._name
 
    def file(self):
-      return self.file
+      return self._file
 
    def description(self):
-      if self.config.has_key("DESCRIPTION"):
-         return self.config["DESCRIPTION"]
+      if self._config.has_key("DESCRIPTION"):
+         return self._config["DESCRIPTION"]
       else:
          return "No Description"
 
    def classpath(self):
-      if self.config.has_key("CLASSPATH"):
-         return self.config["CLASSPATH"]
+      if self._config.has_key("CLASSPATH"):
+         return self._config["CLASSPATH"]
       else:
          return None
 
    def query(self, var):
-      if self.config.has_key(var):
-         return self.config[var]
+      if self._config.has_key(var):
+         return self._config[var]
       else:
          return None