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 a7467bbff0194de8d90a45c1341e016909544363 Author: juanpablo <[email protected]> AuthorDate: Sun Aug 18 20:56:00 2019 +0200 code format --- .../org/apache/wiki/tags/EditorIteratorTag.java | 34 +++++++++------------- .../src/main/java/org/apache/wiki/ui/Editor.java | 27 ++++++++--------- .../java/org/apache/wiki/ui/EditorManager.java | 21 +++++++------ 3 files changed, 35 insertions(+), 47 deletions(-) diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorTag.java index 27e1995..690fe91 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorTag.java @@ -18,43 +18,35 @@ */ package org.apache.wiki.tags; -import java.util.ArrayList; -import java.util.Collection; - import org.apache.log4j.Logger; - import org.apache.wiki.WikiContext; import org.apache.wiki.WikiEngine; import org.apache.wiki.ui.Editor; import org.apache.wiki.ui.EditorManager; +import java.util.ArrayList; +import java.util.Collection; + /** * Iterates through editors. * * @since 2.4.12 */ -public class EditorIteratorTag - extends IteratorTag -{ - private static final long serialVersionUID = 0L; +public class EditorIteratorTag extends IteratorTag { - static Logger log = Logger.getLogger( EditorIteratorTag.class ); + private static final long serialVersionUID = 0L; + private static final Logger log = Logger.getLogger( EditorIteratorTag.class ); - public final int doStartTag() - { + public final int doStartTag() { m_wikiContext = WikiContext.findContext(pageContext); + final WikiEngine engine = m_wikiContext.getEngine(); + final EditorManager mgr = engine.getEditorManager(); + final String[] editorList = mgr.getEditorList(); + final Collection< Editor > editors = new ArrayList<>(); - WikiEngine engine = m_wikiContext.getEngine(); - EditorManager mgr = engine.getEditorManager(); - - String[] editorList = mgr.getEditorList(); - - Collection<Editor> editors = new ArrayList<Editor>(); - - for ( int i = 0; i < editorList.length; i++ ) - { - editors.add(new Editor(m_wikiContext, editorList[i])); + for ( int i = 0; i < editorList.length; i++ ) { + editors.add( new Editor( m_wikiContext, editorList[ i ] ) ); } setList( editors ); diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/Editor.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/Editor.java index efc2b4a..e730be6 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/Editor.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/Editor.java @@ -25,14 +25,13 @@ import org.apache.wiki.WikiContext; * * @since 2.4.12 */ -public class Editor -{ - private String m_editorName; - private WikiContext m_wikiContext; - private EditorManager m_editorManager; +public class Editor { - public Editor( WikiContext wikiContext, String editorName ) - { + private final String m_editorName; + private final WikiContext m_wikiContext; + private final EditorManager m_editorManager; + + public Editor( final WikiContext wikiContext, final String editorName ) { m_wikiContext = wikiContext; m_editorName = editorName; m_editorManager = wikiContext.getEngine().getEditorManager(); @@ -47,16 +46,15 @@ public class Editor /** @deprecated */ public String getURL() { - String uri = m_wikiContext.getHttpRequest().getRequestURI(); + final String uri = m_wikiContext.getHttpRequest().getRequestURI(); String para = m_wikiContext.getHttpRequest().getQueryString(); // if para already contains editor parameter, replace instead of append it // FIXME: Should cut out parameter instead of simple setting strin to null, maybe // in futur releases it may change and theres the danger that trailing parameters get lost - int idx = para.indexOf(EditorManager.PARA_EDITOR + "="); - if (idx >= 0) - { - para = para.substring(0, idx-1); + final int idx = para.indexOf( EditorManager.PARA_EDITOR + "=" ); + if( idx >= 0 ) { + para = para.substring( 0, idx - 1 ); } return uri + "?" + para + "&" + EditorManager.PARA_EDITOR + "=" + m_editorName; @@ -71,13 +69,12 @@ public class Editor return isSelected( "selected='selected'", "" ); } - public String isSelected( String ifSelected ) + public String isSelected( final String ifSelected ) { return isSelected( ifSelected, "" ); } - public String isSelected( String ifSelected, String ifNotSelected ) - { + public String isSelected( final String ifSelected, final String ifNotSelected ) { if ( m_editorName.equals(m_editorManager.getEditorName(m_wikiContext) ) ) { return ifSelected; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java index ed5895f..c66e810 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java @@ -18,16 +18,6 @@ */ package org.apache.wiki.ui; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import javax.servlet.jsp.PageContext; - import org.apache.log4j.Logger; import org.apache.wiki.WikiContext; import org.apache.wiki.WikiEngine; @@ -38,6 +28,15 @@ import org.apache.wiki.preferences.Preferences; import org.apache.wiki.util.XmlUtil; import org.jdom2.Element; +import javax.servlet.jsp.PageContext; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + /** * Defines an editor manager. An editor can be added by adding a @@ -106,7 +105,7 @@ public class EditorManager extends ModuleManager { */ private void registerEditors() { log.info( "Registering editor modules" ); - m_editors = new HashMap<String, WikiEditorInfo>(); + m_editors = new HashMap<>(); // // Register all editors which have created a resource containing its properties.
