? manifest-subst.mf
? netbeans
? vcscore.iml
Index: src/org/netbeans/modules/vcscore/cache/CacheDir.java
===================================================================
RCS file: /cvs/vcscore/src/org/netbeans/modules/vcscore/cache/CacheDir.java,v
retrieving revision 1.39
diff -u -r1.39 CacheDir.java
--- src/org/netbeans/modules/vcscore/cache/CacheDir.java	17 Aug 2004 08:58:36 -0000	1.39
+++ src/org/netbeans/modules/vcscore/cache/CacheDir.java	20 Aug 2004 15:40:03 -0000
@@ -113,20 +113,14 @@
     /** return all subdirectories in an array
      */
     public CacheDir[] getSubDirs() {
-        LinkedList col = new LinkedList();
-        CacheHandler handler = CacheHandler.getInstance();
+        List col = new ArrayList(childDirs.keySet().size());
         synchronized (CHILD_FILES_LOCK) {
             for (Iterator it = new ArrayList(childDirs.keySet()).iterator(); it.hasNext(); ) {
                 String name = (String) it.next();
                 Reference rDir = (Reference) childDirs.get(name);
                 CacheDir cDir = (CacheDir) rDir.get();
                 if (cDir == null) {
-                    CacheFile.PersistentData data = handler.getReferencedData(rDir);
-                    if (data != null) {
-                        cDir = (CacheDir) createChildFromData(data);
-                    } else {
-                        cDir = readDirFromDisk(name);
-                    }
+                    cDir = readDirFromDisk(name);
                     cDir.setParent(this);
                     childDirs.put(name, createReference(cDir));
                 }
@@ -152,12 +146,7 @@
             if (rDir == null) return null;
             CacheDir cDir = (CacheDir) rDir.get();
             if (cDir == null) {
-                CacheFile.PersistentData data = CacheHandler.getInstance().getReferencedData(rDir);
-                if (data != null) {
-                    cDir = (CacheDir) createChildFromData(data);
-                } else {
-                    cDir = readDirFromDisk(name);
-                }
+                cDir = readDirFromDisk(name);
                 cDir.setParent(this);
                 childDirs.put(name, createReference(cDir));
                 getCacheObject().registerDir(cDir);
@@ -306,8 +295,7 @@
     //----- file stuff -------------------------------------------------------
 
     public CacheFile[] getFiles() {
-        LinkedList col = new LinkedList();
-        CacheHandler handler = CacheHandler.getInstance();
+        List col = new ArrayList(childFiles.keySet().size());
         synchronized (CHILD_FILES_LOCK) {
             String cacheFilePath = getCacheFileName();
             BufferedReader in = null;
@@ -326,17 +314,12 @@
                     Reference rFile = (Reference) childFiles.get(name);
                     CacheFile cFile = (CacheFile) rFile.get();
                     if (cFile == null) {
-                        CacheFile.PersistentData data = handler.getReferencedData(rFile);
-                        if (data != null) {
-                            cFile = (CacheFile) createChildFromData(data);
-                        } else {
-                            if (in != null) {
-                                in.mark( (int)cacheFile.length());
-                            }
-                            cFile = readFileFromDisk(name, in);
-                            if (in != null) {
-                                in.reset();
-                            }
+                        if (in != null) {
+                            in.mark( (int)cacheFile.length());
+                        }
+                        cFile = readFileFromDisk(name, in);
+                        if (in != null) {
+                            in.reset();
                         }
                         cFile.setParent(this);
                         childFiles.put(name, createReference(cFile));
@@ -380,12 +363,7 @@
             if (rFile == null) return null;
             CacheFile cFile = (CacheFile) rFile.get();
             if (cFile == null) {
-                CacheFile.PersistentData data = CacheHandler.getInstance().getReferencedData(rFile);
-                if (data != null) {
-                    cFile = (CacheFile) createChildFromData(data);
-                } else {
-                    cFile = readFileFromDisk(name);
-                }
+                cFile = readFileFromDisk(name);
                 cFile.setParent(this);
                 childFiles.put(name, createReference(cFile));
             }
@@ -470,8 +448,6 @@
     }
     
     
-    protected abstract CacheFile createChildFromData(CacheFile.PersistentData data);
-    
     /** sets the strategy level taht this directory resides at.
      */
     public final void setAppliedLevel(int strat) {
@@ -781,7 +757,6 @@
         CacheHandler handler = CacheHandler.getInstance();
         Reference ref = new CacheReference(cFile, handler.getCacheFileReferenceQueue());
                       //new WeakReference(cFile, handler.getCacheFileReferenceQueue());
-        if (cFile != null) handler.addReferencedData(ref, cFile.getPersistentData());
         return ref;
         //return new /*java.lang.ref.WeakReference(cFile);//*/CacheFileReference(cFile);
     }
Index: src/org/netbeans/modules/vcscore/cache/CacheHandler.java
===================================================================
RCS file: /cvs/vcscore/src/org/netbeans/modules/vcscore/cache/CacheHandler.java,v
retrieving revision 1.18
diff -u -r1.18 CacheHandler.java
--- src/org/netbeans/modules/vcscore/cache/CacheHandler.java	26 Jul 2004 12:24:32 -0000	1.18
+++ src/org/netbeans/modules/vcscore/cache/CacheHandler.java	20 Aug 2004 15:40:05 -0000
@@ -94,7 +94,6 @@
     private ArrayList listeners = new ArrayList ();
     
     private Map cacheMap;
-    private final Map persistentData;
     private final ReferenceQueue cacheQueue;
     
     /** Holds cache files and direcories to permit their garbage collection only after
@@ -105,7 +104,6 @@
     /** Creates new CacheHandler */
     private CacheHandler() {
         cacheMap = new Hashtable(); // to have synchronized access
-        persistentData = Collections.synchronizedMap(new WeakHashMap(4037)); // to have synchronized access
         cacheFilesHolder = Collections.synchronizedMap(new WeakHashMap());
         cacheQueue = org.openide.util.Utilities.activeReferenceQueue();
     }
@@ -121,14 +119,6 @@
     
     ReferenceQueue getCacheFileReferenceQueue() {
         return cacheQueue;
-    }
-    
-    void addReferencedData(Reference ref, CacheFile.PersistentData data) {
-        persistentData.put(ref, data);
-    }
-    
-    CacheFile.PersistentData getReferencedData(Reference ref) {
-        return (CacheFile.PersistentData) persistentData.get(ref);
     }
 
     /** Creates a reference object. To be used in the Filesystem's createReference method to ensure
Index: src/org/netbeans/modules/vcscore/caching/VcsCacheDir.java
===================================================================
RCS file: /cvs/vcscore/src/org/netbeans/modules/vcscore/caching/VcsCacheDir.java,v
retrieving revision 1.54
diff -u -r1.54 VcsCacheDir.java
--- src/org/netbeans/modules/vcscore/caching/VcsCacheDir.java	20 Aug 2004 11:30:03 -0000	1.54
+++ src/org/netbeans/modules/vcscore/caching/VcsCacheDir.java	20 Aug 2004 15:40:08 -0000
@@ -184,19 +184,6 @@
         return file;
     }
     
-    protected CacheFile createChildFromData(CacheFile.PersistentData data) {
-        CacheFile file;
-        if (data.isDirectory()) {
-            file = new VcsCacheDir(getCacheName(), new File(getFile(), data.getName()), data);
-            ((VcsCacheDir) file).readChildNamesFromDisk();
-            //((CacheDir) file).readFromDisk(null); // It's necessary to initialize the directory content!
-        } else {
-            file = new VcsCacheFile(getCacheName(), data);
-        }
-        //file.setParent(this);
-        return file;
-    }
-    
     /** Path string to the netbeans.cache file of this directory
      */
     protected String getCacheFileName() {