X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=sixth.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fsixth%2Fcore%2Fdocument%2Ftext%2FFormattedText.java;fp=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fsixth%2Fcore%2Fdocument%2Ftext%2FFormattedText.java;h=1b51320715c3faafbaaed006c61f076e6fac1285;hp=ae6a42151fec0adda690dd137ad1700f5c9ad036;hb=e8052e0b1948260c3701bfe80dfaa8fdf5c38053;hpb=e6e265a23ae9e32b65ba6a70d302ae680e73138f

diff --git a/src/main/java/eu/svjatoslav/sixth/core/document/text/FormattedText.java b/src/main/java/eu/svjatoslav/sixth/core/document/text/FormattedText.java
index ae6a421..1b51320 100644
--- a/src/main/java/eu/svjatoslav/sixth/core/document/text/FormattedText.java
+++ b/src/main/java/eu/svjatoslav/sixth/core/document/text/FormattedText.java
@@ -1,22 +1,23 @@
 package eu.svjatoslav.sixth.core.document.text;
 
-import eu.svjatoslav.commons.string.tokenizer.InvalidSyntaxException;
 import eu.svjatoslav.commons.string.tokenizer.Tokenizer;
 import eu.svjatoslav.commons.string.tokenizer.TokenizerMatch;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static eu.svjatoslav.sixth.core.document.Helper.TG_HYPERLINK;
+
 public class FormattedText {
     List<FormattedTextElement> elements = new ArrayList<>();
 
-    public void parseOrgSyntax(String orgText) throws InvalidSyntaxException {
+    public void parseOrgSyntax(String orgText) {
 
         Tokenizer tokenizer = getTokenizer(orgText);
         while (tokenizer.hasMoreContent()) {
             final TokenizerMatch token = tokenizer.getNextToken();
 
-            if (token.terminator == Hyperlink.orgTerminator){
+            if (token.isGroup(TG_HYPERLINK)){
                 elements.add(Hyperlink.fromOrg(token));
                 continue;
             }
@@ -28,17 +29,17 @@ public class FormattedText {
     }
 
 
-    public static FormattedText fromOrg(String orgText) throws InvalidSyntaxException {
+    public static FormattedText fromOrg(String orgText){
         FormattedText formattedText = new FormattedText();
         formattedText.parseOrgSyntax(orgText);
         return formattedText;
     }
 
-    public String compileMd(){
+    public String toMD(){
         StringBuilder sb = new StringBuilder();
 
         for (FormattedTextElement element : elements)
-            sb.append(element.compileMd());
+            sb.append(element.toMD());
 
         return sb.toString();
     }
@@ -46,6 +47,7 @@ public class FormattedText {
     private Tokenizer getTokenizer(String contents) {
         final Tokenizer tokenizer = new Tokenizer(contents);
         tokenizer.addTerminator(Hyperlink.orgTerminator);
+        tokenizer.addTerminator(Hyperlink.orgTerminator2);
         return tokenizer;
     }