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

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

Author: szimano
Date: 2005-10-21 10:31:30 -0400 (Fri, 21 Oct 2005)
New Revision: 1425

Modified:
   trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml
   trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java
Log:
Attachment deleting issues:
http://jira.jboss.com/jira/browse/JBWIKI-63
http://jira.jboss.com/jira/browse/JBWIKI-62


Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml	2005-10-21 09:11:14 UTC (rev 1424)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml	2005-10-21 14:31:30 UTC (rev 1425)
@@ -17,14 +17,14 @@
 			<class>org.jboss.wiki.plugins.SubpagesListPlugin</class>
 		</plugin>
 		<plugin>
+			<name>adminConsole</name>
+			<class>org.jboss.wiki.plugins.AdminConsolePlugin</class>
+		</plugin>
+		<plugin>
 			<name>attachmentList</name>
 			<class>org.jboss.wiki.plugins.AttachmentListPlugin</class>
 		</plugin>
 		<plugin>
-			<name>adminConsole</name>
-			<class>org.jboss.wiki.plugins.AdminConsolePlugin</class>
-		</plugin>
-		<plugin>
 			<name>wikiToHtmlTranslator</name>
 			<class>org.jboss.wiki.plugins.HTMLTranslatorParts</class>
 		</plugin>

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-10-21 09:11:14 UTC (rev 1424)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java	2005-10-21 14:31:30 UTC (rev 1425)
@@ -665,7 +665,7 @@
 		File attDir = new File(pathToAttachments + "/" + page.getName()
 				+ "-att");
 
-		if (attDir.exists()) {
+		if (attDir.exists() && (attDir.listFiles().length > 0)) {
 			File[] attachements = attDir.listFiles();
 
 			for (int i = 0; i < attachements.length; i++) {