Merge pull request #8 from salmanqureshi/writer-experience-improvements

Writer experience improvements
This commit is contained in:
David Cramer
2012-10-31 20:05:28 -07:00
2 changed files with 9 additions and 9 deletions

View File

@@ -728,7 +728,7 @@ public abstract class WebHelpMojo extends AbstractWebhelpMojo {
pdfBuilder.setTrimWadlUriCount(trimWadlUriCount);
pdfBuilder.setComputeWadlPathFromDocbookPath(computeWadlPathFromDocbookPath);
pdfBuilder.setIncludes(getIncludes());
pdfBuilder.setInputFilename(inputFilename);
pdfBuilder.setEntities(getEntities());
String srcFilename = this.projectBuildDirectory+"/docbkx/"+sourceFile.getName();

View File

@@ -90,6 +90,8 @@ public class PDFBuilder {
private static final String COVER_XSL = "cloud/cover.xsl";
// configure fopFactory as desired
private String inputFilename = null;
private File autopdfTargetDirectory = null;
private File webhelpTargetDirectory = null;
private File sourceDirectory = null;
@@ -117,7 +119,6 @@ public class PDFBuilder {
*/
private String foCustomization;
private List customizationParameters = new ArrayList();
private String[] includes;
private List entities;
@@ -449,6 +450,10 @@ public class PDFBuilder {
}
}
public void setInputFilename(String inputFilename) {
this.inputFilename = inputFilename;
}
public MavenProject getProject() {
return project;
}
@@ -587,10 +592,6 @@ public class PDFBuilder {
this.computeWadlPathFromDocbookPath = computeWadlPathFromDocbookPath;
}
public void setIncludes(String[] includes) {
this.includes = includes;
}
public List getEntities() {
return entities;
}
@@ -639,7 +640,7 @@ public class PDFBuilder {
private String[] scanIncludedFiles() {
final DirectoryScanner scanner = new DirectoryScanner();
scanner.setBasedir(sourceDirectory);
scanner.setIncludes(includes);
scanner.setIncludes(new String[]{inputFilename});
scanner.scan();
return scanner.getIncludedFiles();
}
@@ -937,8 +938,7 @@ public class PDFBuilder {
pdfBuilder.setImageDirectory(targetDir.getParentFile());
pdfBuilder.setBranding("rackspace");
String[] includes = {"os-compute-devguide.xml"};
pdfBuilder.setIncludes(includes);
pdfBuilder.setInputFilename("os-compute-devguide.xml");
pdfBuilder.setSourceFilePath(sourceDir+"/os-compute-devguide.xml");
pdfBuilder.setProjectBuildDirectory(sourceDir.getParent());