[Jython-checkins] SF.net SVN: jython:[5996] trunk/sandbox/wierzbicki/jlr_experiment/src/org/ python/core/packagecache

[<fwi...@us...>]

Revision: 5996
          http://jython.svn.sourceforge.net/jython/?rev=5996&view=rev
Author:   fwierzbicki
Date:     2009-01-28 20:32:23 +0000 (Wed, 28 Jan 2009)

Log Message:
-----------
move JavaPackage sets and gets to BasePackageManager.

Modified Paths:
--------------
    trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/BasePackageManager.java
    trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/SysPackageManager.java

Modified: trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/BasePackageManager.java
===================================================================
--- trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/BasePackageManager.java	2009-01-28 18:20:59 UTC (rev 5995)
+++ trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/BasePackageManager.java	2009-01-28 20:32:23 UTC (rev 5996)
@@ -46,7 +46,12 @@
     // for default cache (local fs based) impl
     protected File cachedir;
 
-    public BasePackageManager(JavaPackage top, File cachedir, boolean respectJavaAccessibility, List<String> classpaths, List<String> jarpaths) {
+    public BasePackageManager(JavaPackage top,
+                              File cachedir,
+                              boolean respectJavaAccessibility,
+                              List<String> classpaths,
+                              List<String> jarpaths) {
+
         this.respectJavaAccessibility = respectJavaAccessibility;
         this.searchPath = new ArrayList();
         this.topLevelPackage = top;
@@ -65,9 +70,23 @@
     }
 
     public abstract Object makeJavaPackage(String name, String classes, String jarfile);
-
     public abstract Class findClass(String pkg, String name, String reason);
 
+    /**
+     * @return the topLevelPackage
+     */
+    public JavaPackage getTopLevelPackage() {
+        return topLevelPackage;
+    }
+
+    /**
+     * @param topLevelPackage the topLevelPackage to set
+     */
+    public void setTopLevelPackage(JavaPackage topLevelPackage) {
+        this.topLevelPackage = topLevelPackage;
+    }
+
+
     public void addJar(String jarfile, boolean cache) {
         addJarToPackages(new File(jarfile), cache);
         if (cache) {

Modified: trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/SysPackageManager.java
===================================================================
--- trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/SysPackageManager.java	2009-01-28 18:20:59 UTC (rev 5995)
+++ trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/SysPackageManager.java	2009-01-28 20:32:23 UTC (rev 5996)
@@ -45,7 +45,11 @@
 public class SysPackageManager extends BasePackageManager {
 
     public SysPackageManager(File cachedir, Properties registry) {
-        super(new PyJavaPackage(""), cachedir, Options.respectJavaAccessibility, findClassPaths(registry), findJarPaths(registry));
+        super(new PyJavaPackage(""),
+                cachedir,
+                Options.respectJavaAccessibility,
+                findClassPaths(registry),
+                findJarPaths(registry));
     }
 
     private static List<String> findClassPaths(Properties registry) {
@@ -86,20 +90,6 @@
         return paths;
     }
 
-    /**
-     * @return the topLevelPackage
-     */
-    public JavaPackage getTopLevelPackage() {
-        return topLevelPackage;
-    }
-
-    /**
-     * @param topLevelPackage the topLevelPackage to set
-     */
-    public void setTopLevelPackage(JavaPackage topLevelPackage) {
-        this.topLevelPackage = topLevelPackage;
-    }
-
     public Class findClass(String pkg, String name, String reason) {
         if (pkg != null && pkg.length() > 0) {
             name = pkg + '.' + name;
@@ -161,7 +151,6 @@
         return false;
     }
 
-
     /**
      * Helper for {@link #doDir(PyJavaPackage,boolean,boolean)}. Scans for
      * package jpkg content over the directories in path. Add to ret the founded
@@ -271,8 +260,6 @@
         return basic;
     }
 
-    /* From old PackageManager */
-
     /**
      * Basic helper implementation of {@link #doDir}. It merges information
      * from jpkg {@link JavaPackage#clsSet} and {@link JavaPackage#__dict__}.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.