summaryrefslogtreecommitdiffstats
path: root/conversion
diff options
context:
space:
mode:
authorrsiddharth <rsiddharth@ninthfloor.org>2012-11-10 17:20:42 +0530
committerrsiddharth <rsiddharth@ninthfloor.org>2012-11-10 17:20:42 +0530
commit75114f9ba449a3bafd9d4ddb986e50b772c3a237 (patch)
tree53d1b4e157e80ff3b24412d8123ad3a7546815ce /conversion
parent727d6d17305e6dbba4c5231fb40012b5adfaca1b (diff)
New Parser: Source; Bug-fix for conversion/CanConvert.java & license/Liberate.java.
added: parsers/Source.java (New Parser, adds a link to the 'scruffy' source file) modified: conversion/CanConvert.java (bug-fix) conversion/CreateHtmlFile.java (we have two versions of the create() method now) license/Liberate.java (regex fix) parsers/ParserList.java (new parser added, see above)
Diffstat (limited to 'conversion')
-rw-r--r--conversion/CanConvert.java3
-rw-r--r--conversion/CreateHtmlFile.java14
2 files changed, 13 insertions, 4 deletions
diff --git a/conversion/CanConvert.java b/conversion/CanConvert.java
index baf62c5..8f704e7 100644
--- a/conversion/CanConvert.java
+++ b/conversion/CanConvert.java
@@ -25,9 +25,10 @@ import java.io.*;
public class CanConvert {
private File htmlFile;
+ private CreateHtmlFile createHtml = new CreateHtmlFile();
private long modified1, modified2;
public boolean check(File file) {
- htmlFile = new File(file.getAbsolutePath()+".html");
+ htmlFile = createHtml.create(file);
modified1 = file.lastModified();
modified2 = htmlFile.lastModified();
if(modified1 > modified2) {
diff --git a/conversion/CreateHtmlFile.java b/conversion/CreateHtmlFile.java
index a502f7e..729b3cf 100644
--- a/conversion/CreateHtmlFile.java
+++ b/conversion/CreateHtmlFile.java
@@ -28,11 +28,19 @@ import scruf.status.*;
public class CreateHtmlFile {
private Pattern pattern = Pattern.compile("(.+?\\.)scruffy");
private Matcher matcher;
+ private File htmlFile=null;
+ /**
+ * This method uses PresentFile.file as the 'file' for
+ * which a corresponding 'htmlFile' has to be created.
+ */
public File create() {
- File htmlFile=null;
- matcher = pattern.matcher(PresentFile.file.getName());
+ return create(PresentFile.file);
+ }
+ public File create(File file) {
+ htmlFile=null;
+ matcher = pattern.matcher(file.getName());
if(matcher.find()) {
- htmlFile = new File(PresentFile.file.getParentFile(),
+ htmlFile = new File(file.getParentFile(),
matcher.group(1)+"html");
}else {
System.err.println("ERROR: something wrong with scruf: unable to create html file"+