You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2004/08/07 20:46:37 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/publication ResourcesManager.java
andreas 2004/08/07 11:46:37
Modified: src/java/org/apache/lenya/cms/publication
ResourcesManager.java
Log:
deleting empty parent directories after deleting resources
Revision Changes Path
1.11 +18 -14 cocoon-lenya/src/java/org/apache/lenya/cms/publication/ResourcesManager.java
Index: ResourcesManager.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/publication/ResourcesManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ResourcesManager.java 1 Mar 2004 16:18:17 -0000 1.10
+++ ResourcesManager.java 7 Aug 2004 18:46:37 -0000 1.11
@@ -22,6 +22,8 @@
import java.io.File;
import java.io.FileFilter;
+import org.apache.lenya.util.FileUtil;
+
/**
* Manager for resources of a CMS document.
*/
@@ -30,6 +32,7 @@
private Document document;
public static final String RESOURCES_PREFIX = "resources";
+
public static final String RESOURCES_META_SUFFIX = ".meta";
/**
@@ -57,8 +60,8 @@
*/
public File getPath() {
File publicationPath = document.getPublication().getDirectory();
- File resourcesPath =
- new File(publicationPath, getPathFromPublication().replace('/', File.separatorChar));
+ File resourcesPath = new File(publicationPath, getPathFromPublication().replace('/',
+ File.separatorChar));
return resourcesPath;
}
@@ -76,7 +79,7 @@
return file.isFile() && !file.getName().endsWith(RESOURCES_META_SUFFIX);
}
};
-
+
return getFiles(filter);
}
@@ -90,7 +93,7 @@
if (getPath().isDirectory()) {
files = getPath().listFiles(filter);
}
-
+
return files;
}
@@ -108,24 +111,25 @@
};
return getFiles(filter);
}
-
+
/**
* Deletes all resources.
*/
public void deleteResources() {
-
+
+ File stopDirectory = new File(document.getPublication().getDirectory(), RESOURCES_PREFIX);
+
File[] resources = getResources();
- File[] metas = getMetaFiles();
for (int i = 0; i < resources.length; i++) {
resources[i].delete();
+ FileUtil.deleteParentDirs(resources[i], stopDirectory);
}
+
+ File[] metas = getMetaFiles();
for (int i = 0; i < metas.length; i++) {
metas[i].delete();
- }
- File directory = getPath();
- if (directory.isDirectory() && directory.listFiles().length == 0) {
- directory.delete();
+ FileUtil.deleteParentDirs(metas[i], stopDirectory);
}
}
-
-}
+
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org