Skip to content

Commit

Permalink
[Adding Guice] Still on that huge refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
@ceci
ceci committed Mar 25, 2013
1 parent d8603ea commit b303389
Show file tree
Hide file tree
Showing 80 changed files with 474 additions and 491 deletions.
2 changes: 1 addition & 1 deletion src/main/java/br/com/caelum/tubaina/CompositeChunk.java
View file
Expand Up @@ -5,7 +5,7 @@

public abstract class CompositeChunk<T extends CompositeChunk<T>> extends AbstractChunk<T> {

private List<Chunk> body;
protected final List<Chunk> body;

public CompositeChunk(List<Chunk> body) {
this.body = body;
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/br/com/caelum/tubaina/ParseType.java
View file
Expand Up @@ -5,6 +5,7 @@

import br.com.caelum.tubaina.parser.Parser;
import br.com.caelum.tubaina.parser.RegexConfigurator;
import br.com.caelum.tubaina.parser.RegexTag;
import br.com.caelum.tubaina.parser.Tag;
import br.com.caelum.tubaina.parser.html.desktop.FlatHtmlGenerator;
import br.com.caelum.tubaina.parser.html.desktop.Generator;
Expand All @@ -21,7 +22,7 @@ public enum ParseType {
LATEX {
@Override
public Parser getParser(RegexConfigurator conf, boolean noAnswer, boolean showNotes, String linkParameter) throws IOException {
List<Tag> tags = conf.read("/regex.properties", "/latex.properties");
List<RegexTag> tags = conf.read("/regex.properties", "/latex.properties");
tags.add(new LinkTag("\\\\link{$1}$2"));
return new LatexParser(tags, showNotes, noAnswer);
}
Expand All @@ -36,7 +37,7 @@ public Generator getGenerator(Parser parser, TubainaBuilderData data) {
HTMLFLAT {
@Override
public Parser getParser(RegexConfigurator conf, boolean noAnswer, boolean showNotes, String linkParameter) throws IOException {
List<Tag> tags = conf.read("/regex.properties", "/html.properties");
List<RegexTag> tags = conf.read("/regex.properties", "/html.properties");
tags.add(new LinkTag("<a href=\"$1"+linkParameter+"\">$1</a>$2"));
return new HtmlParser(tags, noAnswer, showNotes);
}
Expand All @@ -49,7 +50,7 @@ protected Generator getGenerator(Parser parser, TubainaBuilderData data) {
HTML {
@Override
public Parser getParser(RegexConfigurator conf, boolean noAnswer, boolean showNotes, String linkParameter) throws IOException {
List<Tag> tags = conf.read("/regex.properties", "/html.properties");
List<RegexTag> tags = conf.read("/regex.properties", "/html.properties");
tags.add(new LinkTag("<a href=\"$1"+linkParameter+"\">$1</a>$2"));
return new HtmlParser(tags, noAnswer, showNotes);
}
Expand All @@ -63,7 +64,7 @@ protected Generator getGenerator(Parser parser, TubainaBuilderData data) {
KINDLE {
@Override
public Parser getParser(RegexConfigurator conf, boolean noAnswer, boolean showNotes, String linkParameter) throws IOException {
List<Tag> tags = conf.read("/regex.properties", "/kindle.properties");
List<RegexTag> tags = conf.read("/regex.properties", "/kindle.properties");
tags.add(new LinkTag("<a href=\"$1"+linkParameter+"\">$1</a>$2"));
return new KindleParser(tags, noAnswer, showNotes);
}
Expand Down
25 changes: 17 additions & 8 deletions src/main/java/br/com/caelum/tubaina/chunk/ImageChunk.java
View file
@@ -1,26 +1,35 @@
package br.com.caelum.tubaina.chunk;

import br.com.caelum.tubaina.Chunk;
import br.com.caelum.tubaina.parser.Parser;
import br.com.caelum.tubaina.AbstractChunk;


public class ImageChunk implements Chunk {
public class ImageChunk extends AbstractChunk<ImageChunk> {

private final String options;
private final String path;
private final double width;
private final int dpi;

public ImageChunk(String path, String options, double width, int dpi) {
this.options = options;
this.path = path;
this.options = options;
this.width = width;
this.dpi = dpi;
}

@Override
public String asString(Parser p) {
return p.parseImage(this.path,this.options + " [" + width + "," + dpi + "]");
public String getOptions() {
return options;
}

public String getPath() {
return path;
}

public double getWidth() {
return width;
}

public int getDpi() {
return dpi;
}

}
12 changes: 5 additions & 7 deletions src/main/java/br/com/caelum/tubaina/chunk/IndexChunk.java
View file
@@ -1,17 +1,15 @@
package br.com.caelum.tubaina.chunk;

import br.com.caelum.tubaina.Chunk;
import br.com.caelum.tubaina.parser.Parser;
import br.com.caelum.tubaina.AbstractChunk;

public class IndexChunk implements Chunk{
public class IndexChunk extends AbstractChunk<IndexChunk>{

private final String name;
public IndexChunk(String name) {
this.name = name;

}
public String asString(Parser p) {
return p.parseIndex(name);
}

public String getName() {
return name;
}
}
16 changes: 3 additions & 13 deletions src/main/java/br/com/caelum/tubaina/chunk/ItemChunk.java
View file
Expand Up @@ -3,22 +3,12 @@
import java.util.List;

import br.com.caelum.tubaina.Chunk;
import br.com.caelum.tubaina.parser.Parser;
import br.com.caelum.tubaina.CompositeChunk;

public class ItemChunk implements Chunk {

private List<Chunk> body;
public class ItemChunk extends CompositeChunk<ItemChunk> {

public ItemChunk(List<Chunk> body) {
this.body = body;
}

public String asString(Parser p) {
String content = "";
for (Chunk c : body) {
content += c.asString();
}
return p.parseItem(content);
super(body);
}

}
15 changes: 8 additions & 7 deletions src/main/java/br/com/caelum/tubaina/chunk/JavaChunk.java
View file
@@ -1,21 +1,22 @@
package br.com.caelum.tubaina.chunk;

import br.com.caelum.tubaina.Chunk;
import br.com.caelum.tubaina.parser.Parser;
import br.com.caelum.tubaina.AbstractChunk;

public class JavaChunk implements Chunk {
public class JavaChunk extends AbstractChunk<JavaChunk> {

private String content;

private final String options;

public JavaChunk(String options, String content) {
this.content = content;
this.options = options;
}

public String asString(Parser p) {
return p.parseJava(content, options);
public String getContent() {
return content;
}

public String getOptions() {
return options;
}

}
15 changes: 4 additions & 11 deletions src/main/java/br/com/caelum/tubaina/chunk/ListChunk.java
View file
Expand Up @@ -5,23 +5,16 @@
import br.com.caelum.tubaina.Chunk;
import br.com.caelum.tubaina.CompositeChunk;

public class ListChunk implements CompositeChunk {
public class ListChunk extends CompositeChunk<ListChunk> {


private List<Chunk> body;
private String type;

public ListChunk(String type, List<Chunk> body) {
this.body = body;
super(body);
this.type = type;
}

public String asString() {
String content = "";
for (Chunk c : body) {
content += c.asString();
}
return p.parseList(content, type);
public String getType() {
return type;
}

}
8 changes: 3 additions & 5 deletions src/main/java/br/com/caelum/tubaina/chunk/MockedChunk.java
View file
@@ -1,18 +1,16 @@
package br.com.caelum.tubaina.chunk;

import br.com.caelum.tubaina.Chunk;
import br.com.caelum.tubaina.parser.Parser;
import br.com.caelum.tubaina.AbstractChunk;

public class MockedChunk implements Chunk {
public class MockedChunk extends AbstractChunk<MockedChunk> {

private String content;

public MockedChunk(String content) {
this.content = content;
}

public String asString(Parser p) {
public String getContent() {
return content;
}

}
18 changes: 2 additions & 16 deletions src/main/java/br/com/caelum/tubaina/chunk/NoteChunk.java
View file
Expand Up @@ -5,27 +5,13 @@
import br.com.caelum.tubaina.Chunk;
import br.com.caelum.tubaina.CompositeChunk;

public class NoteChunk implements CompositeChunk {
public class NoteChunk extends CompositeChunk<NoteChunk> {

private final List<Chunk> title;

private final List<Chunk> body;

public NoteChunk(List<Chunk> title, List<Chunk> body) {
super(body);
this.title = title;
this.body = body;
}

public String asString() {
String content = "" + '\n';
for (Chunk c : body) {
content += c.asString();
}
String fullTitle = "";
for (Chunk c : title) {
fullTitle += c.asString();
}
return p.parseNote(content, fullTitle);
}

}
10 changes: 4 additions & 6 deletions src/main/java/br/com/caelum/tubaina/chunk/ParagraphChunk.java
View file
@@ -1,18 +1,16 @@
package br.com.caelum.tubaina.chunk;

import br.com.caelum.tubaina.Chunk;
import br.com.caelum.tubaina.parser.Parser;
import br.com.caelum.tubaina.AbstractChunk;

public class ParagraphChunk implements Chunk{
public class ParagraphChunk extends AbstractChunk<ParagraphChunk>{

private String content;

public ParagraphChunk(String content) {
this.content = content;
}

public String asString(Parser p) {
return p.parseParagraph(this.content);
public String getContent() {
return content;
}

}
12 changes: 5 additions & 7 deletions src/main/java/br/com/caelum/tubaina/chunk/ParagraphInsideItemChunk.java
View file
@@ -1,18 +1,16 @@
package br.com.caelum.tubaina.chunk;

import br.com.caelum.tubaina.Chunk;
import br.com.caelum.tubaina.parser.Parser;
import br.com.caelum.tubaina.AbstractChunk;

public class ParagraphInsideItemChunk implements Chunk {
public class ParagraphInsideItemChunk extends AbstractChunk<ParagraphInsideItemChunk> {

private final String content;

public ParagraphInsideItemChunk(String content) {
this.content = content;
}

public String asString(Parser p) {
return p.parseParagraphInsideItem(content);
}

public String getContent() {
return content;
}
}
14 changes: 2 additions & 12 deletions src/main/java/br/com/caelum/tubaina/chunk/QuestionChunk.java
View file
Expand Up @@ -5,20 +5,10 @@
import br.com.caelum.tubaina.Chunk;
import br.com.caelum.tubaina.CompositeChunk;

public class QuestionChunk implements CompositeChunk {

private List<Chunk> body;
public class QuestionChunk extends CompositeChunk<QuestionChunk> {

public QuestionChunk(List<Chunk> body) {
this.body = body;
super(body);
}

public String asString() {
String content = "";
for (Chunk c : body) {
content += c.asString();
}
return p.parseQuestion(content);
}

}
14 changes: 8 additions & 6 deletions src/main/java/br/com/caelum/tubaina/chunk/RubyChunk.java
View file
@@ -1,9 +1,8 @@
package br.com.caelum.tubaina.chunk;

import br.com.caelum.tubaina.Chunk;
import br.com.caelum.tubaina.parser.Parser;
import br.com.caelum.tubaina.AbstractChunk;

public class RubyChunk implements Chunk {
public class RubyChunk extends AbstractChunk<RubyChunk> {

private final String content;
private final String options;
Expand All @@ -13,8 +12,11 @@ public RubyChunk(String content, String options) {
this.options = options;
}

public String asString(Parser p) {
return p.parseRuby(content, options);
public String getContent() {
return content;
}

public String getOptions() {
return options;
}

}

0 comments on commit b303389

Please sign in to comment.