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 2019/08/08 22:30:52 UTC
[jspwiki] 03/07: fix some IntelliJ warnings
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 975d2d6a36988f7c668a597e30d923ddf60e2b75
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Aug 9 00:23:49 2019 +0200
fix some IntelliJ warnings
---
ChangeLog | 13 ++-
.../apache/wiki/parser/JSPWikiMarkupParser.java | 115 ++++++++++-----------
2 files changed, 66 insertions(+), 62 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a7aa495..fb242d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2019-08-06 Juan Pablo Santos (juanpablo AT apache DOT org)
+
+ * 2.11.0-M5-git-08
+
+ * JSPWIKI-1115: Upgrade bundled dependencies for 2.11.0.M5
+ * Flexmark 0.50.26
+ * JUnit 5.5.1
+ * Lucene 8.1.1
+ * Selenide 5.2.8
+ * Tika 1.22
+ * Tomcat 8.5.43
+
2019-16-07 Dirk Frederickx (brushed AT apache DOT org)
* 2.11.0-M5-git-07
@@ -6,7 +18,6 @@
* Trim spaces from the rendered html to reduce page weight.
-
2019-09-07 Dirk Frederickx (brushed AT apache DOT org)
* 2.11.0-M5-git-06
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
index 287e2ee..05bb2a8 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
@@ -18,24 +18,6 @@
*/
package org.apache.wiki.parser;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.EmptyStackException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.ResourceBundle;
-import java.util.Stack;
-
-import javax.xml.transform.Result;
-
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -66,6 +48,23 @@ import org.jdom2.IllegalDataException;
import org.jdom2.ProcessingInstruction;
import org.jdom2.Verifier;
+import javax.xml.transform.Result;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.EmptyStackException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ResourceBundle;
+import java.util.Stack;
+
/**
* Parses JSPWiki-style markup into a WikiDocument DOM tree. This class is the
* heart and soul of JSPWiki : make sure you test properly anything that is added,
@@ -1102,35 +1101,37 @@ public class JSPWikiMarkupParser extends MarkupParser {
}
}
- private Element handleAccessRule( String ruleLine )
- {
- if( m_wysiwygEditorMode )
- {
+ private Element handleAccessRule( String ruleLine ) {
+ if( m_wysiwygEditorMode ) {
m_currentElement.addContent( "[" + ruleLine + "]" );
}
- if( !m_parseAccessRules ) return m_currentElement;
- Acl acl;
- WikiPage page = m_context.getRealPage();
- // UserDatabase db = m_context.getEngine().getUserDatabase();
+ if( !m_parseAccessRules ) {
+ return m_currentElement;
+ }
+ final WikiPage page = m_context.getRealPage();
+ // UserDatabase db = m_context.getEngine().getUserDatabase();
- if( ruleLine.startsWith( "{" ) )
+ if( ruleLine.startsWith( "{" ) ) {
ruleLine = ruleLine.substring( 1 );
- if( ruleLine.endsWith( "}" ) )
- ruleLine = ruleLine.substring( 0, ruleLine.length() - 1 );
+ }
- if( log.isDebugEnabled() ) log.debug("page="+page.getName()+", ACL = "+ruleLine);
+ if( ruleLine.endsWith( "}" ) ) {
+ ruleLine = ruleLine.substring( 0, ruleLine.length() - 1 );
+ }
- try
- {
- acl = m_engine.getAclManager().parseAcl( page, ruleLine );
+ if( log.isDebugEnabled() ) {
+ log.debug("page="+page.getName()+", ACL = "+ruleLine);
+ }
+ try {
+ final Acl acl = m_engine.getAclManager().parseAcl( page, ruleLine );
page.setAcl( acl );
- if( log.isDebugEnabled() ) log.debug( acl.toString() );
- }
- catch( WikiSecurityException wse )
- {
+ if( log.isDebugEnabled() ) {
+ log.debug( acl.toString() );
+ }
+ } catch( final WikiSecurityException wse ) {
return makeError( wse.getMessage() );
}
@@ -1140,39 +1141,31 @@ public class JSPWikiMarkupParser extends MarkupParser {
/**
* Handles metadata setting [{SET foo=bar}]
*/
- private Element handleMetadata( String link )
- {
- if( m_wysiwygEditorMode )
- {
+ private Element handleMetadata( final String link ) {
+ if( m_wysiwygEditorMode ) {
m_currentElement.addContent( "[" + link + "]" );
}
- try
- {
- String args = link.substring( link.indexOf(' '), link.length()-1 );
-
- String name = args.substring( 0, args.indexOf('=') );
- String val = args.substring( args.indexOf('=')+1, args.length() );
+ try {
+ final String args = link.substring( link.indexOf(' '), link.length()-1 );
+ final String name = args.substring( 0, args.indexOf('=') ).trim();
+ String val = args.substring( args.indexOf('=')+1 ).trim();
- name = name.trim();
- val = val.trim();
-
- if( val.startsWith("'") ) val = val.substring( 1 );
- if( val.endsWith("'") ) val = val.substring( 0, val.length()-1 );
+ if( val.startsWith("'") ) {
+ val = val.substring( 1 );
+ }
+ if( val.endsWith("'") ) {
+ val = val.substring( 0, val.length()-1 );
+ }
// log.debug("SET name='"+name+"', value='"+val+"'.");
- if( name.length() > 0 && val.length() > 0 )
- {
- val = m_engine.getVariableManager().expandVariables( m_context,
- val );
-
+ if( name.length() > 0 && val.length() > 0 ) {
+ val = m_engine.getVariableManager().expandVariables( m_context, val );
m_context.getPage().setAttribute( name, val );
}
- }
- catch( Exception e )
- {
- ResourceBundle rb = Preferences.getBundle( m_context, InternationalizationManager.CORE_BUNDLE );
+ } catch( final Exception e ) {
+ final ResourceBundle rb = Preferences.getBundle( m_context, InternationalizationManager.CORE_BUNDLE );
return makeError( MessageFormat.format( rb.getString( "markupparser.error.invalidset" ), link ) );
}