[Pydev-cvs] org.python.pydev.core/src/org/python/pydev/core REF.java, 1.35, 1.36 ModulesKey.java, 1.2, 1.3

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev.core/src/org/python/pydev/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9391/src/org/python/pydev/core

Modified Files:
	REF.java ModulesKey.java 
Log Message:
Module names resolved while we're listing the files (support to symlinks).

Index: ModulesKey.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.core/src/org/python/pydev/core/ModulesKey.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ModulesKey.java	22 Jan 2006 20:19:08 -0000	1.2
--- ModulesKey.java	15 Sep 2007 18:48:22 -0000	1.3
***************
*** 15,30 ****
   * @author Fabio Zadrozny
   */
! public class ModulesKey implements Comparable, Serializable{
  
!     private static final long serialVersionUID = 1L;
      public String name;
      public File file;
  
      /**
  	 * Creates the module key. File may be null
  	 */
! 	public ModulesKey(String name, File f) {
  	    this.name = name;
  	    this.file = f;
  	}
  
--- 15,61 ----
   * @author Fabio Zadrozny
   */
! public class ModulesKey implements Comparable<ModulesKey>, Serializable{
  
!     /**
!      * 1L = just name and file
!      * 2L = + zipModulePath
!      */
!     private static final long serialVersionUID = 2L;
!     
!     /**
!      * Then name is always needed!
!      */
      public String name;
+     
+     /**
+      * Builtins may not have the file (null)
+      */
      public File file;
+     
+     /**
+      * This should be null if it's from a file in the filesystem, now, if we're dealing with a zip file,
+      * the file should be the zip file and this the path under which it was found in the zip file.
+      * 
+      * Some cases can be considered:
+      * - if it was found from jython this is a dir from the zip file
+      * - if it was from a zip file from python this is a the .py file path inside the zip file
+      */
+     public String zipModulePath;
  
+     
+     /**
+      * Builtins may not have the file
+      */
+     public ModulesKey(String name, File f) {
+         this(name, f, null);
+     }
+     
      /**
  	 * Creates the module key. File may be null
  	 */
! 	public ModulesKey(String name, File f, String zipModulePath) {
  	    this.name = name;
  	    this.file = f;
+ 	    this.zipModulePath = zipModulePath;
  	}
  
***************
*** 32,42 ****
       * @see java.lang.Comparable#compareTo(java.lang.Object)
       */
!     public int compareTo(Object o) {
!         if (o instanceof ModulesKey ){
!             ModulesKey m = (ModulesKey)o;
!             
!             return name.compareTo(m.name);
!         }
!         return 0;
      }
  
--- 63,68 ----
       * @see java.lang.Comparable#compareTo(java.lang.Object)
       */
!     public int compareTo(ModulesKey o) {
!         return name.compareTo(o.name);
      }
  
***************
*** 54,57 ****
--- 80,84 ----
          }
          
+         //consider only the name
          return true;
      }
***************
*** 66,73 ****
      @Override
      public String toString() {
          if(file != null){
!             return name+" - "+file;
          }
!         return name;
      }
  }
--- 93,106 ----
      @Override
      public String toString() {
+         StringBuffer ret = new StringBuffer(name);
          if(file != null){
!             ret.append(" - ");
!             ret.append(file);
          }
!         if(zipModulePath != null){
!             ret.append(" - zip path:");
!             ret.append(zipModulePath);
!         }
!         return ret.toString();
      }
  }

Index: REF.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.core/src/org/python/pydev/core/REF.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** REF.java	18 Jun 2007 16:33:16 -0000	1.35
--- REF.java	15 Sep 2007 18:48:22 -0000	1.36
***************
*** 679,682 ****
--- 679,685 ----
              }
          }
+         if(lower.equals("iso-latin-1-unix")){ 
+             return "latin1"; //handle case from python libraries
+         }
          if(!Charset.isSupported(ret)){
              if(LOG_ENCODING_ERROR){