jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject [11/16] jspwiki git commit: make PROP_USEOUTLINKIMAGE and OUTLINK_IMAGE accesible through MarkupParser
Date Sun, 16 Jul 2017 11:54:56 GMT
make PROP_USEOUTLINKIMAGE and OUTLINK_IMAGE accesible through MarkupParser


Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/4f3e020d
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/4f3e020d
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/4f3e020d

Branch: refs/heads/master
Commit: 4f3e020dbe926e1ba869ad52596519c72767390b
Parents: ed1b5a7
Author: juanpablo <juanpablo@apache.org>
Authored: Tue Jul 4 19:19:35 2017 +0200
Committer: juanpablo <juanpablo@apache.org>
Committed: Sun Jul 16 13:26:32 2017 +0200

----------------------------------------------------------------------
 .../org/apache/wiki/parser/JSPWikiMarkupParser.java    |  1 -
 .../main/java/org/apache/wiki/parser/MarkupParser.java | 13 +++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jspwiki/blob/4f3e020d/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java b/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
index 42f25d8..3e86248 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
@@ -41,7 +41,6 @@ import javax.xml.transform.Result;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.oro.text.GlobCompiler;
 import org.apache.oro.text.regex.MalformedPatternException;
 import org.apache.oro.text.regex.MatchResult;
 import org.apache.oro.text.regex.Pattern;

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/4f3e020d/jspwiki-war/src/main/java/org/apache/wiki/parser/MarkupParser.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/parser/MarkupParser.java b/jspwiki-war/src/main/java/org/apache/wiki/parser/MarkupParser.java
index 056edf7..ec0d28f 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/parser/MarkupParser.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/parser/MarkupParser.java
@@ -78,13 +78,18 @@ public abstract class MarkupParser
     /** Lists all punctuation characters allowed in WikiMarkup. These
         will not be cleaned away. This is for compatibility for older versions
         of JSPWiki. */
-
-    protected static final String           LEGACY_CHARS_ALLOWED      = "._";
+    protected static final String LEGACY_CHARS_ALLOWED      = "._";
 
     /** Lists all punctuation characters allowed in page names. */
-    public    static final String           PUNCTUATION_CHARS_ALLOWED = " ()&+,-=._$";
+    public    static final String PUNCTUATION_CHARS_ALLOWED = " ()&+,-=._$";
+
+    /** Name of the outlink image; relative path to the JSPWiki directory. */
+    public    static final String OUTLINK_IMAGE = "images/out.png";
+
+    /** If true, all outward links (external links) have a small link image appended. */
+    public    static final String PROP_USEOUTLINKIMAGE  = "jspwiki.translatorReader.useOutlinkImage";
 
-    private static final String INLINE_IMAGE_PATTERNS = "JSPWikiMarkupParser.inlineImagePatterns";
+    private   static final String INLINE_IMAGE_PATTERNS = "JSPWikiMarkupParser.inlineImagePatterns";
 
     /**
      *  Constructs a MarkupParser.  The subclass must call this constructor


Mime
View raw message