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

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

Revision: 5991
          http://jython.svn.sourceforge.net/jython/?rev=5991&view=rev
Author:   fwierzbicki
Date:     2009-01-27 05:06:54 +0000 (Tue, 27 Jan 2009)

Log Message:
-----------
Oops missed a py-specific method in BasdPackageManager.

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-27 04:54:32 UTC (rev 5990)
+++ trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/BasePackageManager.java	2009-01-27 05:06:54 UTC (rev 5991)
@@ -80,7 +80,7 @@
         }
     }
 
-    private void addJarPath(String path) {
+    protected void addJarPath(String path) {
         StringTokenizer tok = new StringTokenizer(path,
                 java.io.File.pathSeparator);
         while (tok.hasMoreTokens()) {
@@ -90,38 +90,6 @@
         }
     }
 
-    protected void findAllPackages(Properties registry) {
-        String paths = registry.getProperty("python.packages.paths",
-                "java.class.path,sun.boot.class.path");
-        String directories = registry.getProperty(
-                "python.packages.directories", "java.ext.dirs");
-        String fakepath = registry
-                .getProperty("python.packages.fakepath", null);
-        StringTokenizer tok = new StringTokenizer(paths, ",");
-        while (tok.hasMoreTokens()) {
-            String entry = tok.nextToken().trim();
-            String tmp = registry.getProperty(entry);
-            if (tmp == null) {
-                continue;
-            }
-            addClassPath(tmp);
-        }
-
-        tok = new StringTokenizer(directories, ",");
-        while (tok.hasMoreTokens()) {
-            String entry = tok.nextToken().trim();
-            String tmp = registry.getProperty(entry);
-            if (tmp == null) {
-                continue;
-            }
-            addJarPath(tmp);
-        }
-
-        if (fakepath != null) {
-            addClassPath(fakepath);
-        }
-    }
-
     public void notifyPackageImport(String pkg, String name) {
         if (pkg != null && pkg.length() > 0) {
             name = pkg + '.' + name;

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-27 04:54:32 UTC (rev 5990)
+++ trunk/sandbox/wierzbicki/jlr_experiment/src/org/python/core/packagecache/SysPackageManager.java	2009-01-27 05:06:54 UTC (rev 5991)
@@ -60,6 +60,39 @@
         }
     }
 
+    protected void findAllPackages(Properties registry) {
+        String paths = registry.getProperty("python.packages.paths",
+                "java.class.path,sun.boot.class.path");
+        String directories = registry.getProperty(
+                "python.packages.directories", "java.ext.dirs");
+        String fakepath = registry
+                .getProperty("python.packages.fakepath", null);
+        StringTokenizer tok = new StringTokenizer(paths, ",");
+        while (tok.hasMoreTokens()) {
+            String entry = tok.nextToken().trim();
+            String tmp = registry.getProperty(entry);
+            if (tmp == null) {
+                continue;
+            }
+            addClassPath(tmp);
+        }
+
+        tok = new StringTokenizer(directories, ",");
+        while (tok.hasMoreTokens()) {
+            String entry = tok.nextToken().trim();
+            String tmp = registry.getProperty(entry);
+            if (tmp == null) {
+                continue;
+            }
+            addJarPath(tmp);
+        }
+
+        if (fakepath != null) {
+            addClassPath(fakepath);
+        }
+    }
+
+
     /**
      * @return the topLevelPackage
      */


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