You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2017/12/03 18:57:00 UTC
[08/15] jspwiki git commit: delete
JSPWikiMarkupParser#isAccessRule(String) and use
LinkParsingOperations#isAccessRule(String) instead
delete JSPWikiMarkupParser#isAccessRule(String) and use LinkParsingOperations#isAccessRule(String) instead
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/55852b9b
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/55852b9b
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/55852b9b
Branch: refs/heads/master
Commit: 55852b9b6ca82454d5b7833e08f06891a3f61fdc
Parents: b6ad5da
Author: juanpablo <ju...@apache.org>
Authored: Sun Dec 3 02:13:27 2017 +0100
Committer: juanpablo <ju...@apache.org>
Committed: Sun Dec 3 02:13:27 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/wiki/parser/JSPWikiMarkupParser.java | 11 +----------
.../org/apache/wiki/parser/LinkParsingOperations.java | 7 +++++--
2 files changed, 6 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/55852b9b/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 cb74995..84726f6 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
@@ -478,15 +478,6 @@ public class JSPWikiMarkupParser extends MarkupParser {
}
/**
- * Returns true, if the link in question is an access
- * rule.
- */
- private static boolean isAccessRule( String link )
- {
- return link.startsWith("{ALLOW") || link.startsWith("{DENY");
- }
-
- /**
* Returns true if the link is really command to insert
* a plugin.
* <P>
@@ -1251,7 +1242,7 @@ public class JSPWikiMarkupParser extends MarkupParser {
StringBuilder sb = new StringBuilder(linktext.length()+80);
- if( isAccessRule( linktext ) )
+ if( m_linkParsingOperations.isAccessRule( linktext ) )
{
return handleAccessRule( linktext );
}
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/55852b9b/jspwiki-war/src/main/java/org/apache/wiki/parser/LinkParsingOperations.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/parser/LinkParsingOperations.java b/jspwiki-war/src/main/java/org/apache/wiki/parser/LinkParsingOperations.java
index 9aedc1b..0ae9632 100755
--- a/jspwiki-war/src/main/java/org/apache/wiki/parser/LinkParsingOperations.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/parser/LinkParsingOperations.java
@@ -71,7 +71,10 @@ public class LinkParsingOperations {
}
/**
- * @see {@link JSPWikiMarkupParser#isAccessRule()}
+ * Returns true, if the link in question is an access rule.
+ *
+ * @param link The link text
+ * @return {@code true}, if this represents an access rule.
*/
public boolean isAccessRule( final String link ) {
return link.startsWith("{ALLOW") || link.startsWith("{DENY");
@@ -86,7 +89,7 @@ public class LinkParsingOperations {
}
/**
- * Returns true if the link is a metadata link
+ * Returns true if the link is a metadata link.
*
* @param link The link text
* @return {@code true}, if this represents a metadata link.