From 1d92dc8eb4180f04abc8513a8f3d7d95fed57fa2 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Wed, 28 Nov 2012 18:09:03 +0530 Subject: bug-fixes; now the final HTML adornings are done in Header, LastUpdate & CloseHtmlTags parsers added: parsers/CloseHtmlTags.java (closes the HTML tags) modified: index/IndexCreator.java (bug fix) parsers/Header.java (couple of lines moved to CloseHtmlTag parser) parsers/MetaParser.java (copyright text added) parsers/ParserList.java (new parser + some parser sequence re-arrangements) --- parsers/CloseHtmlTags.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++ parsers/Header.java | 7 ------- parsers/MetaParser.java | 23 ++++++++++++++++++++++- parsers/ParserList.java | 5 +++-- 4 files changed, 71 insertions(+), 10 deletions(-) create mode 100644 parsers/CloseHtmlTags.java (limited to 'parsers') diff --git a/parsers/CloseHtmlTags.java b/parsers/CloseHtmlTags.java new file mode 100644 index 0000000..ddeaf10 --- /dev/null +++ b/parsers/CloseHtmlTags.java @@ -0,0 +1,46 @@ +/*+ + * Copyright 2012 rsiddharth + * Email: + * + * This file is part of Scruf. + * + * Scruf is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + +package scruf.parsers; + +/** + * this class, inserts the main content of the html into the
+ * block. + */ + +public class CloseHtmlTags implements Parser { + private StringBuilder sbuilder; + /** + * the fileContent has its and
fields filled. + */ + public String parse(String fileContent) { + sbuilder = new StringBuilder(); + sbuilder.append(fileContent); + // add "powered by scruf" at bottom of page. + sbuilder.append("\n
\n"); + sbuilder.append("powered by scruf"); + sbuilder.append("\n
\n"); + // Close body tag + sbuilder.append("\n\n"); + sbuilder.append("\n"); + return sbuilder.toString(); + } +} diff --git a/parsers/Header.java b/parsers/Header.java index 8bde4c8..88316d5 100644 --- a/parsers/Header.java +++ b/parsers/Header.java @@ -48,13 +48,6 @@ public class Header implements Parser { // insert File Content. sbuilder.append(fileContent); sbuilder.append("
\n"); - // add "powered by scruf" at bottom of page. - sbuilder.append("\n
\n"); - sbuilder.append("powered by scruf"); - sbuilder.append("\n
\n"); - // Close body tag - sbuilder.append("\n\n"); - sbuilder.append("\n"); return sbuilder.toString(); } diff --git a/parsers/MetaParser.java b/parsers/MetaParser.java index 3519cf3..4ac9394 100644 --- a/parsers/MetaParser.java +++ b/parsers/MetaParser.java @@ -1,3 +1,24 @@ +/*+ + * Copyright 2012 rsiddharth + * Email: + * + * This file is part of Scruf. + * + * Scruf is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + package scruf.parsers; import java.util.regex.*; @@ -36,4 +57,4 @@ public class MetaParser implements Parser { } return fileContent; } -} \ No newline at end of file +} diff --git a/parsers/ParserList.java b/parsers/ParserList.java index a40dcb2..8691cdd 100644 --- a/parsers/ParserList.java +++ b/parsers/ParserList.java @@ -34,14 +34,15 @@ public class ParserList { parsers.add(new DocumentDate()); parsers.add(new WordDecoration()); parsers.add(new Headings()); - parsers.add(new Links()); + parsers.add(new Links()); parsers.add(new Images()); parsers.add(new Footer()); parsers.add(new Paragraphs()); - parsers.add(new LastUpdate()); parsers.add(new Source()); parsers.add(new BackButton()); parsers.add(new Header()); + parsers.add(new LastUpdate()); + parsers.add(new CloseHtmlTags()); } public List list() { return new ArrayList(parsers); -- cgit v1.2.3