From 65a11b1b08335c6d3bccf894e1cb2cff8e25feb8 Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Fri, 7 Apr 2006 14:37:11 +0000
Subject: [PATCH] * Add static emptyRepositories array to AbstractRepository. *

---
 src/helma/framework/repository/AbstractRepository.java |  5 +++++
 src/helma/framework/repository/FileRepository.java     |  9 ++-------
 src/helma/framework/repository/FileResource.java       |  2 +-
 .../framework/repository/MultiFileRepository.java      |  2 +-
 src/helma/framework/repository/ZipRepository.java      | 10 +++++++++-
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/helma/framework/repository/AbstractRepository.java b/src/helma/framework/repository/AbstractRepository.java
index 497c11f2..b2af91f5 100644
--- a/src/helma/framework/repository/AbstractRepository.java
+++ b/src/helma/framework/repository/AbstractRepository.java
@@ -54,6 +54,11 @@ public abstract class AbstractRepository implements Repository {
      */
     String shortName;
 
+    /*
+     * empty repository array for convenience
+     */
+    final static Repository[] emptyRepositories = new Repository[0]; 
+
     /**
      * Called to check the repository's content.
      */
diff --git a/src/helma/framework/repository/FileRepository.java b/src/helma/framework/repository/FileRepository.java
index 0963c173..c3ab8bd1 100644
--- a/src/helma/framework/repository/FileRepository.java
+++ b/src/helma/framework/repository/FileRepository.java
@@ -85,18 +85,13 @@ public class FileRepository extends AbstractRepository {
     }
 
     public boolean exists() {
-        if (directory.exists() && directory.isDirectory()) {
-            return true;
-        } else {
-            return false;
-        }
+        return directory.exists() && directory.isDirectory();
     }
 
     public void create() {
         if (!directory.exists() || !directory.isDirectory()) {
             directory.mkdirs();
         }
-        return;
     }
 
     /**
@@ -140,7 +135,7 @@ public class FileRepository extends AbstractRepository {
      */
     public synchronized void update() {
         if (!directory.exists()) {
-            repositories = new Repository[0];
+            repositories = emptyRepositories;
             if (resources != null) {
                 resources = new HashMap();
             } else {
diff --git a/src/helma/framework/repository/FileResource.java b/src/helma/framework/repository/FileResource.java
index fe88e613..52ca9bca 100644
--- a/src/helma/framework/repository/FileResource.java
+++ b/src/helma/framework/repository/FileResource.java
@@ -31,7 +31,7 @@ public class FileResource implements Resource {
         this(file, null);
     }
 
-    protected FileResource(File file, FileRepository repository) {
+    protected FileResource(File file, Repository repository) {
         this.file = file;
 
         this.repository = repository;
diff --git a/src/helma/framework/repository/MultiFileRepository.java b/src/helma/framework/repository/MultiFileRepository.java
index ff450b8f..c43a26a2 100644
--- a/src/helma/framework/repository/MultiFileRepository.java
+++ b/src/helma/framework/repository/MultiFileRepository.java
@@ -53,7 +53,7 @@ public class MultiFileRepository extends FileRepository {
      */
     public synchronized void update() {
         if (!directory.exists()) {
-            repositories = new Repository[0];
+            repositories = emptyRepositories;
             if (resources != null)
                 resources.clear();
             lastModified = 0;
diff --git a/src/helma/framework/repository/ZipRepository.java b/src/helma/framework/repository/ZipRepository.java
index afa8a9ba..d4cb465a 100644
--- a/src/helma/framework/repository/ZipRepository.java
+++ b/src/helma/framework/repository/ZipRepository.java
@@ -44,6 +44,14 @@ public final class ZipRepository extends AbstractRepository {
         this(new File(initArgs), null, null);
     }
 
+    /**
+     * Constructs a ZipRespository using the given argument
+     * @param file zip file
+     */
+    public ZipRepository(File file) {
+        this(file, null, null);
+    }
+
     /**
      * Constructs a ZipRepository using the given zip file as top-level
      * repository
@@ -143,7 +151,7 @@ public final class ZipRepository extends AbstractRepository {
 
             } catch (Exception ex) {
                 ex.printStackTrace();
-                repositories = new Repository[0];
+                repositories = emptyRepositories;
                 if (resources == null) {
                     resources = new HashMap();
                 } else {