[Jboss-svn-commits] JBL Code SVN: r1223 - trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki

[<jbo...@li...>]

Author: szimano
Date: 2005-09-27 11:55:35 -0400 (Tue, 27 Sep 2005)
New Revision: 1223

Modified:
   trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java
Log:
don't show pages from trash


Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java	2005-09-27 14:55:35 UTC (rev 1222)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java	2005-09-27 15:55:35 UTC (rev 1223)
@@ -647,8 +647,10 @@
 					&& (!pageFiles[i].getName().endsWith("-att"))) {
 
 				// do not take dirs from OLD
-				if (!pageFiles[i].getAbsolutePath()
-						.equals(pathToMedia + "/OLD")) {
+				if ((!pageFiles[i].getAbsolutePath()
+						.equals(pathToMedia + "/OLD"))&&(!pageFiles[i].getAbsolutePath()
+								.equals(pathToMedia + "/" + MediaDataSource.mediaTrashName))&&(!pageFiles[i].getAbsolutePath()
+										.equals(pathToMedia + "/" + AttachmentDataSource.attTrashName))) {
 					// get names for subpages
 					getPageNamesFor(directory + "/" + pageFiles[i].getName(),
 							attSet);