antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

* Allow non-script resources to be wrapped in SingleFileRepositories and use

Browse source 
fake Global subrepository only for script resources.
* Implement equals(), hashCode() and toString() in SingleFileRepository
This commit is contained in:
hns 2006-04-12 14:55:04 +00:00
parent 7fadb9ce20
commit d47c1f1643
2 changed files with 51 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/helma/framework/core/ApplicationBean.java
View file

@ -153,12 +153,10 @@ public class ApplicationBean implements Serializable {
if (file.isDirectory()) {
rep = new FileRepository(file);
} else if (file.isFile()) {
if (file.getName().endsWith(".js")) {
rep = new SingleFileRepository(file);
} else if (file.getName().endsWith(".zip")) {
if (file.getName().endsWith(".zip")) {
rep = new ZipRepository(file);
} else {
throw new RuntimeException("Unrecognized file type in addRepository: " + obj);
rep = new SingleFileRepository(file);
}
} else {
throw new RuntimeException("Unrecognized file type in addRepository: " + obj);

73
src/helma/framework/repository/SingleFileRepository.java
View file

@ -25,8 +25,10 @@ import java.util.LinkedList;
public class SingleFileRepository implements Repository {
final Resource res;
final Repository global;
final Repository[] repositories;
final LinkedList resources = new LinkedList();
final LinkedList allResources = new LinkedList();
final boolean isScriptFile;
/**
* Constructs a SingleFileRepository using the given argument
@ -42,8 +44,14 @@ public class SingleFileRepository implements Repository {
*/
public SingleFileRepository(File file) {
res = new FileResource(file, this);
global = new FakeGlobal();
repositories = new Repository[] { global };
allResources.add(res);
isScriptFile = file.getName().endsWith(".js");
if (isScriptFile) {
repositories = new Repository[] { new FakeGlobal() };
} else {
repositories = AbstractRepository.emptyRepositories;
resources.add(res);
}
}
/**
@ -144,7 +152,7 @@ public class SingleFileRepository implements Repository {
* @throws java.io.IOException
*/
public List getAllResources() throws IOException {
return global.getAllResources();
return resources;
}
/**
@ -154,17 +162,7 @@ public class SingleFileRepository implements Repository {
* @throws java.io.IOException
*/
public Iterator getResources() throws IOException {
return new Iterator() {
public boolean hasNext() {
return false;
}
public void remove() {}
public Object next() {
return null;
}
};
return resources.iterator();
}
/**
@ -174,6 +172,9 @@ public class SingleFileRepository implements Repository {
* @return specified child resource
*/
public Resource getResource(String resourceName) {
if (!isScriptFile && res.getName().equals(resourceName)) {
return res;
}
return null;
}
@ -187,15 +188,39 @@ public class SingleFileRepository implements Repository {
return res.lastModified();
}
/**
* Return our single resource.
* @return the wrapped resource
*/
protected Resource getResource() {
return res;
}
/**
* Indicates whether some other object is "equal to" this one.
*/
public boolean equals(Object obj) {
return (obj instanceof SingleFileRepository &&
res.equals(((SingleFileRepository) obj).res));
}
/**
* Returns a hash code value for the object.
*/
public int hashCode() {
return res.hashCode();
}
/**
* Returns a string representation of the object.
*/
public String toString() {
return new StringBuffer("SingleFileRepository[")
.append(res.getName()).append("]").toString();
}
class FakeGlobal implements Repository {
final List resources;
FakeGlobal() {
resources = new LinkedList();
resources.add(res);
}
/**
* Checksum of the repository and all its content. Implementations
* should make sure
@ -295,7 +320,7 @@ public class SingleFileRepository implements Repository {
* @throws java.io.IOException
*/
public List getAllResources() throws IOException {
return resources;
return allResources;
}
/**
@ -305,7 +330,7 @@ public class SingleFileRepository implements Repository {
* @throws java.io.IOException
*/
public Iterator getResources() throws IOException {
return resources.iterator();
return allResources.iterator();
}
/**