jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject [01/10] jspwiki git commit: move constants from JSPWikiMarkupParser to MarkupParser
Date Tue, 22 Aug 2017 18:12:57 GMT
Repository: jspwiki
Updated Branches:
  refs/heads/master 63b708f1f -> 9e29c3c75


move constants from JSPWikiMarkupParser to MarkupParser


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

Branch: refs/heads/master
Commit: e72e31dd3e9e3c6d9a64556abf43bfdbcbe24208
Parents: 63b708f
Author: juanpablo <juanpablo@apache.org>
Authored: Tue Aug 22 19:56:21 2017 +0200
Committer: juanpablo <juanpablo@apache.org>
Committed: Tue Aug 22 19:56:21 2017 +0200

----------------------------------------------------------------------
 .../apache/wiki/parser/JSPWikiMarkupParser.java | 46 --------------------
 .../org/apache/wiki/parser/MarkupParser.java    | 46 ++++++++++++++++++++
 2 files changed, 46 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jspwiki/blob/e72e31dd/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 c63b615..9078d47 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
@@ -78,34 +78,6 @@ import org.jdom2.Verifier;
  */
 public class JSPWikiMarkupParser extends MarkupParser {
 
-    /** The value for anchor element <tt>class</tt> attributes when used
-      * for wiki page (normal) links. The value is "wikipage". */
-    public static final String CLASS_WIKIPAGE = "wikipage";
-
-    /** The value for anchor element <tt>class</tt> attributes when used
-      * for edit page links. The value is "createpage". */
-    public static final String CLASS_EDITPAGE = "createpage";
-
-    /** The value for anchor element <tt>class</tt> attributes when used
-      * for interwiki page links. The value is "interwiki". */
-    public static final String CLASS_INTERWIKI = "interwiki";
-
-    /** The value for anchor element <tt>class</tt> attributes when used
-      * for footnote links. The value is "footnote". */
-    public static final String CLASS_FOOTNOTE = "footnote";
-
-    /** The value for anchor element <tt>class</tt> attributes when used
-      * for footnote links. The value is "footnote". */
-    public static final String CLASS_FOOTNOTE_REF = "footnoteref";
-
-    /** The value for anchor element <tt>class</tt> attributes when used
-      * for external links. The value is "external". */
-    public static final String CLASS_EXTERNAL = "external";
-
-    /** The value for anchor element <tt>class</tt> attributes when used
-      * for attachments. The value is "attachment". */
-    public static final String CLASS_ATTACHMENT = "attachment";
-
     protected static final int              READ          = 0;
     protected static final int              EDIT          = 1;
     protected static final int              EMPTY         = 2;  // Empty message
@@ -162,9 +134,6 @@ public class JSPWikiMarkupParser extends MarkupParser {
     /** If true, all outward attachment info links have a small link image appended. */
     public static final String     PROP_USEATTACHMENTIMAGE = "jspwiki.translatorReader.useAttachmentImage";
 
-    /** If set to "true", all external links are tagged with 'rel="nofollow"' */
-    public static final String     PROP_USERELNOFOLLOW   = "jspwiki.translatorReader.useRelNofollow";
-
     /** If true, then considers CamelCase links as well. */
     private boolean                m_camelCaseLinks      = false;
 
@@ -219,21 +188,6 @@ public class JSPWikiMarkupParser extends MarkupParser {
 
     private static final String CAMELCASE_PATTERN     = "JSPWikiMarkupParser.camelCasePattern";
 
-    private static final String[] CLASS_TYPES =
-    {
-       CLASS_WIKIPAGE,
-       CLASS_EDITPAGE,
-       "",
-       CLASS_FOOTNOTE,
-       CLASS_FOOTNOTE_REF,
-       "",
-       CLASS_EXTERNAL,
-       CLASS_INTERWIKI,
-       CLASS_EXTERNAL,
-       CLASS_WIKIPAGE,
-       CLASS_ATTACHMENT
-    };
-
 
     /**
      *  This Comparator is used to find an external link from c_externalLinks.  It

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/e72e31dd/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 ec0d28f..1cbac22 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
@@ -91,6 +91,52 @@ public abstract class MarkupParser
 
     private   static final String INLINE_IMAGE_PATTERNS = "JSPWikiMarkupParser.inlineImagePatterns";
 
+    /** If set to "true", all external links are tagged with 'rel="nofollow"' */
+    public static final String     PROP_USERELNOFOLLOW   = "jspwiki.translatorReader.useRelNofollow";
+
+    /** The value for anchor element <tt>class</tt> attributes when used
+     * for wiki page (normal) links. The value is "wikipage". */
+   public static final String CLASS_WIKIPAGE = "wikipage";
+
+   /** The value for anchor element <tt>class</tt> attributes when used
+     * for edit page links. The value is "createpage". */
+   public static final String CLASS_EDITPAGE = "createpage";
+
+   /** The value for anchor element <tt>class</tt> attributes when used
+     * for interwiki page links. The value is "interwiki". */
+   public static final String CLASS_INTERWIKI = "interwiki";
+
+   /** The value for anchor element <tt>class</tt> attributes when used
+     * for footnote links. The value is "footnote". */
+   public static final String CLASS_FOOTNOTE = "footnote";
+
+   /** The value for anchor element <tt>class</tt> attributes when used
+     * for footnote links. The value is "footnote". */
+   public static final String CLASS_FOOTNOTE_REF = "footnoteref";
+
+   /** The value for anchor element <tt>class</tt> attributes when used
+     * for external links. The value is "external". */
+   public static final String CLASS_EXTERNAL = "external";
+
+   /** The value for anchor element <tt>class</tt> attributes when used
+     * for attachments. The value is "attachment". */
+   public static final String CLASS_ATTACHMENT = "attachment";
+
+   public static final String[] CLASS_TYPES =
+   {
+      CLASS_WIKIPAGE,
+      CLASS_EDITPAGE,
+      "",
+      CLASS_FOOTNOTE,
+      CLASS_FOOTNOTE_REF,
+      "",
+      CLASS_EXTERNAL,
+      CLASS_INTERWIKI,
+      CLASS_EXTERNAL,
+      CLASS_WIKIPAGE,
+      CLASS_ATTACHMENT
+   };
+
     /**
      *  Constructs a MarkupParser.  The subclass must call this constructor
      *  to set up the necessary bits and pieces.


Mime
View raw message