svn commit: r595073 - in /incubator/ivy/core/trunk/src/java/org/apache/ivy/core: IvyContext.java publish/PublishEngine.java resolve/ResolveEngine.java retrieve/RetrieveEngine.java

[maartenc]

Author: maartenc
Date: Wed Nov 14 13:34:53 2007
New Revision: 595073

URL: http://svn.apache.org/viewvc?rev=595073&view=rev
Log:
Little refactoring of cache storage in the IvyContext to make it easier to 
implement IVY-628.

Modified:
    incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java
    
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/publish/PublishEngine.java
    
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
    
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java
URL: 
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java?rev=595073&r1=595072&r2=595073&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java 
(original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java Wed 
Nov 14 13:34:53 2007
@@ -17,7 +17,6 @@
  */
 package org.apache.ivy.core;
 
-import java.io.File;
 import java.lang.ref.WeakReference;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -46,7 +45,7 @@
 
     private WeakReference/*<Ivy>*/ ivy = new WeakReference(null);
 
-    private File cache;
+    private CacheManager cacheManager;
 
     private Map contextMap = new HashMap();
 
@@ -178,14 +177,6 @@
         operatingThread = Thread.currentThread();
     }
 
-    public File getCache() {
-        return cache == null ? getSettings().getDefaultCache() : cache;
-    }
-
-    public void setCache(File cache) {
-        this.cache = cache;
-    }
-
     public IvySettings getSettings() {
         return getIvy().getSettings();
     }
@@ -324,9 +315,17 @@
     public EventManager getEventManager() {
         return getIvy().getEventManager();
     }
+    
+    public void setCacheManager(CacheManager cacheManager) {
+        this.cacheManager = cacheManager;
+    }
 
     public CacheManager getCacheManager() {
-        return CacheManager.getInstance(getSettings(), getCache());
+        CacheManager result = cacheManager;
+        if (result == null) {
+            result = CacheManager.getInstance(getSettings());
+        }
+        return result;
     }
 
     public void checkInterrupted() {

Modified: 
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/publish/PublishEngine.java
URL: 
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/publish/PublishEngine.java?rev=595073&r1=595072&r2=595073&view=diff
==============================================================================
--- 
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/publish/PublishEngine.java
 (original)
+++ 
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/publish/PublishEngine.java
 Wed Nov 14 13:34:53 2007
@@ -230,7 +230,7 @@
             cacheManager = IvyContext.getContext().getCacheManager();
             options.setCache(cacheManager);
         } else {
-            IvyContext.getContext().setCache(cacheManager.getCache());
+            IvyContext.getContext().setCacheManager(cacheManager);
         }
         return cacheManager;
     }

Modified: 
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
URL: 
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java?rev=595073&r1=595072&r2=595073&view=diff
==============================================================================
--- 
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
 (original)
+++ 
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
 Wed Nov 14 13:34:53 2007
@@ -209,7 +209,7 @@
                 cacheManager = IvyContext.getContext().getCacheManager();
                 options.setCache(cacheManager);
             } else {
-                IvyContext.getContext().setCache(cacheManager.getCache());
+                IvyContext.getContext().setCacheManager(cacheManager);
             }
 
             String[] confs = options.getConfs(md);
@@ -419,7 +419,7 @@
             cacheManager = IvyContext.getContext().getCacheManager();
             options.setCache(cacheManager);
         } else {
-            IvyContext.getContext().setCache(cacheManager.getCache());
+            IvyContext.getContext().setCacheManager(cacheManager);
         }
 
         String[] confs = options.getConfs(md);

Modified: 
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java
URL: 
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java?rev=595073&r1=595072&r2=595073&view=diff
==============================================================================
--- 
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java
 (original)
+++ 
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java
 Wed Nov 14 13:34:53 2007
@@ -199,7 +199,7 @@
             cacheManager = IvyContext.getContext().getCacheManager();
             options.setCache(cacheManager);
         } else {
-            IvyContext.getContext().setCache(cacheManager.getCache());
+            IvyContext.getContext().setCacheManager(cacheManager);
         }
         return cacheManager;
     }