LRDOCS-2177 Update number images tool for develop so that it numbers …

…figures in articles no matter how deeply nested

code/liferay-doc-utils/src/com/liferay/documentation/util/NumberImagesTaskDevSite.java

@@ -2,6 +2,10 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
@@ -11,45 +15,54 @@ public class NumberImagesTaskDevSite extends Task {
 	@Override
 	public void execute() throws BuildException {
 
-		File articlesDir = new File("articles");
+		File articleDir = new File("articles");
 		System.out.println("Numbering images for files in "
-				+ articlesDir.getPath() + " ...");
+				+ articleDir.getPath() + " ...");
 
-		if (!articlesDir.exists() || !articlesDir.isDirectory()) {
-			throw new BuildException("FAILURE - bad chapters directory " + articlesDir);
+		if (!articleDir.exists() || !articleDir.isDirectory()) {
+			throw new BuildException("FAILURE - bad chapters directory " + articleDir);
 		}
 
-		File[] articlesDirContents = articlesDir.listFiles();
+		File[] articleDirFiles = articleDir.listFiles();
+		List<File> articles = new ArrayList<File>();
 
-		for (File subDir : articlesDirContents) {
+		Queue<File> q = new LinkedList<File>();
+		for (File f : articleDirFiles) {
+			q.add(f);
+		}
 
-			// Get listing of markdown files
-			if (subDir.isDirectory()) {
-				String[] files = subDir.list();
-
-				if (files == null || files.length == 0) {
-					throw new BuildException("FAILURE - no markdown files found in " + subDir.getAbsolutePath());
+		while (!q.isEmpty()) {
+			File f = q.remove(); 
+
+			if (f.isDirectory()) {
+				File[] files = f.listFiles();
+
+				for (File file : files) {
+					q.add(file);
 				}
-
-				// Process each file
-				for (int i = 0; i < files.length; i++) {
-					String filename = files[i];
-
-					if (!filename.endsWith(".markdown")) {
-						continue;
-					}
-
-					String filepath = subDir.getAbsolutePath() + "/" + filename;
-
-					try {
-						ResetImagesDevSite.resetImages(filepath);
-						NumberImagesDevSite.numberImages(filepath);
-					} catch (IOException e) {
-						throw new BuildException(e.getLocalizedMessage());
-					}
+			}
+			else {
+				if (f.getName().endsWith(".markdown")) {
+					articles.add(f);
 				}
 			}
+		}
+
+
+		if (articles.isEmpty()) {
+			throw new BuildException("FAILURE - no markdown files found in " + articleDir.getAbsolutePath());
+		}
 
+		for (File article : articles) {
+			String articlePath = article.getAbsolutePath();
+
+			try {
+				ResetImagesDiscover.resetImages(articlePath);
+				NumberImagesDiscover.numberImages(articlePath);
+			}
+			catch (IOException ie) {
+				throw new BuildException(ie.getLocalizedMessage());
+			}
 		}
 	}
 

code/liferay-doc-utils/src/com/liferay/documentation/util/NumberImagesTaskDiscover.java

@@ -3,7 +3,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;