mindol1004/swagger2markup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renamed crossReference -> crossReferenceAnchor and crossReferenceTitle -> crossReference as it's the default behavior

Browse Source 
introduced addFilenameExtension (e.g. needed for inter-document cross-references)
fixed anchor normalization (support for ASCII characters in AsciiDoc)
Several workarounds with inter-document cross-references
Removed documentTitleWithAttributes as it's no use as-is
This commit is contained in:
Hugo de Paix de Coeur
2016-02-10 12:13:32 +01:00
parent 5b5a58ee7f
commit 337c8ba403
8 changed files with 105 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/io/github/robwin/markup/builder/AbstractMarkupDocBuilder.java
View File

@@ -41,10 +41,6 @@ public abstract class AbstractMarkupDocBuilder implements MarkupDocBuilder {
documentBuilder.append(markup).append(title).append(newLine).append(newLine);
}
protected void documentTitleWithAttributes(Markup markup, String title){
documentBuilder.append(newLine).append(markup).append(title).append(newLine);
}
protected void sectionTitleLevel1(Markup markup, String title){
documentBuilder.append(newLine).append(markup).append(title).append(newLine);
}
@@ -98,11 +94,15 @@ public abstract class AbstractMarkupDocBuilder implements MarkupDocBuilder {
protected void unorderedList(Markup markup, List<String> list){
documentBuilder.append(newLine);
for(String listEntry : list){
documentBuilder.append(markup).append(listEntry).append(newLine);
unorderedListItem(markup, listEntry);
}
documentBuilder.append(newLine);
}
protected void unorderedListItem(Markup markup, String item) {
documentBuilder.append(markup).append(item).append(newLine);
}
@Override
public MarkupDocBuilder anchor(String anchor, String text) {
documentBuilder.append(anchorAsString(anchor, text));
@@ -115,40 +115,35 @@ public abstract class AbstractMarkupDocBuilder implements MarkupDocBuilder {
}
@Override
public MarkupDocBuilder crossReference(String document, String anchor, String text) {
documentBuilder.append(crossReferenceAsString(document, anchor, text));
public MarkupDocBuilder crossReferenceAnchor(String document, String anchor, String text) {
documentBuilder.append(crossReferenceAnchorAsString(document, anchor, text));
return this;
}
@Override
public MarkupDocBuilder crossReference(String anchor, String text) {
return crossReference(null, anchor, text);
public MarkupDocBuilder crossReferenceAnchor(String anchor, String text) {
return crossReferenceAnchor(null, anchor, text);
}
@Override
public MarkupDocBuilder crossReference(String anchor) {
return crossReference(null, anchor, null);
public MarkupDocBuilder crossReferenceAnchor(String anchor) {
return crossReferenceAnchor(null, anchor, null);
}
@Override
public MarkupDocBuilder crossReferenceTitle(String document, String anchor, String text) {
documentBuilder.append(crossReferenceTitleAsString(document, anchor, text));
public MarkupDocBuilder crossReference(String document, String title, String text) {
documentBuilder.append(crossReferenceAsString(document, title, text));
return this;
}
@Override
public MarkupDocBuilder crossReferenceTitle(String anchor, String text) {
return crossReferenceTitle(null, anchor, text);
public MarkupDocBuilder crossReference(String title, String text) {
return crossReference(null, title, text);
}
@Override
public MarkupDocBuilder crossReferenceTitle(String anchor) {
return crossReferenceTitle(null, anchor, null);
}
@Override
public String crossReferenceTitleAsString(String document, String anchor, String text) {
return crossReferenceAsString(document, anchor, text);
public MarkupDocBuilder crossReference(String title) {
return crossReference(null, title, null);
}
@Override
@@ -167,6 +162,10 @@ public abstract class AbstractMarkupDocBuilder implements MarkupDocBuilder {
return documentBuilder.toString();
}
protected String addfileExtension(Markup markup, String fileName) {
return fileName + "." + markup;
}
@Override
public void writeToFileWithoutExtension(String directory, String fileName, Charset charset) throws IOException {
Files.createDirectories(Paths.get(directory));
@@ -178,4 +177,9 @@ public abstract class AbstractMarkupDocBuilder implements MarkupDocBuilder {
}
documentBuilder = new StringBuilder();
}
@Override
public void writeToFile(String directory, String fileName, Charset charset) throws IOException {
writeToFileWithoutExtension(directory, addfileExtension(fileName), charset);
}
}