* Add static emptyRepositories array to AbstractRepository.
*
This commit is contained in:
parent
820342fc6e
commit
65a11b1b08
5 changed files with 18 additions and 10 deletions
|
@ -54,6 +54,11 @@ public abstract class AbstractRepository implements Repository {
|
||||||
*/
|
*/
|
||||||
String shortName;
|
String shortName;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* empty repository array for convenience
|
||||||
|
*/
|
||||||
|
final static Repository[] emptyRepositories = new Repository[0];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Called to check the repository's content.
|
* Called to check the repository's content.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -85,18 +85,13 @@ public class FileRepository extends AbstractRepository {
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean exists() {
|
public boolean exists() {
|
||||||
if (directory.exists() && directory.isDirectory()) {
|
return directory.exists() && directory.isDirectory();
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void create() {
|
public void create() {
|
||||||
if (!directory.exists() || !directory.isDirectory()) {
|
if (!directory.exists() || !directory.isDirectory()) {
|
||||||
directory.mkdirs();
|
directory.mkdirs();
|
||||||
}
|
}
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -140,7 +135,7 @@ public class FileRepository extends AbstractRepository {
|
||||||
*/
|
*/
|
||||||
public synchronized void update() {
|
public synchronized void update() {
|
||||||
if (!directory.exists()) {
|
if (!directory.exists()) {
|
||||||
repositories = new Repository[0];
|
repositories = emptyRepositories;
|
||||||
if (resources != null) {
|
if (resources != null) {
|
||||||
resources = new HashMap();
|
resources = new HashMap();
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -31,7 +31,7 @@ public class FileResource implements Resource {
|
||||||
this(file, null);
|
this(file, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected FileResource(File file, FileRepository repository) {
|
protected FileResource(File file, Repository repository) {
|
||||||
this.file = file;
|
this.file = file;
|
||||||
|
|
||||||
this.repository = repository;
|
this.repository = repository;
|
||||||
|
|
|
@ -53,7 +53,7 @@ public class MultiFileRepository extends FileRepository {
|
||||||
*/
|
*/
|
||||||
public synchronized void update() {
|
public synchronized void update() {
|
||||||
if (!directory.exists()) {
|
if (!directory.exists()) {
|
||||||
repositories = new Repository[0];
|
repositories = emptyRepositories;
|
||||||
if (resources != null)
|
if (resources != null)
|
||||||
resources.clear();
|
resources.clear();
|
||||||
lastModified = 0;
|
lastModified = 0;
|
||||||
|
|
|
@ -44,6 +44,14 @@ public final class ZipRepository extends AbstractRepository {
|
||||||
this(new File(initArgs), null, null);
|
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
|
* Constructs a ZipRepository using the given zip file as top-level
|
||||||
* repository
|
* repository
|
||||||
|
@ -143,7 +151,7 @@ public final class ZipRepository extends AbstractRepository {
|
||||||
|
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
ex.printStackTrace();
|
ex.printStackTrace();
|
||||||
repositories = new Repository[0];
|
repositories = emptyRepositories;
|
||||||
if (resources == null) {
|
if (resources == null) {
|
||||||
resources = new HashMap();
|
resources = new HashMap();
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Add table
Reference in a new issue